Add custom key mappings for merge-conflicts package
Revert to default themes

They appear to be less screwy with certain packages’ UIs.
Increase command mode input font size