Added themeService and moved theme logic from theme controllers to AppCtrl