some other keyboard changes
Merge
Merge in all Keyboard and layout files