Work

Update to the code:
* Adds theme support
* minor tweaks