Updated with latest keymappings and settings...
Merged and resolved conflicts