Cleanup themes
Themes code cleanup