diff --git a/public/css/codemirror-extend/one-dark.css b/public/css/codemirror-extend/one-dark.css
new file mode 100644
index 0000000000..85c8dac3d7
--- /dev/null
+++ b/public/css/codemirror-extend/one-dark.css
@@ -0,0 +1,13 @@
+.cm-s-one-dark .CodeMirror-linenumber {
+  color: #676767;
+}
+
+.cm-s-one-dark.CodeMirror-focused
+  .CodeMirror-activeline
+  .CodeMirror-gutter-elt {
+  color: #b0b0b0;
+}
+
+.cm-s-one-dark .cm-comment {
+  color: #818895;
+}
diff --git a/public/css/extra.css b/public/css/extra.css
index 2d1a0b32f4..5b9711164e 100644
--- a/public/css/extra.css
+++ b/public/css/extra.css
@@ -106,6 +106,9 @@
     margin-bottom: -25px;
     color: #777;
 }
+.night .ui-infobar {
+  color: #ededed;
+}
 
 .toc .invisable-node {
   list-style-type: none;
@@ -454,7 +457,8 @@ small .dropdown a:focus, small .dropdown a:hover {
     color: #eee;
 }
 
-.night .navbar a{
+.night .navbar-default .navbar-nav > li > a,
+.night .navbar a {
     color: #eee;
 }
 
diff --git a/public/css/index.css b/public/css/index.css
index d2e3fe6db0..00f6be8eda 100644
--- a/public/css/index.css
+++ b/public/css/index.css
@@ -329,6 +329,11 @@ body.night{
     background: #000;
 
 }
+
+.night .navbar-default .btn-link {
+  color: #bbb;
+}
+
 .dropdown-menu > li > a {
     cursor: pointer;
     text-overflow: ellipsis;
@@ -345,6 +350,10 @@ body.night{
   color: #262626
 }
 
+.night .status-bar .dropdown-menu > li > a:focus, .status-bar .dropdown-menu > li > a:hover {
+    color: #ccc;
+}
+
 .night .dropdown-menu {
     background: #222;
 }
diff --git a/webpack.common.js b/webpack.common.js
index d4569912e4..3d77f0f572 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -263,6 +263,7 @@ module.exports = {
       path.join(__dirname, 'public/css/codemirror-extend/ayu-mirage.css'),
       path.join(__dirname, 'public/css/codemirror-extend/tomorrow-night-bright.css'),
       path.join(__dirname, 'public/css/codemirror-extend/tomorrow-night-eighties.css'),
+      path.join(__dirname, 'public/css/codemirror-extend/one-dark.css'),
       path.join(__dirname, 'node_modules/@hackmd/codemirror/mode/tiddlywiki/tiddlywiki.css'),
       path.join(__dirname, 'node_modules/@hackmd/codemirror/mode/mediawiki/mediawiki.css'),
       path.join(__dirname, 'public/css/github-extract.css'),