diff --git a/customize.dist/src/less2/include/colortheme-dark.less b/customize.dist/src/less2/include/colortheme-dark.less
index 75c51ef6c..4ca59b4b8 100644
--- a/customize.dist/src/less2/include/colortheme-dark.less
+++ b/customize.dist/src/less2/include/colortheme-dark.less
@@ -327,6 +327,7 @@
 // Code
 @cp_preview-bg: @cryptpad_color_grey_900;
 @cp_preview-fg: @cryptpad_text_col;
+@cp_preview-link: @cryptpad_color_brand_300;
 
 // Debug
 @cp_debug-hover: fade(@cryptpad_color_black, 10%);
diff --git a/customize.dist/src/less2/include/colortheme.less b/customize.dist/src/less2/include/colortheme.less
index 92f0ab85c..6dab44aaa 100644
--- a/customize.dist/src/less2/include/colortheme.less
+++ b/customize.dist/src/less2/include/colortheme.less
@@ -327,6 +327,7 @@
 // Code
 @cp_preview-bg: @cryptpad_color_white;
 @cp_preview-fg: @cryptpad_text_col;
+@cp_preview-link: @cryptpad_color_brand;
 
 // Debug
 @cp_debug-hover: fade(@cryptpad_color_black, 10%);
diff --git a/customize.dist/src/less2/include/icons.less b/customize.dist/src/less2/include/icons.less
index 9ee12b1fd..6c05803c7 100644
--- a/customize.dist/src/less2/include/icons.less
+++ b/customize.dist/src/less2/include/icons.less
@@ -11,7 +11,6 @@
         padding-top: 5px;
         padding-bottom: 5px;
         border: 1px solid transparent;
-        background: fade(@cryptpad_text_col, 5%);
 
         .cp-icons-name {
             width: 100%;
diff --git a/www/code/app-code.less b/www/code/app-code.less
index 138741919..a6ccd864d 100644
--- a/www/code/app-code.less
+++ b/www/code/app-code.less
@@ -112,6 +112,10 @@
         media-tag > * {
             margin-bottom: 1rem;
         }
+        a {
+            color: @cp_preview-link;
+            text-decoration: underline;
+        }
     }
 
     .cp-splitter {
diff --git a/www/common/sframe-common-codemirror.js b/www/common/sframe-common-codemirror.js
index 98a260c23..02370bc47 100644
--- a/www/common/sframe-common-codemirror.js
+++ b/www/common/sframe-common-codemirror.js
@@ -381,7 +381,7 @@ define([
             /*  Remember the user's last choice of theme using localStorage */
             var isDark = window.CryptPad_theme === "dark";
             var themeKey = ['codemirror', isDark ? 'themedark' : 'theme'];
-            var defaultTheme = isDark ? 'ansuz' : 'default';
+            var defaultTheme = isDark ? 'dracula' : 'default';
 
             var todo = function (err, lastTheme) {
                 lastTheme = lastTheme || defaultTheme;
diff --git a/www/settings/inner.js b/www/settings/inner.js
index aa005cd7f..0aa0810d3 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -419,6 +419,7 @@ define([
     Messages.settings_colortheme_light = "Light";
     Messages.settings_colortheme_dark = "Dark";
     Messages.settings_colortheme_custom = "Custom";
+    Messages.settings_cat_style = "Appearance";
 
     makeBlock('colortheme', function (cb) {
         var theme = window.cryptpadStore.store['colortheme'] || 'default';