Moved theme to this file
Cleaning up