diff --git a/vim/colors/monotonous-dark.erb b/vim/colors/monotonous-dark.erb
index f34a38a..522397b 100644
--- a/vim/colors/monotonous-dark.erb
+++ b/vim/colors/monotonous-dark.erb
@@ -42,65 +42,6 @@
     # If your colors are defined correctly, the resulting colorscheme is guaranteed
     # to work in GVim (Windows/Linux), MacVim, and any properly set up terminal emulator.
 
-    # TODO dark should be weak, light should be strong
-
-    bg_weak1 = ["#1B1C1D", 232, "gray"]
-    bg_weak2 = ["#1F1F1F", 232, "gray"]
-    bg = ["#202122", 234, "black"]
-    fg_weak1 = ["#494646", 238, "gray"]
-    fg_comment = ["#5d5d5d", 240, "gray"]
-    fg_weak2 = ["#716c6c", 243, "gray"]
-    fg = ["#767070", 243, "gray"]
-    fg_strong1 = ["#857f7f", 244, "darkgray"]
-    fg_strong2 = ["#9a9393", 247, "darkgray"]
-    fg_strong3 = ["#aeadad", 250, "white"]
-    fg_strong4 = ["#eee4e4", 255, "white"]
-
-    ui_bg = ["#3f3f3f", 238, "gray"]
-    ui_fg_weak1 = ["#494646", 238, "gray"]
-    ui_fg_weak2 = ["#5d5959", 240, "gray"]
-    ui_fg = ["#716c6c", 243, "gray"]
-    ui_fg_strong1 = ["#857f7f", 244, "darkgray"]
-    ui_fg_strong2 = ["#9a9393", 247, "darkgray"]
-    ui_fg_strong3 = ["#aeadad", 250, "white"]
-    ui_fg_strong4 = ["#eee4e4", 255, "white"]
-    ui_cursor_bg = ["#eee4e4", 255, "white"]
-    ui_cursor_fg = ["#131313", 0, "black"]
-
-    menu_bg = ["#333535", 237, "black"]
-    menu_fg = ui_fg_strong1
-    menu_sel = ui_fg_strong3
-
-    # UI Colours
-    diff_delete_bg = ["#282020", 52, "darkred"]
-    red_bg = ["#463838", 52, "darkred"]
-    red_ui1 = ["#655757", 124, "red"]
-    red_ui2 = ["#7b6a6a", 124, "red"]
-    red_ui3 = ["#725454", 124, "red"]
-    red_ui4 = ["#916c6c", 124, "red"]
-    diff_add_bg = ["#202820", 22, "darkgreen"]
-    green_ui1 = ["#515b51", 34, "green"]
-    green_ui2 = ["#626e62", 34, "green"]
-    green_ui3 = ["#496349", 34, "green"]
-    diff_change_bg = ["#242528", 17, "darkblue"]
-    blue_bg0 = ["#384046", 17, "darkblue"]
-    blue_bg1 = ["#49535a", 17, "darkblue"]
-    inc_search = ["#93adc2", 17, "darkblue"]
-    blue_ui1 = ["#62626c", 19, "blue"]
-    diff_change_fg = ["#656a7c", 21, "blue"]
-    blue_ui3 = ["#596171", 19, "blue"]
-    purple_ui3 = ["#5c4a5a", 126, "magenta"]
-
-    error = ["#c74444", 196, "red"]
-    error_ui = ["#833838", 196, "red"]
-    error_ui_fg_weak = ["#6a2e2e", 196, "red"]
-    warning = ["#a67038", 166, "yellow"]
-    warning_ui = ["#775538", 166, "yellow"]
-    warning_ui_fg_weak = ["#553d2b", 166, "yellow"]
-    info = ["#797532", 247, "darkgray"]
-    info_ui = ["#615b41", 247, "darkgray"]
-    info_ui_fg_weak = ["#44402e", 247, "darkgray"]
-
     darkred1 = ["#373030", 237, "darkred"]
     darkred2 = ["#6b5d5d", 52, "darkred"]
     darkred3 = ["#866b6b", 52, "darkred"]
@@ -147,6 +88,92 @@
     yellow6 = ["#d0d095", 34, "yellow"]
     yellow7 = ["#d5d5a1", 34, "yellow"]
 
+    # TODO dark should be weak, light should be strong
+
+    bg_weak1 = ["#1B1C1D", 232, "gray"]
+    bg_weak2 = ["#1F1F1F", 232, "gray"]
+    bg = ["#202122", 234, "black"]
+    fg_weak1 = ["#494646", 238, "gray"]
+    fg_comment = ["#5d5d5d", 240, "gray"]
+    fg_weak2 = ["#716c6c", 243, "gray"]
+    fg = ["#767070", 243, "gray"]
+    fg_strong1 = ["#857f7f", 244, "darkgray"]
+    fg_strong2 = ["#9a9393", 247, "darkgray"]
+    fg_strong3 = ["#aeadad", 250, "white"]
+    fg_strong4 = ["#eee4e4", 255, "white"]
+
+    fg_error = ["#c74444", 196, "red"]
+    fg_spellcap = ["#a67038", 166, "yellow"]
+    fg_spellrare = ["#797532", 247, "darkyellow"]
+    fg_spelllocal = fg_spellrare
+    bg_whitespace_error = ["#6a2e2e", 196, "red"]
+
+    color_primary_weak1 = darkred1
+    color_primary_weak2 = darkred2
+    color_primary_weak3 = darkred3
+    color_primary1 = red1
+    color_primary2 = red2
+    color_primary3 = red3
+    color_primary_strong1 = lightred1
+    color_primary_strong2 = lightred2
+    color_primary_strong3 = lightred3
+
+    color_secondary_weak = green5
+    color_secondary = green6
+    color_secondary_strong = green7
+
+    color_tertiary_weak = blue3
+    color_tertiary = blue4
+    color_tertiary_strong = blue7
+
+    ui_bg = ["#3f3f3f", 238, "gray"]
+    ui_fg_weak1 = ["#494646", 238, "gray"]
+    ui_fg_weak2 = ["#5d5959", 240, "gray"]
+    ui_fg = ["#716c6c", 243, "gray"]
+    ui_fg_strong1 = ["#857f7f", 244, "darkgray"]
+    ui_fg_strong2 = ["#9a9393", 247, "darkgray"]
+    ui_fg_strong3 = ["#aeadad", 250, "white"]
+    ui_fg_strong4 = ["#eee4e4", 255, "white"]
+
+    ui_cursor_bg = ["#eee4e4", 255, "white"]
+    ui_cursor_fg = ["#131313", 0, "black"]
+
+    ui_search = ["#49535a", 17, "darkblue"]
+    ui_incsearch = ["#93adc2", 17, "darkblue"]
+
+    ui_visual_bg = ["#384046", 17, "darkblue"]
+    ui_visualnos_bg = ["#463838", 52, "darkred"]
+
+    menu_bg = ["#333535", 237, "black"]
+    menu_fg = ui_fg_strong1
+    menu_sel = ui_fg_strong3
+
+    diff_delete_bg = ["#282020", 52, "darkred"]
+    diff_add_bg = ["#202820", 22, "darkgreen"]
+    diff_change_bg = ["#242528", 17, "darkblue"]
+    diff_change_fg = ["#656a7c", 21, "white"]
+
+    ui_sign_add = ["#496349", 34, "green"]
+    ui_sign_change = ["#596171", 19, "blue"]
+    ui_sign_delete = ["#725454", 124, "red"]
+    ui_sign_changedelete = ["#5c4a5a", 126, "magenta"]
+
+    ui_statusbar_mod = ["#655757", 124, "red"]
+    ui_statusbar_mod_active = ["#916c6c", 124, "red"]
+    ui_statusbar_input = ["#384046", 17, "darkblue"]
+
+    ui_fg_errormsg = ["#c74444", 196, "red"]
+    ui_fg_warningmsg = ["#a67038", 166, "yellow"]
+    ui_fg_question = ["#797532", 247, "darkgray"]
+
+    ui_fg_warning_weak = ["#7b6a6a", 88, "darkred"]
+    ui_fg_warning = ["#725454", 124, "red"]
+    ui_fg_warning_strong = ["#916c6c", 196, "red"]
+    ui_fg_error_weak = ["#6a2e2e", 196, "red"]
+    ui_fg_error = ["#833838", 196, "red"]
+    ui_fg_info = ui_fg
+    ui_fg_info_weak = ui_fg_weak2
+
 
     # Step 3: highlights
     #
@@ -187,13 +214,13 @@
 
           [ "Special", "NONE", lightred2, "bold" ],
           [ "NonText", "NONE", lightred3, "NONE" ],
-          [ "Tag", darkred1, "NONE", "NONE" ],
+          [ "Tag", color_primary_weak1, "NONE", "NONE" ],
 
           [ "Identifier", "NONE", red3, "NONE" ],
           [ "Function", "NONE", lightred1, "bold" ],
 
           [ "Type", "NONE", red1, "NONE" ],
-          [ "StorageClass", "NONE", darkred3, "bold" ],
+          [ "StorageClass", "NONE", color_primary_weak3, "bold" ],
           [ "Structure", "StorageClass"],
           [ "TypeDef", "StorageClass"],
 
@@ -212,7 +239,7 @@
           [ "Label", "NONE", fg_strong1, "bold" ],
           [ "Operator", "NONE", fg_strong2, "bold" ],
           [ "Keyword", "NONE", fg_strong1, "bold" ],
-          [ "Exception", "NONE", darkred2, "bold" ],
+          [ "Exception", "NONE", color_primary_weak2, "bold" ],
 
           [ "PreProc", "NONE", fg_weak1, "bold" ],
           [ "Include", "NONE", fg_weak1, "NONE" ],
@@ -223,7 +250,7 @@
 
           [ "Ignore", "NONE", bg, "NONE" ],
 
-          [ "Error", "NONE", error, "bold" ],
+          [ "Error", "NONE", fg_error, "bold" ],
 
           [ "Underlined", "NONE", "NONE", "underline" ],
 
@@ -259,27 +286,27 @@
           [ "DiffDelete", diff_delete_bg, "NONE", "NONE" ],
           [ "DiffText", diff_change_bg, diff_change_fg, "NONE" ],
 
-          [ "IncSearch", inc_search, bg, "NONE" ],
-          [ "Search", blue_bg1, ui_fg_strong3, "NONE" ],
+          [ "IncSearch", ui_incsearch, bg, "NONE" ],
+          [ "Search", ui_search, ui_fg_strong3, "NONE" ],
 
-          [ "Visual", blue_bg0, "NONE", "NONE" ],
-          [ "VisualNOS", red_bg, "NONE", "NONE" ],
+          [ "Visual", ui_visual_bg, "NONE", "NONE" ],
+          [ "VisualNOS", ui_visualnos_bg, "NONE", "NONE" ],
 
           [ "Directory", "NONE", ui_fg_strong3, "NONE" ],
 
-          [ "MatchParen", blue_bg1, "NONE", "bold" ],
+          [ "MatchParen", ui_search, "NONE", "bold" ],
 
-          [ "SpellBad", "NONE", error, "NONE", error ],
-          [ "SpellCap", "NONE", warning, "NONE", warning ],
-          [ "SpellLocal", "NONE", info, "NONE", warning ],
-          [ "SpellRare", "NONE", info, "NONE", warning ],
+          [ "SpellBad", "NONE", fg_error, "NONE", fg_error ],
+          [ "SpellCap", "NONE", fg_spellcap, "NONE", fg_spellcap ],
+          [ "SpellLocal", "NONE", fg_spelllocal, "NONE", fg_spellcap ],
+          [ "SpellRare", "NONE", fg_spellrare, "NONE", fg_spellcap ],
 
           [ "WildMenu", ui_bg, ui_fg_strong4, "bold" ],
-          [ "ErrorMsg", "NONE", error, "bold" ],
+          [ "ErrorMsg", "NONE", ui_fg_errormsg, "bold" ],
           [ "ModeMsg", "NONE", ui_fg_strong4, "bold" ],
           [ "MoreMsg", "NONE", ui_fg_strong4, "NONE" ],
-          [ "Question", "NONE", info, "NONE" ],
-          [ "WarningMsg", "NONE", warning, "bold" ],
+          [ "Question", "NONE", ui_fg_question, "NONE" ],
+          [ "WarningMsg", "NONE", ui_fg_warningmsg, "bold" ],
 
           [ "Cursor", ui_cursor_bg, ui_cursor_fg, "bold" ],
           [ "CursorColumn", bg_weak2, "NONE", "NONE" ],
@@ -307,9 +334,9 @@
           [ "StatusLineLinecountActive", ui_bg, ui_fg_strong1, "bold"],
 
           [ "StatusLineDivActive", ui_fg, ui_fg, "NONE"],
-          [ "StatusLineDivInput", blue_bg0, blue_bg0, "NONE"],
-          [ "StatusLineDivMod", red_ui1, red_ui1, "NONE"],
-          [ "StatusLineDivModActive", red_ui4, red_ui4, "NONE"],
+          [ "StatusLineDivInput", ui_statusbar_input, ui_statusbar_input, "NONE"],
+          [ "StatusLineDivMod", ui_statusbar_mod, ui_statusbar_mod, "NONE"],
+          [ "StatusLineDivModActive", ui_statusbar_mod_active, ui_statusbar_mod_active, "NONE"],
 
           [ "StatusLineFileInfo", "NONE", ui_fg, "italic"],
 
@@ -322,39 +349,39 @@
           [ "StatusLineDot", ui_bg, ui_fg_weak2, "italic"],
           [ "StatusLineDotActive", ui_bg, ui_fg_weak2, "italic"],
 
-          [ "StatusLineFileReadOnly", ui_bg, red_ui3, "italic"],
-          [ "StatusLineFileReadOnlyActive", "NONE", red_ui3, "italic"],
+          [ "StatusLineFileReadOnly", ui_bg, ui_fg_warning, "italic"],
+          [ "StatusLineFileReadOnlyActive", "NONE", ui_fg_warning, "italic"],
           [ "StatusLineWarning", ui_bg, ui_fg_strong1, "bold"],
-          [ "StatusLineWarningActive", "NONE", red_ui3, "bold"],
+          [ "StatusLineWarningActive", "NONE", ui_fg_warning, "bold"],
 
           [ "LinterDash", "NONE", fg_weak1, "NONE"],
           [ "LinterDashActive", "NONE", ui_fg_weak2, "NONE"],
 
-          [ "LinterError", "NONE", error_ui_fg_weak, "bold"],
-          [ "LinterErrorActive", "NONE", error_ui, "bold"],
-          [ "LinterErrorStyle", "NONE", error_ui_fg_weak, "NONE"],
-          [ "LinterErrorStyleActive", "NONE", error_ui, "NONE"],
+          [ "LinterError", "NONE", ui_fg_error_weak, "NONE"],
+          [ "LinterErrorActive", "NONE", ui_fg_error, "bold"],
+          [ "LinterErrorStyle", "NONE", ui_fg_error_weak, "NONE"],
+          [ "LinterErrorStyleActive", "NONE", ui_fg_error, "bold"],
 
-          [ "LinterWarning", "NONE", warning_ui_fg_weak, "bold"],
-          [ "LinterWarningActive", "NONE", warning_ui, "bold"],
-          [ "LinterWarningStyle", "NONE", warning_ui_fg_weak, "NONE"],
-          [ "LinterWarningStyleActive", "NONE", warning_ui, "NONE"],
+          [ "LinterWarning", "NONE", ui_fg_warning_weak, "NONE"],
+          [ "LinterWarningActive", "NONE", ui_fg_warning, "bold"],
+          [ "LinterWarningStyle", "NONE", ui_fg_warning_weak, "NONE"],
+          [ "LinterWarningStyleActive", "NONE", ui_fg_warning, "bold"],
 
-          [ "LinterInfo", "NONE", info_ui_fg_weak, "bold"],
-          [ "LinterInfoActive", "NONE", info_ui, "bold"],
+          [ "LinterInfo", "NONE", ui_fg_info_weak, "NONE"],
+          [ "LinterInfoActive", "NONE", ui_fg_info, "bold"],
 
-          [ "GitGutterDelete", "NONE", red_ui3, "bold"],
-          [ "GitGutterChange", "NONE", blue_ui3, "bold"],
-          [ "GitGutterAdd", "NONE", green_ui3, "bold"],
-          [ "GitGutterChangeDelete", "NONE", purple_ui3, "bold"],
+          [ "GitGutterDelete", "NONE", ui_sign_delete, "bold"],
+          [ "GitGutterChange", "NONE", ui_sign_change, "bold"],
+          [ "GitGutterAdd", "NONE", ui_sign_add, "bold"],
+          [ "GitGutterChangeDelete", "NONE", ui_sign_changedelete, "bold"],
 
           # css, scss
 
-          [ "cssIdentifier", "NONE", green6, "bold" ],
-          [ "cssClass", "NONE", green5, "NONE" ],
+          [ "cssIdentifier", "NONE", color_secondary, "bold" ],
+          [ "cssClass", "NONE", color_secondary_weak, "NONE" ],
           [ "cssFunction", "NONE", fg_strong1, "bold" ],
           [ "cssProp", "NONE", fg_weak2, "NONE" ],
-          [ "scssVariable", "NONE", green7, "bold" ],
+          [ "scssVariable", "NONE", color_secondary_strong, "bold" ],
 
           [ "cssAttr", "String"],
           [ "cssIdentifierAttr",    "Noise" ],
@@ -382,9 +409,9 @@
 
           #html
 
-          ["htmlTagName", "NONE", blue3, "NONE"],
-          ["htmlSpecialTagName", "NONE", blue4, "bold"],
-          ["htmlLink", "NONE", blue7, "underline"],
+          ["htmlTagName", "NONE", color_tertiary_weak, "NONE"],
+          ["htmlSpecialTagName", "NONE", color_tertiary, "bold"],
+          ["htmlLink", "NONE", color_tertiary_strong, "underline"],
 
           [ "htmlNormal",          "Normal" ],
 
@@ -467,7 +494,7 @@
           [ "jsStorageClass",     "Include" ],
           [ "jsObjectKey", "NONE", red3, "NONE"],
           [ "jsObjectProp",       "Type" ],
-          [ "jsObjectValue",      "NONE", darkred3, "NONE" ],
+          [ "jsObjectValue",      "NONE", color_primary_weak3, "NONE" ],
           [ "jsModuleKeyword",    "Type" ],
           [ "jsOperatorKeyword",    "Label" ],
           [ "jsThis",             "jsGlobalObjects" ],
@@ -529,7 +556,7 @@
 
           # extra whitespace
 
-          [ "ExtraWhitespace", error_ui_fg_weak ,"NONE", "NONE" ],
+          [ "ExtraWhitespace", bg_whitespace_error ,"NONE", "NONE" ],
 
           # php
 
@@ -554,8 +581,8 @@
 
           [ "LspErrorText", "ErrorMsg" ],
           [ "LspWarningText", "WarningMsg" ],
-          [ "LspInformationText", "NONE", info, "bold" ],
-          [ "LspHintText", "NONE", info, "NONE" ],
+          [ "LspInformationText", "Question" ],
+          [ "LspHintText", "Question" ],
 
           # ctrl-p highlighting
           # :h ctrlp-customization
@@ -565,24 +592,24 @@
           [ "CtrlPMatch", "NONE", ui_fg_strong2, "bold"],
           [ "CtrlPMode1", "NONE", ui_fg_strong3, "bold"],
           [ "CtrlPMode2", "NONE", ui_fg_strong1, "NONE"],
-          [ "CtrlPNoEntries", "NONE", red_ui4, "bold" ],
+          [ "CtrlPNoEntries", "NONE", ui_fg_warning_strong, "bold" ],
           [ "CtrlPBufferNr", "NONE", ui_fg_strong2, "bold" ],
           [ "CtrlPBufferInd", "NONE", ui_fg_strong4, "bold" ],
           [ "CtrlPBufferPath", "NONE", ui_fg_weak2, "NONE" ],
           [ "CtrlPBufferHid", "NONE", ui_fg, "NONE" ],
-          [ "CtrlPBufferHidMod", "NONE", red_ui2, "NONE" ],
+          [ "CtrlPBufferHidMod", "NONE", ui_fg_warning_weak, "NONE" ],
           [ "CtrlPBufferVis", "Normal" ],
-          [ "CtrlPBufferVisMod", "NONE", red_ui3, "NONE" ],
+          [ "CtrlPBufferVisMod", "NONE", ui_fg_warning, "NONE" ],
           [ "CtrlPBufferCur", "NONE", ui_fg_strong3, "bold" ],
-          [ "CtrlPBufferCurMod", "NONE", red_ui4, "NONE" ],
+          [ "CtrlPBufferCurMod", "NONE", ui_fg_warning_strong, "NONE" ],
 
-          [ "CtrlPBufName", "NONE", red_ui4, "NONE" ],
-          [ "CtrlPTagKind", "NONE", red_ui4, "bold" ],
-          [ "CtrlPqfLineCol", "NONE", red_ui3, "bold" ],
+          [ "CtrlPBufName", "NONE", ui_fg_strong2, "NONE" ],
+          [ "CtrlPTagKind", "NONE", ui_fg_strong3, "bold" ],
+          [ "CtrlPqfLineCol", "NONE", ui_fg_warning, "bold" ],
           [ "CtrlPUndoT", "NONE", ui_fg_strong1, "NONE" ],
           [ "CtrlPUndoBr", "NONE", ui_fg_weak1, "NONE" ],
           [ "CtrlPUndoNr", "NONE", ui_fg_weak2, "NONE" ],
-          [ "CtrlPUndoSv", "NONE", red_ui3, "NONE" ],
+          [ "CtrlPUndoSv", "NONE", ui_fg_warning, "NONE" ],
           [ "CtrlPUndoPo", "NONE", ui_fg_strong3, "bold" ],
 
           # i3config