diff --git a/CHANGES.md b/CHANGES.md
index 7f2e769a..65e29848 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -23,6 +23,9 @@
 * Clean up text, correct quotations, use spaces for code lines, tabs for html
 * Implement automatic saving of poster layout sorting options on show list
 * Clarify description for backlog searches option on provider settings page
+* Fix Layout "Poster" sort of Paused, Ended, and Continuing shows as they were random
+* Fix Layout "Simple" sort of tvrage "New" and "Returning" series by changing status column text to "Continuing"
+* Add dark spinner to "Add New Show" (searching indexers), "Add existing shows" (Loading Folders), Coming Eps and all config pages (when saving)
 
 
 ### 0.2.1 (2014-10-22 06:41:00 UTC)
diff --git a/gui/slick/css/browser.css b/gui/slick/css/browser.css
index 812de3a7..db5957dd 100644
--- a/gui/slick/css/browser.css
+++ b/gui/slick/css/browser.css
@@ -23,11 +23,7 @@
   margin: 0 4px;
   float: left;
 }
-/*
-.browserDialog.busy .ui-dialog-buttonpane {
-  background: url("/images/loading.gif") 10px 50% no-repeat;
-}
-*/
+
 
 /* jquery ui autocomplete overrides to make it look more like the old autocomplete */
 .ui-autocomplete {
diff --git a/gui/slick/images/loading16-dark.gif b/gui/slick/images/loading16-dark.gif
new file mode 100644
index 00000000..febc9707
Binary files /dev/null and b/gui/slick/images/loading16-dark.gif differ
diff --git a/gui/slick/images/loading32-dark.gif b/gui/slick/images/loading32-dark.gif
new file mode 100644
index 00000000..9c6e410a
Binary files /dev/null and b/gui/slick/images/loading32-dark.gif differ
diff --git a/gui/slick/interfaces/default/comingEpisodes.tmpl b/gui/slick/interfaces/default/comingEpisodes.tmpl
index 7a30061d..edbe66a9 100644
--- a/gui/slick/interfaces/default/comingEpisodes.tmpl
+++ b/gui/slick/interfaces/default/comingEpisodes.tmpl
@@ -268,7 +268,7 @@
 <script type="text/javascript" charset="utf-8">
 <!--
 \$(document).ready(function(){ 
-	\$('#sbRoot').ajaxEpSearch({'size': 16, 'loadingImage': 'loading16.gif'});
+	\$('#sbRoot').ajaxEpSearch({'size': 16, 'loadingImage': 'loading16' + themeSpinner + '.gif'});
 	\$(".ep_summary").hide();
 	\$(".ep_summaryTrigger").click(function() {
 		\$(this).next(".ep_summary").slideToggle('normal', function() {
diff --git a/gui/slick/interfaces/default/inc_top.tmpl b/gui/slick/interfaces/default/inc_top.tmpl
index f6fe3bbc..d5189847 100644
--- a/gui/slick/interfaces/default/inc_top.tmpl
+++ b/gui/slick/interfaces/default/inc_top.tmpl
@@ -83,6 +83,7 @@
 			sbRoot = "$sbRoot"; // needed for browser.js & ajaxNotifications.js
 			//HTML for scrolltopcontrol, which is auto wrapped in DIV w/ ID="topcontrol"
 			top_image_html = '<img src="$sbRoot/images/top.gif" width="31" height="11" alt="Jump to top" />';
+			themeSpinner = <%= '\'\'' if 'dark' != sickbeard.THEME_NAME else '\'-dark\'' %>;
 		//-->
 		</script>
 		<script type="text/javascript" src="$sbRoot/js/lib/jquery.scrolltopcontrol-1.1.js"></script>
diff --git a/gui/slick/interfaces/default/restart_bare.tmpl b/gui/slick/interfaces/default/restart_bare.tmpl
index c77bdb11..ea345f89 100644
--- a/gui/slick/interfaces/default/restart_bare.tmpl
+++ b/gui/slick/interfaces/default/restart_bare.tmpl
@@ -22,24 +22,36 @@ sbHost = "$curSBHost";
 <script type="text/javascript" src="$sbRoot/js/lib/jquery-1.8.3.min.js?$sbPID"></script>
 <script type="text/javascript" src="$sbRoot/js/restart.js?$sbPID"></script>
 
+#try:
+    #sickbeard
+#except NameError:
+    #set themeSpinner = '';
+#else:
+#if 'dark' != sickbeard.THEME_NAME:
+#set themeSpinner = ''
+#else:
+#set themeSpinner = '-dark'
+#end if
+#end try
+
 <h2>Performing Restart</h2>
 <br />
 <div id="shut_down_message">
 Waiting for SickRage to shut down:
-<img src="$sbRoot/images/loading16.gif" height="16" width="16" id="shut_down_loading" />
+<img src="$sbRoot/images/loading16${themeSpinner}.gif" height="16" width="16" id="shut_down_loading" />
 <img src="$sbRoot/images/yes16.png" height="16" width="16" id="shut_down_success" style="display: none;" />
 </div>
 
 <div id="restart_message" style="display: none;">
 Waiting for SickRage to start again:
-<img src="$sbRoot/images/loading16.gif" height="16" width="16" id="restart_loading" />
+<img src="$sbRoot/images/loading16${themeSpinner}.gif" height="16" width="16" id="restart_loading" />
 <img src="$sbRoot/images/yes16.png" height="16" width="16" id="restart_success" style="display: none;" />
 <img src="$sbRoot/images/no16.png" height="16" width="16" id="restart_failure" style="display: none;" />
 </div>
 
 <div id="refresh_message" style="display: none;">
 Loading the home page:
-<img src="$sbRoot/images/loading16.gif" height="16" width="16" id="refresh_loading" />
+<img src="$sbRoot/images/loading16${themeSpinner}.gif" height="16" width="16" id="refresh_loading" />
 </div>
 
 <div id="restart_fail_message" style="display: none;">
diff --git a/gui/slick/js/addExistingShow.js b/gui/slick/js/addExistingShow.js
index 4eddd01f..fa27e10a 100644
--- a/gui/slick/js/addExistingShow.js
+++ b/gui/slick/js/addExistingShow.js
@@ -42,7 +42,7 @@ $(document).ready(function() {
             }
         });
 
-        $('#tableDiv').html('<img id="searchingAnim" src="' + sbRoot + '/images/loading32.gif" height="32" width="32" /> loading folders...');
+        $('#tableDiv').html('<img id="searchingAnim" src="' + sbRoot + '/images/loading32' + themeSpinner + '.gif" height="32" width="32" /> loading folders...');
         $.get(sbRoot+'/home/addShows/massAddTable', url, function(data) {
             $('#tableDiv').html(data);
             $("#addRootDirTable").tablesorter({
diff --git a/gui/slick/js/ajaxEpSearch.js b/gui/slick/js/ajaxEpSearch.js
index e4464dbc..54844e3c 100644
--- a/gui/slick/js/ajaxEpSearch.js
+++ b/gui/slick/js/ajaxEpSearch.js
@@ -40,7 +40,7 @@ function updateImages(data) {
 	$.each(data.episodes, function (name, ep) {
 		console.debug(ep.searchstatus);
 		// Get td element for current ep
-		var loadingImage = 'loading16_dddddd.gif';
+		var loadingImage = 'loading16.gif';
         var queuedImage = 'queued.png';
         var searchImage = 'search16.png';
         var status = null;
@@ -113,7 +113,7 @@ function disableLink(el) {
 	    defaults: {
 	        size:				16,
 	        colorRow:         	false,
-	        loadingImage:		'loading16_dddddd.gif',
+	        loadingImage:		'loading16.gif',
 	        queuedImage:		'queued.png',
 	        noImage:			'no16.png',
 	        yesImage:			'yes16.png'
diff --git a/gui/slick/js/ajaxEpSubtitles.js b/gui/slick/js/ajaxEpSubtitles.js
index 99094ef6..3b961524 100644
--- a/gui/slick/js/ajaxEpSubtitles.js
+++ b/gui/slick/js/ajaxEpSubtitles.js
@@ -5,7 +5,7 @@
 			var subtitles_search_link = $(this);
 			// fill with the ajax loading gif
 			subtitles_search_link.empty();
-			subtitles_search_link.append($("<img/>").attr({"src": sbRoot+"/images/loading16_dddddd.gif", "alt": "", "title": "loading"}));
+			subtitles_search_link.append($("<img/>").attr({"src": sbRoot+"/images/loading16.gif", "alt": "", "title": "loading"}));
 			$.getJSON($(this).attr('href'), function(data){
 				if (data.result != "failure" && data.result != "No subtitles downloaded") {
 				// clear and update the subtitles column with new informations
@@ -37,7 +37,7 @@
 			var subtitles_merge_link = $(this);
 			// fill with the ajax loading gif
 			subtitles_merge_link.empty();
-			subtitles_merge_link.append($("<img/>").attr({"src": sbRoot+"/images/loading16_dddddd.gif", "alt": "", "title": "loading"}));
+			subtitles_merge_link.append($("<img/>").attr({"src": sbRoot+"/images/loading16.gif", "alt": "", "title": "loading"}));
 			$.getJSON($(this).attr('href'), function(data){
 				// don't allow other merges
 				subtitles_merge_link.remove();
diff --git a/gui/slick/js/config.js b/gui/slick/js/config.js
index 468208c5..813095e9 100644
--- a/gui/slick/js/config.js
+++ b/gui/slick/js/config.js
@@ -47,7 +47,7 @@ $(document).ready(function(){
         beforeSubmit: function(){
             $('.config_submitter').each(function(){
                 $(this).attr("disabled", "disabled");
-                $(this).after('<span><img src="' + sbRoot + '/images/loading16.gif"> Saving...</span>');
+                $(this).after('<span><img src="' + sbRoot + '/images/loading16' + themeSpinner + '.gif"> Saving...</span>');
                 $(this).hide();
             });
         },
diff --git a/gui/slick/js/configBackupRestore.js b/gui/slick/js/configBackupRestore.js
index 38cc076e..113f5586 100644
--- a/gui/slick/js/configBackupRestore.js
+++ b/gui/slick/js/configBackupRestore.js
@@ -1,5 +1,5 @@
 $(document).ready(function(){
-    var loading = '<img src="' + sbRoot + '/images/loading16.gif" height="16" width="16" />';
+    var loading = '<img src="' + sbRoot + '/images/loading16' + themeSpinner + '.gif" height="16" width="16" />';
 
     $('#Backup').click(function() {
         $("#Backup").attr("disabled", true);
diff --git a/gui/slick/js/configNotifications.js b/gui/slick/js/configNotifications.js
index 342bec4f..0eb03bbe 100644
--- a/gui/slick/js/configNotifications.js
+++ b/gui/slick/js/configNotifications.js
@@ -1,5 +1,5 @@
 $(document).ready(function(){
-    var loading = '<img src="' + sbRoot + '/images/loading16.gif" height="16" width="16" />';
+    var loading = '<img src="' + sbRoot + '/images/loading16' + themeSpinner + '.gif" height="16" width="16" />';
 
     $('#testGrowl').click(function(){
         $('#testGrowl-result').html(loading);
diff --git a/gui/slick/js/configSearch.js b/gui/slick/js/configSearch.js
index f94630c0..7f3839c7 100644
--- a/gui/slick/js/configSearch.js
+++ b/gui/slick/js/configSearch.js
@@ -1,5 +1,5 @@
 $(document).ready(function(){
-    var loading = '<img src="'+sbRoot+'/images/loading16.gif" height="16" width="16" />';
+    var loading = '<img src="'+sbRoot+'/images/loading16' + themeSpinner + '.gif" height="16" width="16" />';
     
 	function toggle_torrent_title(){
 		if ($('#use_torrents').prop('checked'))
diff --git a/gui/slick/js/newShow.js b/gui/slick/js/newShow.js
index 1a8b9182..4e0df7af 100644
--- a/gui/slick/js/newShow.js
+++ b/gui/slick/js/newShow.js
@@ -39,7 +39,7 @@ $(document).ready(function () {
         if (searchRequestXhr) searchRequestXhr.abort();
 
         var searchingFor = $('#nameToSearch').val() + ' on ' + $('#providedIndexer option:selected').text() + ' in ' + $('#indexerLangSelect').val();
-        $('#searchResults').empty().html('<img id="searchingAnim" src="' + sbRoot + '/images/loading32.gif" height="32" width="32" /> searching ' + searchingFor + '...');
+        $('#searchResults').empty().html('<img id="searchingAnim" src="' + sbRoot + '/images/loading32' + themeSpinner + '.gif" height="32" width="32" /> searching ' + searchingFor + '...');
 
         searchRequestXhr = $.ajax({
             url: sbRoot + '/home/addShows/searchIndexersForShowName',