diff --git a/dashboard-ui/css/images/nowplayingdefault.jpg b/dashboard-ui/css/images/nowplayingdefault.jpg
deleted file mode 100644
index 4ee4a7a9b3..0000000000
Binary files a/dashboard-ui/css/images/nowplayingdefault.jpg and /dev/null differ
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 24b68cacb9..2c51243476 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -492,7 +492,6 @@ var Dashboard = {
 
                 html += '<img style="max-width:28px;vertical-align:middle;margin-right:5px;" src="' + imageUrl + '" />';
             }
-
             html += user.Name;
             html += '</h3>';
 
@@ -513,7 +512,7 @@ var Dashboard = {
                 $(this).off("panelafterclose").remove();
             });
 
-            $('#chkEnableThemeSongs', elem).checked(ThemeSongManager.enabled()).checkboxradio('refresh');
+            $('#chkEnableThemeSongs', elem).checked(window.ThemeSongManager.enabled()).checkboxradio('refresh');
         });
     },
 
diff --git a/dashboard-ui/scripts/thememediaplayer.js b/dashboard-ui/scripts/thememediaplayer.js
index fe0e4f528f..cfc1e0f518 100644
--- a/dashboard-ui/scripts/thememediaplayer.js
+++ b/dashboard-ui/scripts/thememediaplayer.js
@@ -1,4 +1,4 @@
-(function (document, $) {
+(function (document, $, localStorage) {
 
     var currentOwnerId;
     var currentThemeIds = [];
@@ -46,15 +46,14 @@
 
         var key = userId + '-themesongs';
 
-        if (isEnabled != null) {
-
-            var val = isEnabled ? '1' : '0';
-
-            localStorage.setItem(key, val);
-
-            return;
+        if (isEnabled == null) {
+            return localStorage.getItem(key) == '1';
         }
-        return localStorage.getItem(key);
+        
+
+        var val = isEnabled ? '1' : '0';
+
+        localStorage.setItem(key, val);
     }
 
     function getPlayer() {
@@ -75,7 +74,9 @@
     });
 
     window.ThemeSongManager = {
-        enabled: enabled
+        enabled: function (isEnabled) {
+            return enabled(isEnabled);
+        }
     };
 
-})(document, jQuery);
\ No newline at end of file
+})(document, jQuery, window.localStorage);
\ No newline at end of file