Theme refactoring. New keybindings