diff --git a/package-lock.json b/package-lock.json
index ce79a093..bccef9ca 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "nightTab",
-  "version": "5.35.0",
+  "version": "5.36.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 2ad8bfea..bb953a17 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nightTab",
-  "version": "5.35.0",
+  "version": "5.36.0",
   "description": "A neutral new tab page accented with a chosen colour. Customise the layout, style, background and bookmarks in nightTab.",
   "main": "index.js",
   "scripts": {
diff --git a/src/css/typography.css b/src/css/typography.css
index ed7749ee..83fcd058 100755
--- a/src/css/typography.css
+++ b/src/css/typography.css
@@ -175,3 +175,9 @@ table tbody tr th {
   text-align: left;
   box-sizing: border-box;
 }
+
+code {
+  background-color: rgb(var(--theme-color-04));
+  padding: 0.2em 0.5em;
+  border-radius: var(--theme-radius);
+}
diff --git a/src/html/menu.html b/src/html/menu.html
index 803e07a2..3f693f3f 100644
--- a/src/html/menu.html
+++ b/src/html/menu.html
@@ -10,7 +10,7 @@
     @@include("./menu/content/header.html")
 
     @@include("./menu/content/bookmarks.html")
-    
+
     @@include("./menu/content/groups.html")
 
     @@include("./menu/content/theme.html")
@@ -19,6 +19,8 @@
 
     @@include("./menu/content/data.html")
 
+    @@include("./menu/content/firefox.html")
+
     @@include("./menu/content/coffee.html")
 
     @@include("./menu/content/nighttab.html")
diff --git a/src/html/menu/content/firefox.html b/src/html/menu/content/firefox.html
new file mode 100644
index 00000000..3f9bc53d
--- /dev/null
+++ b/src/html/menu/content/firefox.html
@@ -0,0 +1,5 @@
+<div id="menu-content-firefox" class="menu-content menu-content-firefox">
+
+  @@include("./firefox/homepage.html")
+
+</div>
diff --git a/src/html/menu/content/firefox/homepage.html b/src/html/menu/content/firefox/homepage.html
new file mode 100644
index 00000000..2222e704
--- /dev/null
+++ b/src/html/menu/content/firefox/homepage.html
@@ -0,0 +1,17 @@
+<div id="menu-content-firefox-homepage" class="menu-content-item">
+  <div class="menu-item-header">
+    <h1 class="menu-item-header-text">Homepage</h1>
+  </div>
+  <div class="menu-item-form">
+    <p>Firefox does not allow addons to replace the "homepage". However there is a workaround:</p>
+    <div class="form-wrap">
+      <ol>
+        <li>Open a new Firefox window</li>
+        <li>Open Firefox <code>Preferences</code> and open a new tab (nightTab)</li>
+        <li>In Firefox preferences under <code>Home</code>, change <code>Homepage and new windows</code> to <code>Custom URLs...</code></li>
+        <li>Then click <code>Use Current Page</code></li>
+      </ol>
+      <p>nightTab will now appear as the homepage.</p>
+    </div>
+  </div>
+</div>
diff --git a/src/html/menu/nav.html b/src/html/menu/nav.html
index e90458af..6c837c4d 100644
--- a/src/html/menu/nav.html
+++ b/src/html/menu/nav.html
@@ -86,6 +86,9 @@
       <a href="#menu-content-data-clear" class="menu-nav-sub button button-small" tabindex="-1">Clear</a>
     </div>
   </div>
+  <div class="menu-nav-item menu-nav-item-firefox is-hidden">
+    <button class="control-menu-firefox menu-nav-tab button button-line" tabindex="-1">Firefox</button>
+  </div>
   <div class="menu-nav-item">
     <button class="control-menu-coffee menu-nav-tab button button-line" tabindex="-1">Coffee</button>
   </div>
diff --git a/src/js/control.js b/src/js/control.js
index 7c8e3e13..fe3a3b82 100644
--- a/src/js/control.js
+++ b/src/js/control.js
@@ -228,6 +228,13 @@ var control = (function() {
             menu.nav("data");
             theme.render.custom.tabIndex();
           }
+        }, {
+          element: ".control-menu-firefox",
+          type: "button",
+          func: function() {
+            menu.nav("firefox");
+            theme.render.custom.tabIndex();
+          }
         }, {
           element: ".control-menu-coffee",
           type: "button",
diff --git a/src/js/menu.js b/src/js/menu.js
index e0f8933d..698f9b68 100644
--- a/src/js/menu.js
+++ b/src/js/menu.js
@@ -28,6 +28,7 @@ var menu = (function() {
       background: false,
       data: false,
       coffee: false,
+      firefox: false,
       nighttab: false
     },
     toggle: function(name) {
@@ -186,6 +187,15 @@ var menu = (function() {
     helper.e(".menu").removeAttribute("style");
   };
 
+  render.firefoxSpecific = function() {
+    var firefoxBrowser = typeof InstallTrigger !== "undefined";
+    if (firefoxBrowser) {
+      helper.removeClass(helper.e(".menu-nav-item-firefox"), "is-hidden");
+    } else {
+      helper.addClass(helper.e(".menu-nav-item-firefox"), "is-hidden");
+    };
+  };
+
   var nav = function(name) {
     mod.nav.toggle(name);
     render.nav.active();
@@ -252,6 +262,7 @@ var menu = (function() {
     render.removeStyle();
     render.subnav.height();
     render.nav.active();
+    render.firefoxSpecific();
   };
 
   return {
diff --git a/src/js/version.js b/src/js/version.js
index e74157a8..9184e994 100644
--- a/src/js/version.js
+++ b/src/js/version.js
@@ -1,6 +1,6 @@
 var version = (function() {
 
-  var current = "5.35.0";
+  var current = "5.36.0";
 
   var name = "Zonked Tarsier";
 
diff --git a/src/manifest.json b/src/manifest.json
index 0be4b3ac..ce64b7ea 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -2,7 +2,7 @@
   "name": "nightTab",
   "short_name": "nightTab",
   "description": "A neutral new tab page accented with a chosen colour. Customise the layout, style, background and bookmarks in nightTab.",
-  "version": "5.35.0",
+  "version": "5.36.0",
   "manifest_version": 2,
   "chrome_url_overrides": {
     "newtab": "index.html"