More declarative refactorings. Added a theme selector command.
Fixed some fuckupery