Cleanup theme switching logic.
Remove unused code.
Rename hooks for elisp.