added more themes and cleanup views