I cannot play with the current schema, Can you include a control remapping feature?
(Or did you hardcode everything for 2 week project and it is hard as balls? :D)