diff --git a/assets/css/editor.css b/assets/css/editor.css
deleted file mode 100644
index 426634b..0000000
--- a/assets/css/editor.css
+++ /dev/null
@@ -1,41 +0,0 @@
-/* ICEcoder default theme by Matt Pass */
-
-.cm-s-icecoder {color: #888; background: #1d1d1b}
-
-.cm-s-icecoder span.cm-keyword {color: #eee; font-weight: bold}    /* off-white 1 */
-.cm-s-icecoder span.cm-atom {color: #e1c76e}                       /* yellow */
-.cm-s-icecoder span.cm-number {color: #6cb5d9}                     /* blue */
-.cm-s-icecoder span.cm-def {color: #b9ca4a}                        /* green */
-
-.cm-s-icecoder span.cm-variable {color: #6cb5d9}                   /* blue */
-.cm-s-icecoder span.cm-variable-2 {color: #cc1e5c}                 /* pink */
-.cm-s-icecoder span.cm-variable-3 {color: #f9602c}                 /* orange */
-
-.cm-s-icecoder span.cm-property {color: #eee}                      /* off-white 1 */
-.cm-s-icecoder span.cm-operator {color: #9179bb}                   /* purple */
-.cm-s-icecoder span.cm-comment {color: #444; font-style: italic}   /* dark-grey */
-
-.cm-s-icecoder span.cm-string {color: #b9ca4a}                     /* green */
-.cm-s-icecoder span.cm-string-2 {color: #6cb5d9}                   /* blue */
-
-.cm-s-icecoder span.cm-meta {color: #888}                          /* grey */
-
-.cm-s-icecoder span.cm-qualifier {color: #555}                     /* grey */
-.cm-s-icecoder span.cm-builtin {color: #214e7b}                    /* bright blue */
-.cm-s-icecoder span.cm-bracket {color: #cc7}                       /* grey-yellow */
-
-.cm-s-icecoder span.cm-tag {color: #e8e8e8}                        /* off-white 2 */
-.cm-s-icecoder span.cm-attribute {color: #099}                     /* teal */
-
-.cm-s-icecoder span.cm-header {color: #6a0d6a}                     /* purple-pink */
-.cm-s-icecoder span.cm-quote {color: #186718}                      /* dark green */
-.cm-s-icecoder span.cm-hr {color: #888}                            /* mid-grey */
-.cm-s-icecoder span.cm-link {color: #e1c76e}                       /* yellow */
-.cm-s-icecoder span.cm-error {color: #d00}                         /* red */
-
-.cm-s-icecoder .CodeMirror-cursor {border-left: 1px solid #ee0; box-shadow: -1px 0 0 0 #ee0}
-.cm-s-icecoder .CodeMirror-overwrite .CodeMirror-cursor {width: auto; border: 1px solid #ee0; box-shadow: 0 0 0 0 #ee0;}
-.cm-s-icecoder .CodeMirror-selected {color: #fff !important; background: #037 !important}
-.cm-s-icecoder .CodeMirror-gutters {background: #1d1d1b; min-width: 41px; border-right: 0}
-.cm-s-icecoder .CodeMirror-linenumber {color: #555; cursor: default}
-.cm-s-icecoder .CodeMirror-matchingbracket {color: #fff !important; background: #555 !important}
diff --git a/assets/css/theme/icecoder.css b/assets/css/theme/icecoder.css
index ffebaf2..ea365a8 100644
--- a/assets/css/theme/icecoder.css
+++ b/assets/css/theme/icecoder.css
@@ -1,43 +1,41 @@
-/*
-ICEcoder default theme by Matt Pass, used in code editor available at https://icecoder.net
-*/
+/* ICEcoder default theme by Matt Pass */
 
-.cm-s-icecoder { color: #666; background: #1d1d1b; }
+.cm-s-icecoder {color: #888; background: #1d1d1b}
 
-.cm-s-icecoder span.cm-keyword { color: #eee; font-weight:bold; }  /* off-white 1 */
-.cm-s-icecoder span.cm-atom { color: #e1c76e; }                    /* yellow */
-.cm-s-icecoder span.cm-number { color: #6cb5d9; }                  /* blue */
-.cm-s-icecoder span.cm-def { color: #b9ca4a; }                     /* green */
+.cm-s-icecoder span.cm-keyword {color: #eee; font-weight: bold}    /* off-white 1 */
+.cm-s-icecoder span.cm-atom {color: #e1c76e}                       /* yellow */
+.cm-s-icecoder span.cm-number {color: #6cb5d9}                     /* blue */
+.cm-s-icecoder span.cm-def {color: #b9ca4a}                        /* green */
 
-.cm-s-icecoder span.cm-variable { color: #6cb5d9; }                /* blue */
-.cm-s-icecoder span.cm-variable-2 { color: #cc1e5c; }              /* pink */
-.cm-s-icecoder span.cm-variable-3 { color: #f9602c; }              /* orange */
+.cm-s-icecoder span.cm-variable {color: #6cb5d9}                   /* blue */
+.cm-s-icecoder span.cm-variable-2 {color: #cc1e5c}                 /* pink */
+.cm-s-icecoder span.cm-variable-3 {color: #f9602c}                 /* orange */
 
-.cm-s-icecoder span.cm-property { color: #eee; }                   /* off-white 1 */
-.cm-s-icecoder span.cm-operator { color: #9179bb; }                /* purple */
-.cm-s-icecoder span.cm-comment { color: #97a3aa; }                 /* grey-blue */
+.cm-s-icecoder span.cm-property {color: #eee}                      /* off-white 1 */
+.cm-s-icecoder span.cm-operator {color: #9179bb}                   /* purple */
+.cm-s-icecoder span.cm-comment {color: #444; font-style: italic}   /* dark-grey */
 
-.cm-s-icecoder span.cm-string { color: #b9ca4a; }                  /* green */
-.cm-s-icecoder span.cm-string-2 { color: #6cb5d9; }                /* blue */
+.cm-s-icecoder span.cm-string {color: #b9ca4a}                     /* green */
+.cm-s-icecoder span.cm-string-2 {color: #6cb5d9}                   /* blue */
 
-.cm-s-icecoder span.cm-meta { color: #555; }                       /* grey */
+.cm-s-icecoder span.cm-meta {color: #888}                          /* grey */
 
-.cm-s-icecoder span.cm-qualifier { color: #555; }                  /* grey */
-.cm-s-icecoder span.cm-builtin { color: #214e7b; }                 /* bright blue */
-.cm-s-icecoder span.cm-bracket { color: #cc7; }                    /* grey-yellow */
+.cm-s-icecoder span.cm-qualifier {color: #555}                     /* grey */
+.cm-s-icecoder span.cm-builtin {color: #214e7b}                    /* bright blue */
+.cm-s-icecoder span.cm-bracket {color: #cc7}                       /* grey-yellow */
 
-.cm-s-icecoder span.cm-tag { color: #e8e8e8; }                     /* off-white 2 */
-.cm-s-icecoder span.cm-attribute { color: #099; }                  /* teal */
+.cm-s-icecoder span.cm-tag {color: #e8e8e8}                        /* off-white 2 */
+.cm-s-icecoder span.cm-attribute {color: #099}                     /* teal */
 
-.cm-s-icecoder span.cm-header { color: #6a0d6a; }                  /* purple-pink */
-.cm-s-icecoder span.cm-quote { color: #186718; }                   /* dark green */
-.cm-s-icecoder span.cm-hr { color: #888; }                         /* mid-grey */
-.cm-s-icecoder span.cm-link { color: #e1c76e; }                    /* yellow */
-.cm-s-icecoder span.cm-error { color: #d00; }                      /* red */
+.cm-s-icecoder span.cm-header {color: #6a0d6a}                     /* purple-pink */
+.cm-s-icecoder span.cm-quote {color: #186718}                      /* dark green */
+.cm-s-icecoder span.cm-hr {color: #888}                            /* mid-grey */
+.cm-s-icecoder span.cm-link {color: #e1c76e}                       /* yellow */
+.cm-s-icecoder span.cm-error {color: #d00}                         /* red */
 
-.cm-s-icecoder .CodeMirror-cursor { border-left: 1px solid white; }
-.cm-s-icecoder div.CodeMirror-selected { color: #fff; background: #037; }
-.cm-s-icecoder .CodeMirror-gutters { background: #1d1d1b; min-width: 41px; border-right: 0; }
-.cm-s-icecoder .CodeMirror-linenumber { color: #555; cursor: default; }
-.cm-s-icecoder .CodeMirror-matchingbracket { color: #fff !important; background: #555 !important; }
-.cm-s-icecoder .CodeMirror-activeline-background { background: #000; }
+.cm-s-icecoder .CodeMirror-cursor {border-left: 1px solid #ee0; box-shadow: -1px 0 0 0 #ee0}
+.cm-s-icecoder .CodeMirror-overwrite .CodeMirror-cursor {width: auto; border: 1px solid #ee0; box-shadow: 0 0 0 0 #ee0}
+.cm-s-icecoder .CodeMirror-selected {color: #fff !important; background: #037 !important}
+.cm-s-icecoder .CodeMirror-gutters {background: #1d1d1b; min-width: 41px; border-right: 0}
+.cm-s-icecoder .CodeMirror-linenumber {color: #555; cursor: default}
+.cm-s-icecoder .CodeMirror-matchingbracket {color: #fff !important; background: #555 !important}
diff --git a/editor.php b/editor.php
index fcb4e61..77eda72 100644
--- a/editor.php
+++ b/editor.php
@@ -41,7 +41,8 @@ if (true === file_exists(dirname(__FILE__)."/plugins/responsive-helper/responsiv
 	echo '<script src="plugins/responsive-helper/responsive-helper.js?microtime=' . microtime(true) . '"></script>';
 };?>
 <link rel="stylesheet" href="<?php
-if ("default" === $ICEcoder["theme"]) {echo dirname(basename(__DIR__)) . '/assets/css/editor.css';} else {echo 'assets/css/theme/' . $ICEcoder["theme"] . '.css';};
+echo dirname(basename(__DIR__)) . '/assets/css/theme/';
+echo "default" === $ICEcoder["theme"] ? 'icecoder.css' : $ICEcoder["theme"] . '.css';
 echo "?microtime=" . microtime(true);
 if (false !== array_search($ICEcoder["theme"], ["3024-day","base16-light","eclipse","elegant","mdn-like","neat","neo","paraiso-light","solarized","the-matrix","xq-light"])) {
 	$activeLineBG = "#ccc";
diff --git a/index.php b/index.php
index a874a5c..43f977a 100644
--- a/index.php
+++ b/index.php
@@ -50,10 +50,9 @@ $isMac = false !== strpos($_SERVER['HTTP_USER_AGENT'], "Macintosh") ? true : fal
 <link rel="stylesheet" type="text/css" href="<?php echo $iceURLPath;?>/assets/css/resets.css?microtime=<?php echo microtime(true);?>">
 <link rel="stylesheet" type="text/css" href="<?php echo $iceURLPath;?>/assets/css/icecoder.css?microtime=<?php echo microtime(true);?>">
 <link rel="stylesheet" type="text/css" href="<?php echo $iceURLPath;?>/assets/css/file-type-icons.css?microtime=<?php echo microtime(true);?>">
-<link rel="stylesheet" href="<?php echo $iceURLPath . "/";
-echo "default" === $ICEcoder["theme"]
-    ? 'assets/css/editor.css'
-    : 'assets/css/theme/' . $ICEcoder["theme"] . '.css';
+<link rel="stylesheet" href="<?php
+echo $iceURLPath . "/assets/css/theme/";
+echo "default" === $ICEcoder["theme"] ? 'icecoder.css' : $ICEcoder["theme"] . '.css';
 echo "?microtime=".microtime(true);
 ?>">
 <link rel="icon" type="image/png" href="assets/images/favicon.png">
diff --git a/lib/backup-versions.php b/lib/backup-versions.php
index 529bd90..41343dd 100644
--- a/lib/backup-versions.php
+++ b/lib/backup-versions.php
@@ -28,10 +28,9 @@ $versions = $fileCountInfo['count'];
 .cm-tab {border-left-width: <?php echo $ICEcoder["visibleTabs"] ? "1px" : "0";?>; margin-left: <?php echo $ICEcoder["visibleTabs"] ? "-1px" : "0";?>; border-left-style: solid; border-left-color: rgba(255,255,255,0.15)}
 </style>
 <link rel="stylesheet" href="<?php
-echo ($ICEcoder["theme"] === "default"
-    ? dirname(basename(__DIR__)).'/../assets/css/editor.css'
-    : '../assets/css/theme/'.$ICEcoder["theme"].'.css'
-) . "?microtime=".microtime(true);
+echo dirname(basename(__DIR__)) . '/../assets/css/theme/';
+echo $ICEcoder["theme"] === "default" ? 'icecoder.css': $ICEcoder["theme"] . '.css';
+echo "?microtime=".microtime(true);
 ?>">
 <link rel="stylesheet" href="../assets/css/foldgutter.css?microtime=<?php echo microtime(true);?>">
 <link rel="stylesheet" href="../assets/css/simplescrollbars.css?microtime=<?php echo microtime(true);?>">
diff --git a/lib/settings-screen.php b/lib/settings-screen.php
index 54d6d76..7dd369b 100644
--- a/lib/settings-screen.php
+++ b/lib/settings-screen.php
@@ -21,12 +21,12 @@ $t = $text['settings-screen'];
 .cm-tab {border-left-width: <?php echo $ICEcoder["visibleTabs"] ? "1px" : "0";?>; margin-left: <?php echo $ICEcoder["visibleTabs"] ? "-1px" : "0";?>; border-left-style: solid; border-left-color: rgba(255,255,255,0.2)}
 </style>
 
-<link rel="stylesheet" href="../assets/css/editor.css?microtime=<?php echo microtime(true);?>">
+<link rel="stylesheet" href="../assets/css/theme/icecoder.css?microtime=<?php echo microtime(true);?>">
 <?php
 $themeArray = array();
 $handle = opendir('../assets/css/theme/');
 while (false !== ($file = readdir($handle))) {
-	if ($file !== "." && $file != "..") {
+	if ($file !== "." && $file !== ".." && $file !== "icecoder.css") {
 		array_push($themeArray,basename($file,".css"));
 	}
 }
diff --git a/lib/settings-update.php b/lib/settings-update.php
index 1174111..7112990 100644
--- a/lib/settings-update.php
+++ b/lib/settings-update.php
@@ -105,9 +105,8 @@ if (!$demoMode && true === isset($_SESSION['loggedIn']) && $_SESSION['loggedIn']
 	}
 
 	// Work out the theme to use now
-    $themeURL = "default" === $ICEcoder["theme"]
-        ? 'assets/css/editor.css'
-        : 'assets/css/theme/' . $ICEcoder["theme"] . '.css';
+    $themeURL = 'assets/css/theme/';
+	$themeURL .= "default" === $ICEcoder["theme"] ? 'icecoder.css' : $ICEcoder["theme"] . '.css';
 	$themeURL .= "?microtime=" . microtime(true);
 
 	// Do we need a file manager refresh?