Refactored ThemeController to ClientController

Finally a clean separation from client and server