Added themes and thememanager
Migrating themes over