diff --git a/src/main/app/js/controllers.js b/src/main/app/js/controllers.js
index 0a5aa002..0d9da109 100644
--- a/src/main/app/js/controllers.js
+++ b/src/main/app/js/controllers.js
@@ -710,6 +710,11 @@ module.controller('FeedListCtrl', [
 					$scope.$emit('emitReload');
 				}
 			});
+			$scope.$watch('settingsService.settings.theme', function(newValue, oldValue) {
+				if (newValue) {
+					angular.element('html').attr('id', 'theme-' + newValue);
+				}
+			});
 
 			$scope.limit = SettingsService.settings.viewMode == 'title' ? 10 : 5;
 			$scope.busy = false;
diff --git a/src/main/java/com/commafeed/CommaFeedApplication.java b/src/main/java/com/commafeed/CommaFeedApplication.java
index 926f7003..d537db6a 100644
--- a/src/main/java/com/commafeed/CommaFeedApplication.java
+++ b/src/main/java/com/commafeed/CommaFeedApplication.java
@@ -133,6 +133,7 @@ public class CommaFeedApplication extends Application<CommaFeedConfiguration> {
 		UserSettingsDAO userSettingsDAO = new UserSettingsDAO(sessionFactory);
 		FeedEntryStatusDAO feedEntryStatusDAO = new FeedEntryStatusDAO(sessionFactory, feedEntryDAO, feedEntryTagDAO, config);
 
+		// Queuing system
 		FeedQueues queues = new FeedQueues(feedDAO, config, metrics);
 
 		// Services
@@ -151,8 +152,6 @@ public class CommaFeedApplication extends Application<CommaFeedConfiguration> {
 		UserService userService = new UserService(feedCategoryDAO, userDAO, userSettingsDAO, feedSubscriptionService, encryptionService,
 				config);
 		StartupService startupService = new StartupService(sessionFactory, userDAO, userService);
-
-		// OPML
 		OPMLImporter opmlImporter = new OPMLImporter(feedCategoryDAO, feedSubscriptionService, cacheService);
 		OPMLExporter opmlExporter = new OPMLExporter(feedCategoryDAO, feedSubscriptionDAO);