diff --git a/src/js/keyboard.js b/src/js/keyboard.js
index 1a5b4aa3..74a89bc9 100644
--- a/src/js/keyboard.js
+++ b/src/js/keyboard.js
@@ -1,6 +1,8 @@
 var keyboard = (function() {
 
-  var _bind = function() {
+  var bind = {};
+
+  bind.esc = function() {
     window.addEventListener("keydown", function(event) {
       //  esc
       if (event.keyCode == 27) {
@@ -25,6 +27,11 @@ var keyboard = (function() {
         };
         data.save();
       };
+    }, false);
+  };
+
+  bind.ctrAltA = function() {
+    window.addEventListener("keydown", function(event) {
       // ctrl+alt+a
       if (event.ctrlKey && event.altKey && event.keyCode == 65) {
         if (state.get().link.show) {
@@ -32,6 +39,11 @@ var keyboard = (function() {
           link.add();
         };
       };
+    }, false);
+  };
+
+  bind.ctrAltD = function() {
+    window.addEventListener("keydown", function(event) {
       // ctrl+alt+d
       if (event.ctrlKey && event.altKey && event.keyCode == 68) {
         theme.toggle();
@@ -39,12 +51,22 @@ var keyboard = (function() {
         control.update();
         data.save();
       };
+    }, false);
+  };
+
+  bind.ctrAltM = function() {
+    window.addEventListener("keydown", function(event) {
       // ctrl+alt+m
       if (event.ctrlKey && event.altKey && event.keyCode == 77) {
         shade.destroy();
         modal.destroy();
         menu.toggle();
       };
+    }, false);
+  };
+
+  bind.ctrAltE = function() {
+    window.addEventListener("keydown", function(event) {
       // ctrl+alt+e
       if (event.ctrlKey && event.altKey && event.keyCode == 69) {
         if (state.get().link.show && bookmarks.get().length > 0) {
@@ -66,10 +88,15 @@ var keyboard = (function() {
           data.save();
         };
       };
+    }, false);
+  };
+
+  bind.ctrAltR = function() {
+    window.addEventListener("keydown", function(event) {
       // ctrl+alt+r
       if (state.get().theme.accent.random.active && event.ctrlKey && event.altKey && event.keyCode == 82) {
-        accent.random();
-        accent.render();
+        theme.render.accent.random();
+        theme.render.accent.color();
         link.clear();
         link.render.item.all();
         sortable(".link-area");
@@ -79,11 +106,17 @@ var keyboard = (function() {
   };
 
   var init = function() {
-    _bind();
+    bind.esc();
+    bind.ctrAltA();
+    bind.ctrAltD();
+    bind.ctrAltM();
+    bind.ctrAltE();
+    bind.ctrAltR();
   };
 
   return {
-    init: init
+    init: init,
+    bind: bind
   };
 
 })();
diff --git a/src/js/theme.js b/src/js/theme.js
index 058ce11f..3b9586b1 100644
--- a/src/js/theme.js
+++ b/src/js/theme.js
@@ -98,7 +98,6 @@ var theme = (function() {
     }
   };
 
-
   var init = function() {
     render.theme();
     render.accent.random();
diff --git a/src/js/version.js b/src/js/version.js
index 9f74ce82..fca8a0a8 100644
--- a/src/js/version.js
+++ b/src/js/version.js
@@ -1,6 +1,6 @@
 var version = (function() {
 
-  var current = "3.39.0";
+  var current = "3.40.0";
 
   var compare = function(a, b) {
     var pa = a.split(".");
diff --git a/src/manifest.json b/src/manifest.json
index 14635838..6d80678c 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": "3.39.0",
+  "version": "3.40.0",
   "manifest_version": 2,
   "chrome_url_overrides": {
     "newtab": "index.html"