diff --git a/customize.dist/src/less2/include/dropdown.less b/customize.dist/src/less2/include/dropdown.less
index 277fab81d..f67a51dc6 100644
--- a/customize.dist/src/less2/include/dropdown.less
+++ b/customize.dist/src/less2/include/dropdown.less
@@ -12,7 +12,7 @@
         color: @cp_autocomplete-fg;
     }
     ul.ui-menu {
-        border: 1px solid @cp_autocomplete-border; // XXX doesn't work
+        border: 1px solid @cp_autocomplete-border; // FIXME doesn't work
         .ui-state-active {
             background-color: @cp_autocomplete-hover;
             color: @cp_autocomplete-fg;
diff --git a/customize.dist/src/less2/pages/page-404.less b/customize.dist/src/less2/pages/page-404.less
index f8f55e29c..575efa19c 100644
--- a/customize.dist/src/less2/pages/page-404.less
+++ b/customize.dist/src/less2/pages/page-404.less
@@ -5,7 +5,7 @@ html, body {
     .font_main();
     margin: 0px;
     padding: 0px;
-    background-color: @cp_static-bg; // XXX doesn't get applied
+    background-color: @cp_static-bg; // FIXME doesn't get applied
     color: @cryptpad_text_col;
     font-family: "IBM Plex Mono";
     #cp-main {
diff --git a/www/common/LessLoader.js b/www/common/LessLoader.js
index 60d21fdad..df46f344c 100644
--- a/www/common/LessLoader.js
+++ b/www/common/LessLoader.js
@@ -95,7 +95,7 @@ define([
 
     var COLORTHEME = '/customize/src/less2/include/colortheme.less';
     var COLORTHEME_DARK = '/customize/src/less2/include/colortheme-dark.less';
-    //COLORTHEME_DARK = '/customize/src/less2/include/colortheme.less'; // XXX
+    //COLORTHEME_DARK = '/customize/src/less2/include/colortheme.less'; // TODO
     var getColortheme = function () {
         return window.CryptPad_theme;
     };
@@ -139,7 +139,7 @@ define([
                         if (col) {
                             //console.warn(text, lastModified);
                             if (getColortheme() === "custom") {
-                                // XXX COLOR: append custom theme here
+                                // TODO COLOR: append custom theme here
                                 var custom = [
                                     '@cryptpad_text_col: #FF0000;'
                                 ].join('\n');
diff --git a/www/settings/inner.js b/www/settings/inner.js
index a87dbb249..80c77e8b0 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -450,7 +450,9 @@ define([
             }
 
             if (val === 'default') { val = ''; }
-            window.location.hash = ''; // XXX This is a hack to fix Firefox trying to be smart
+            // browsers try to load iframes from cache if they have the same id as was previously seen
+            // this seems to help?
+            window.location.hash = '';
             sframeChan.query('Q_COLORTHEME_CHANGE', {
                 theme: val,
                 flush: flush