I managed to sort it with an updated version of winIPAC from ultimarts website, not sure why it got itself in to a mess with the shift button but loaded the default keys and it seemed to fix it.
I think your right I will just rewire the buttons which are in the wrong order better way to fix it