diff --git a/src/components/backdrop/style.css b/src/components/backdrop/backdrop.css
similarity index 100%
rename from src/components/backdrop/style.css
rename to src/components/backdrop/backdrop.css
diff --git a/src/components/backdrop/backdrop.js b/src/components/backdrop/backdrop.js
index 61f458dd87..ae07ac3abc 100644
--- a/src/components/backdrop/backdrop.js
+++ b/src/components/backdrop/backdrop.js
@@ -1,4 +1,4 @@
-define(['browser', 'connectionManager', 'playbackManager', 'dom', 'css!./style'], function (browser, connectionManager, playbackManager, dom) {
+define(['browser', 'connectionManager', 'playbackManager', 'dom', 'css!./backdrop'], function (browser, connectionManager, playbackManager, dom) {
     'use strict';
 
     function enableAnimation(elem) {
diff --git a/src/components/backdrop/package.json b/src/components/backdrop/package.json
deleted file mode 100644
index 5f04e53a9e..0000000000
--- a/src/components/backdrop/package.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "main": "backdrop.js"
-}
\ No newline at end of file
diff --git a/src/components/emby-input/package.json b/src/components/emby-input/package.json
deleted file mode 100644
index 07be9f7b45..0000000000
--- a/src/components/emby-input/package.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "main": "emby-input.js"
-}
\ No newline at end of file
diff --git a/src/components/emby-radio/package.json b/src/components/emby-radio/package.json
deleted file mode 100644
index 2c1b97bd32..0000000000
--- a/src/components/emby-radio/package.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "main": "emby-radio.js"
-}
\ No newline at end of file
diff --git a/src/components/emby-tabs/package.json b/src/components/emby-tabs/package.json
deleted file mode 100644
index 0813d041c7..0000000000
--- a/src/components/emby-tabs/package.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "main": "emby-tabs.js"
-}
\ No newline at end of file
diff --git a/src/components/homescreensettings/homescreensettings.template.html b/src/components/homescreensettings/homescreensettings.template.html
index 56be1bc5a8..1ed2ec1b9c 100644
--- a/src/components/homescreensettings/homescreensettings.template.html
+++ b/src/components/homescreensettings/homescreensettings.template.html
@@ -104,32 +104,21 @@
     </div>
 
     <div class="verticalSection verticalSection-extrabottompadding">
-
-        <h2 class="sectionTitle">
-            ${HeaderLibraryOrder}
-        </h2>
-        <div class="paperList viewOrderList">
-
-        </div>
-
+        <h2 class="sectionTitle">${HeaderLibraryOrder}</h2>
+        <div class="paperList viewOrderList"></div>
     </div>
 
-    <div class="perLibrarySettings">
-
-    </div>
+    <div class="perLibrarySettings"></div>
 
     <div class="verticalSection verticalSection-extrabottompadding">
         <label class="checkboxContainer">
             <input class="chkHidePlayedFromLatest" type="checkbox" is="emby-checkbox" />
             <span>${HideWatchedContentFromLatestMedia}</span>
         </label>
-
     </div>
 
     <div class="verticalSection verticalSection-extrabottompadding">
-        <h2 class="sectionTitle">
-            ${HeaderLibraryFolders}
-        </h2>
+        <h2 class="sectionTitle">${HeaderLibraryFolders}</h2>
         <div>
             <p>${LabelSelectFolderGroups}</p>
             <div class="folderGroupList"></div>
diff --git a/src/components/usersettings/usersettingsbuilder.js b/src/components/usersettings/usersettingsbuilder.js
index 47ad2751ca..2eeda0364c 100644
--- a/src/components/usersettings/usersettingsbuilder.js
+++ b/src/components/usersettings/usersettingsbuilder.js
@@ -1,17 +1,16 @@
-define(['appSettings', 'events'], function (appsettings, events) {
+define(['appSettings', 'events'], function (appSettings, events) {
     'use strict';
 
     function onSaveTimeout() {
-
-        var self = this;
-        self.saveTimeout = null;
-        self.currentApiClient.updateDisplayPreferences('usersettings', self.displayPrefs, self.currentUserId, 'emby');
+        this.saveTimeout = null;
+        this.currentApiClient.updateDisplayPreferences('usersettings', self.displayPrefs, self.currentUserId, 'emby');
     }
 
     function saveServerPreferences(instance) {
         if (instance.saveTimeout) {
             clearTimeout(instance.saveTimeout);
         }
+
         instance.saveTimeout = setTimeout(onSaveTimeout.bind(instance), 50);
     }
 
@@ -19,7 +18,6 @@ define(['appSettings', 'events'], function (appsettings, events) {
     }
 
     UserSettings.prototype.setUserInfo = function (userId, apiClient) {
-
         if (this.saveTimeout) {
             clearTimeout(this.saveTimeout);
         }
@@ -49,14 +47,13 @@ define(['appSettings', 'events'], function (appsettings, events) {
     };
 
     UserSettings.prototype.set = function (name, value, enableOnServer) {
-
         var userId = this.currentUserId;
         if (!userId) {
             throw new Error('userId cannot be null');
         }
 
         var currentValue = this.get(name, enableOnServer);
-        var result = appsettings.set(name, value, userId);
+        var result = appSettings.set(name, value, userId);
 
         if (enableOnServer !== false && this.displayPrefs) {
             this.displayPrefs.CustomPrefs[name] = value == null ? value : value.toString();
@@ -73,10 +70,7 @@ define(['appSettings', 'events'], function (appsettings, events) {
     UserSettings.prototype.get = function (name, enableOnServer) {
         var userId = this.currentUserId;
         if (!userId) {
-            // TODO: I'd like to continue to throw this exception but it causes issues with offline use
-            // Revisit in the future and restore it
-            return null;
-            //throw new Error('userId cannot be null');
+            throw new Error('userId cannot be null');
         }
 
         if (enableOnServer !== false) {
@@ -85,95 +79,66 @@ define(['appSettings', 'events'], function (appsettings, events) {
             }
         }
 
-        return appsettings.get(name, userId);
+        return appSettings.get(name, userId);
     };
 
     UserSettings.prototype.serverConfig = function (config) {
-
         var apiClient = this.currentApiClient;
-
         if (config) {
-
             return apiClient.updateUserConfiguration(this.currentUserId, config);
-
-        } else {
-
-            return apiClient.getUser(this.currentUserId).then(function (user) {
-
-                return user.Configuration;
-            });
         }
+
+        return apiClient.getUser(this.currentUserId).then(function (user) {
+            return user.Configuration;
+        });
     };
 
     UserSettings.prototype.enableCinemaMode = function (val) {
-
         if (val != null) {
             return this.set('enableCinemaMode', val.toString(), false);
         }
 
         val = this.get('enableCinemaMode', false);
-
-        if (val) {
-            return val !== 'false';
-        }
-
-        return true;
+        return val !== 'false';
     };
 
     UserSettings.prototype.enableNextVideoInfoOverlay = function (val) {
-
         if (val != null) {
             return this.set('enableNextVideoInfoOverlay', val.toString());
         }
 
-        val = this.get('enableNextVideoInfoOverlay');
-
+        val = this.get('enableNextVideoInfoOverlay', false);
         return val !== 'false';
     };
 
     UserSettings.prototype.enableThemeSongs = function (val) {
-
         if (val != null) {
             return this.set('enableThemeSongs', val.toString(), false);
         }
 
         val = this.get('enableThemeSongs', false);
-
         return val !== 'false';
     };
 
     UserSettings.prototype.enableThemeVideos = function (val) {
-
         if (val != null) {
             return this.set('enableThemeVideos', val.toString(), false);
         }
 
         val = this.get('enableThemeVideos', false);
-
-        if (val) {
-            return val !== 'false';
-        }
-
-        return UserSettings.defaults.enableThemeVideos;
+        return val !== 'false';
     };
 
     UserSettings.prototype.enableBackdrops = function (val) {
-
         if (val != null) {
             return this.set('enableBackdrops', val.toString(), false);
         }
 
         val = this.get('enableBackdrops', false);
-
-        if (val) {
-            return val !== 'false';
-        }
-
-        return UserSettings.defaults.enableBackdrops;
+        return val !== 'false';
     };
 
     UserSettings.prototype.language = function (val) {
-
         if (val != null) {
             return this.set('language', val.toString(), false);
         }
@@ -182,7 +147,6 @@ define(['appSettings', 'events'], function (appsettings, events) {
     };
 
     UserSettings.prototype.dateTimeLocale = function (val) {
-
         if (val != null) {
             return this.set('datetimelocale', val.toString(), false);
         }
@@ -191,7 +155,6 @@ define(['appSettings', 'events'], function (appsettings, events) {
     };
 
     UserSettings.prototype.skipBackLength = function (val) {
-
         if (val != null) {
             return this.set('skipBackLength', val.toString());
         }
@@ -200,7 +163,6 @@ define(['appSettings', 'events'], function (appsettings, events) {
     };
 
     UserSettings.prototype.skipForwardLength = function (val) {
-
         if (val != null) {
             return this.set('skipForwardLength', val.toString());
         }
@@ -209,7 +171,6 @@ define(['appSettings', 'events'], function (appsettings, events) {
     };
 
     UserSettings.prototype.dashboardTheme = function (val) {
-
         if (val != null) {
             return this.set('dashboardTheme', val);
         }
@@ -218,55 +179,41 @@ define(['appSettings', 'events'], function (appsettings, events) {
     };
 
     UserSettings.prototype.skin = function (val) {
-
         if (val != null) {
             return this.set('skin', val, false);
         }
 
-        return this.get('skin', false) || UserSettings.defaults.skin;
+        return this.get('skin', false);
     };
 
     UserSettings.prototype.theme = function (val) {
-
         if (val != null) {
             return this.set('appTheme', val, false);
         }
 
-        return this.get('appTheme', false) || UserSettings.defaults.theme;
+        return this.get('appTheme', false);
     };
 
     UserSettings.prototype.screensaver = function (val) {
-
         if (val != null) {
             return this.set('screensaver', val, false);
         }
 
-        return this.get('screensaver', false) || UserSettings.defaults.screensaver;
+        return this.get('screensaver', false);
     };
 
     UserSettings.prototype.soundEffects = function (val) {
-
         if (val != null) {
             return this.set('soundeffects', val, false);
         }
 
-        return this.get('soundeffects', false) || UserSettings.defaults.soundEffects;
-    };
-
-    // apps should set these values
-    UserSettings.defaults = {
-        theme: null,
-        enableThemeVideos: true
+        return this.get('soundeffects', false);
     };
 
     UserSettings.prototype.loadQuerySettings = function (key, query) {
-
         var values = this.get(key);
-
         if (values) {
-
             values = JSON.parse(values);
-
             return Object.assign(query, values);
         }
 
@@ -274,12 +221,11 @@ define(['appSettings', 'events'], function (appsettings, events) {
     };
 
     UserSettings.prototype.saveQuerySettings = function (key, query) {
-
         var values = {};
-
         if (query.SortBy) {
             values.SortBy = query.SortBy;
         }
+
         if (query.SortOrder) {
             values.SortOrder = query.SortOrder;
         }
@@ -288,26 +234,20 @@ define(['appSettings', 'events'], function (appsettings, events) {
     };
 
     UserSettings.prototype.getSubtitleAppearanceSettings = function (key) {
-
         key = key || 'localplayersubtitleappearance3';
-
         return JSON.parse(this.get(key, false) || '{}');
     };
 
     UserSettings.prototype.setSubtitleAppearanceSettings = function (value, key) {
-
         key = key || 'localplayersubtitleappearance3';
-
         return this.set(key, JSON.stringify(value), false);
     };
 
     UserSettings.prototype.setFilter = function (key, value) {
-
         return this.set(key, value, true);
     };
 
     UserSettings.prototype.getFilter = function (key) {
-
         return this.get(key, true);
     };