diff --git a/cfg/scheme-picker.lua b/cfg/scheme-picker.lua
index 3a664ceb5e..6ff23ad1bf 100644
--- a/cfg/scheme-picker.lua
+++ b/cfg/scheme-picker.lua
@@ -8,6 +8,7 @@
   - [TomorrowNightEighties](macro:shell(ApplyStyleConfig('cfg/tomorrow.lua','TomorrowNightEighties')))
   - [Zenburn](macro:shell(ApplyStyleConfig('cfg/tomorrow.lua','Zenburn')))
   - [Monokai](macro:shell(ApplyStyleConfig('cfg/tomorrow.lua','Monokai')))
+  - [Molokai](macro:shell(ApplyStyleConfig('cfg/tomorrow.lua','Molokai')))
   - [SolarizedDark](macro:shell(ApplyStyleConfig('cfg/tomorrow.lua','SolarizedDark')))
   - [SolarizedLight](macro:shell(ApplyStyleConfig('cfg/tomorrow.lua','SolarizedLight')))
   - [Notepad++](macro:shell(ApplyStyleConfig('cfg/tomorrow.lua','NotepadPlusPlus')))
diff --git a/cfg/tomorrow.lua b/cfg/tomorrow.lua
index b2e318e3e6..c235951c42 100644
--- a/cfg/tomorrow.lua
+++ b/cfg/tomorrow.lua
@@ -135,6 +135,20 @@ local colors = {
     Blue        = H'F92672',
     Purple      = H'A6E22E',
   },
+  Molokai = { -- based on https://github.com/tomasr/molokai/blob/master/colors/molokai.vim
+    Background  = H'1B1D1E',
+    CurrentLine = H'293739',
+    Selection   = H'49483E',
+    Foreground  = H'F8F8F2',
+    Comment     = H'7E8E91',
+    Red         = H'AE81FF',
+    Orange      = H'AE81FF',
+    Yellow      = H'F8F8F2',
+    Green       = H'E6DB74',
+    Aqua        = H'66D9EF',
+    Blue        = H'F92672',
+    Purple      = H'A6E22E',
+  },
   SolarizedDark = {
     Background  = H'042029',
     CurrentLine = H'0A2933',
@@ -164,18 +178,18 @@ local colors = {
     Purple      = H'268BD2',
   },
   NotepadPlusPlus = { -- contributed by Florian (https://github.com/SiENcE)
-    Background = H'FFFFFF',
+    Background  = H'FFFFFF',
     CurrentLine = H'E9E2FF',
-    Selection = H'ADADA1',
-    Foreground = H'000000',
-    Comment = H'008000',
-    Red = H'FF6900',
-    Orange = H'00FF00',
-    Yellow = H'FF4E00',
-    Green = H'808080',
-    Aqua = H'260099',
-    Blue  = H'2123FF',
-    Purple = H'FFFFFF',
+    Selection   = H'ADADA1',
+    Foreground  = H'000000',
+    Comment     = H'008000',
+    Red         = H'FF6900',
+    Orange      = H'00FF00',
+    Yellow      = H'FF4E00',
+    Green       = H'808080',
+    Aqua        = H'260099',
+    Blue        = H'2123FF',
+    Purple      = H'FFFFFF',
   },
 }