Cleaning up themes

* Removed unused styles
* Removed theme flags
* Added resource resolver