Stage some components
Unstage the incompatible
Bug fix for substitute-command-keys
Another bug-fix for substitute-command-keys
more substitute-command-keys fixes
Debugging ergoemacs-theme obect
Better debug and modify keymaps fix bugs
Maps seem correct now