diff --git a/ayu-dark.sublime-theme b/ayu-dark.sublime-theme
index 0928acf0..e86769d2 100644
--- a/ayu-dark.sublime-theme
+++ b/ayu-dark.sublime-theme
@@ -61,7 +61,7 @@
     "layer0.texture": "ayu/assets/unfold.png",
     "layer0.opacity": 1.0,
     "layer0.inner_margin": 0,
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [81, 92, 102],
     "content_margin": [8, 6, 8, 6]
   },
 
@@ -98,7 +98,7 @@
 
   {
     "class": "auto_complete_label",
-    "fg": [62, 75, 89],
+    "fg": [81, 92, 102],
     "match_fg": [242, 151, 24],
     "selected_fg": [230, 225, 207],
     "selected_match_fg": [242, 151, 24]
@@ -131,7 +131,7 @@
 
   {
     "class": "tool_tip_label_control",
-    "color": [62, 75, 89],
+    "color": [81, 92, 102],
     "font.face": "Roboto mono",
     "font.size": 12
   },
@@ -228,7 +228,7 @@
 
   {
     "class": "quick_panel_label",
-    "fg": [62, 75, 89],
+    "fg": [81, 92, 102],
     "match_fg": [242, 151, 24],
     "selected_fg": [230, 225, 207],
     "selected_match_fg": [242, 151, 24]
@@ -239,7 +239,7 @@
   {
     "class": "quick_panel_label",
     "parents": [{"class": "overlay_control"}],
-    "fg": [62, 75, 89],
+    "fg": [81, 92, 102],
     "match_fg": [242, 151, 24],
     "selected_fg": [230, 225, 207],
     "selected_match_fg": [242, 151, 24]
@@ -251,7 +251,7 @@
     "class": "quick_panel_path_label",
     "fg": [66, 80, 94],
     "match_fg": [230, 225, 207],
-    "selected_fg": [62, 75, 89],
+    "selected_fg": [81, 92, 102],
     "selected_match_fg": [230, 225, 207]
   },
 
@@ -259,8 +259,8 @@
 
   {
     "class": "quick_panel_score_label",
-    "fg": [62, 75, 89],
-    "selected_fg": [62, 75, 89]
+    "fg": [81, 92, 102],
+    "selected_fg": [81, 92, 102]
   },
 
 
@@ -292,7 +292,7 @@
     "content_margin": [0, 0, 0, 0],
     "layer1.opacity": 0.3,
     "layer1.texture": "ayu/assets/separator-bottom.png",
-    "layer1.tint": [62, 75, 89],
+    "layer1.tint": [81, 92, 102],
     "layer1.inner_margin": [1, 0, 1, 2]
   },
   {
@@ -325,12 +325,12 @@
     "settings": ["ui_separator"],
 
     "layer1.texture": "ayu/assets/separator-right.png",
-    "layer1.tint": [62, 75, 89],
+    "layer1.tint": [81, 92, 102],
     "layer1.inner_margin": [0, 1, 2, 1],
     "layer1.opacity": 0.3,
 
     "layer3.texture": "ayu/assets/separator-bottom.png",
-    "layer3.tint": [62, 75, 89],
+    "layer3.tint": [81, 92, 102],
     "layer3.inner_margin": [1, 0, 1, 2],
     "layer3.opacity": 0.3
   },
@@ -367,7 +367,7 @@
   {
     "class": "tab_label",
     "fg": [15, 20, 25, 0],
-    "shadow_color": [62, 75, 89],
+    "shadow_color": [81, 92, 102],
     "shadow_offset": [0, -1],
     "font.size": 12,
     "font.italic": false,
@@ -388,7 +388,7 @@
   },
   {
     "class": "tab_label",
-    "fg": [62, 75, 89],
+    "fg": [81, 92, 102],
     "settings": ["ui_fix_tab_labels"],
     "shadow_color": [15, 20, 25, 0],
     "shadow_offset": [0, 0]
@@ -431,12 +431,12 @@
 
   // Close Icon
     "layer0.texture": "ayu/assets/close.png",
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [81, 92, 102],
     "layer0.opacity": 1.0,
 
   // Dirty Icon
     "layer1.texture": "ayu/assets/dirty.png",
-    "layer1.tint": [62, 75, 89],
+    "layer1.tint": [81, 92, 102],
     "layer1.opacity": 0,
   },
 
@@ -517,7 +517,7 @@
     "class": "scroll_tabs_right_button",
     "settings": ["ui_separator"],
     "layer2.texture": "ayu/assets/separator-right.png",
-    "layer2.tint": [62, 75, 89],
+    "layer2.tint": [81, 92, 102],
     "layer2.opacity": 0.3,
     "layer2.inner_margin" : [0, 1, 2, 1]
   },
@@ -558,7 +558,7 @@
     "class": "sidebar_container",
     "settings": ["ui_separator"],
     "layer1.texture": "ayu/assets/separator-right.png",
-    "layer1.tint": [62, 75, 89],
+    "layer1.tint": [81, 92, 102],
     "layer1.inner_margin": [0, 1, 2, 1],
     "layer1.opacity": 0.3
   },
@@ -610,7 +610,7 @@
 
   {
     "class": "sidebar_label",
-    "color": [62, 75, 89],
+    "color": [81, 92, 102],
     "shadow_color": [0, 0, 0],
     "shadow_offset": [0, 0],
     "font.face": "Roboto mono",
@@ -639,7 +639,7 @@
   {
     "class": "sidebar_label",
     "parents": [{"class": "tree_row","attributes": ["expandable"]}],
-    "color": [62, 75, 89],
+    "color": [81, 92, 102],
     "font.bold": false
   },
 
@@ -798,7 +798,7 @@
     "layer0.opacity": 1.0,
 
     "layer1.texture": "ayu/assets/folder-symlink.png",
-    "layer1.tint": [62, 75, 89],
+    "layer1.tint": [81, 92, 102],
     "layer1.opacity": 0.3
   },
 
@@ -830,7 +830,7 @@
     "layer0.texture": "ayu/assets/close.png",
     "layer0.opacity": 0,
     "layer0.inner_margin": [0, 0],
-    "layer0.tint": [62, 75, 89]
+    "layer0.tint": [81, 92, 102]
   },
 
 
@@ -847,7 +847,7 @@
     "class": "close_button",
     "attributes": ["dirty"],
     "layer0.texture": "ayu/assets/dirty.png",
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [81, 92, 102],
     "layer0.opacity": 1.0
   },
 
@@ -868,7 +868,7 @@
     "layer0.opacity": 1.0,
 
     "layer1.texture": "ayu/assets/scrollbar-vertical-wide.png",
-    "layer1.tint": [62, 75, 89],
+    "layer1.tint": [81, 92, 102],
     "layer1.opacity": 0.1,
     "layer1.inner_margin": [0, 10],
     "blur": false
@@ -894,7 +894,7 @@
   {
     "class": "puck_control",
     "layer0.texture": "ayu/assets/scrollbar-vertical-wide.png",
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [81, 92, 102],
     "layer0.opacity": 0.3,
     "layer0.inner_margin": [0, 10],
     "content_margin": [6, 12],
@@ -1009,7 +1009,7 @@
 
   {
     "class": "label_control",
-    "color": [62, 75, 89],
+    "color": [81, 92, 102],
     "shadow_color": [0, 0, 0, 0],
     "shadow_offset": [0, 0],
     "font.bold": false,
@@ -1027,7 +1027,7 @@
   {
     "class": "label_control",
     "parents": [{"class": "status_bar"}],
-    "color": [62, 75, 89],
+    "color": [81, 92, 102],
     "font.bold": false
   },
 
@@ -1062,7 +1062,7 @@
   {
     "class": "panel_button_control",
     "layer0.texture": "ayu/assets/switch-panel.png",
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [81, 92, 102],
     "layer0.opacity": 1.0
   },
 
@@ -1089,7 +1089,7 @@
     "settings": ["ui_separator"],
     "layer0.tint": [20, 25, 31],
     "layer1.texture": "ayu/assets/separator-top.png",
-    "layer1.tint": [62, 75, 89],
+    "layer1.tint": [81, 92, 102],
     "layer1.inner_margin": [1, 2, 1, 0],
     "layer1.opacity": 0.3
   },
@@ -1100,7 +1100,7 @@
     "class": "panel_close_button",
     "layer0.texture": "ayu/assets/close.png",
     "layer0.opacity": 1.0,
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [81, 92, 102],
     "content_margin": [0, 0] // 8,8 to show
   },
   // !!!
@@ -1122,7 +1122,7 @@
     "layer1.texture": "ayu/assets/input-border.png",
     "layer1.opacity": 0.3,
     "layer1.inner_margin": [10, 8],
-    "layer1.tint": [62, 75, 89],
+    "layer1.tint": [81, 92, 102],
     "content_margin": [10, 7, 10, 5]
   },
 
@@ -1181,7 +1181,7 @@
   {
     "class": "label_control",
     "parents": [{"class": "button_control"}],
-    "color":  [62, 75, 89]
+    "color":  [81, 92, 102]
   },
 
   {
@@ -1209,7 +1209,7 @@
   {
     "class": "icon_regex",
     "layer0.texture": "ayu/assets/regex.png",
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [81, 92, 102],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1225,7 +1225,7 @@
   {
     "class": "icon_case",
     "layer0.texture": "ayu/assets/matchcase.png",
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [81, 92, 102],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1241,7 +1241,7 @@
   {
     "class": "icon_whole_word",
     "layer0.texture": "ayu/assets/word.png",
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [81, 92, 102],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1258,7 +1258,7 @@
   {
     "class": "icon_wrap",
     "layer0.texture": "ayu/assets/wrap.png",
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [81, 92, 102],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1274,7 +1274,7 @@
   {
     "class": "icon_in_selection",
     "layer0.texture": "ayu/assets/inselection.png",
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [81, 92, 102],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1290,7 +1290,7 @@
   {
     "class": "icon_highlight",
     "layer0.texture": "ayu/assets/highlight.png",
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [81, 92, 102],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1306,7 +1306,7 @@
   {
     "class": "icon_preserve_case",
     "layer0.texture": "ayu/assets/replace-preserve-case.png",
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [81, 92, 102],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1322,7 +1322,7 @@
   {
     "class": "icon_context",
     "layer0.texture": "ayu/assets/context.png",
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [81, 92, 102],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1339,7 +1339,7 @@
   {
     "class": "icon_use_buffer",
     "layer0.texture": "ayu/assets/buffer.png",
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [81, 92, 102],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1355,7 +1355,7 @@
   {
     "class": "icon_reverse",
     "layer0.texture": "ayu/assets/reverse.png",
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [81, 92, 102],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
diff --git a/ayu-dark.tmTheme b/ayu-dark.tmTheme
index d6d01036..314977c2 100644
--- a/ayu-dark.tmTheme
+++ b/ayu-dark.tmTheme
@@ -28,11 +28,11 @@
 				<key>foreground</key>
 				<string>#E6E1CF</string>
 				<key>guide</key>
-				<string>#2D3640</string>
+				<string>#35404C</string>
 				<key>gutter</key>
 				<string>#0F1419</string>
 				<key>gutterForeground</key>
-				<string>#2D3640</string>
+				<string>#35404C</string>
 				<key>inactiveBackground</key>
 				<string>#0F1419</string>
 				<key>inactiveSelection</key>
@@ -58,7 +58,7 @@ b, strong {
   font-weight: normal;
 }
 a {
-  color: rgba(54, 163, 217, .7);
+  color: rgba(80, 180, 230, .7);
   line-height: 16px;
 }
 .type {
@@ -138,7 +138,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#36A3D9</string>
+				<string>#50B4E6</string>
 			</dict>
 		</dict>
 		<dict>
@@ -184,7 +184,7 @@ a {
 				<key>fontStyle</key>
 				<string>normal</string>
 				<key>foreground</key>
-				<string>#B8CC52</string>
+				<string>#C2D94C</string>
 			</dict>
 		</dict>
 		<dict>
@@ -195,7 +195,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#36A3D9</string>
+				<string>#50B4E6</string>
 			</dict>
 		</dict>
 		<dict>
@@ -206,7 +206,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#36A3D9</string>
+				<string>#50B4E6</string>
 			</dict>
 		</dict>
 		<dict>
@@ -219,7 +219,7 @@ a {
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
-				<string>#36A3D9</string>
+				<string>#50B4E6</string>
 			</dict>
 		</dict>
 		<dict>
@@ -254,7 +254,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#36A3D990</string>
+				<string>#50B4E690</string>
 			</dict>
 		</dict>
 		<dict>
@@ -276,7 +276,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#B8CC52</string>
+				<string>#C2D94C</string>
 			</dict>
 		</dict>
 		<dict>
@@ -287,7 +287,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#36A3D9</string>
+				<string>#50B4E6</string>
 			</dict>
 		</dict>
 		<dict>
@@ -342,7 +342,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#B8CC52</string>
+				<string>#C2D94C</string>
 			</dict>
 		</dict>
 		<dict>
@@ -368,7 +368,7 @@ a {
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
-				<string>#36A3D9</string>
+				<string>#50B4E6</string>
 			</dict>
 		</dict>
 		<dict>
@@ -481,7 +481,7 @@ a {
 				<key>background</key>
 				<string>#3cadd71a</string>
 				<key>foreground</key>
-				<string>#36A3D9</string>
+				<string>#50B4E6</string>
 			</dict>
 		</dict>
 		<dict>
@@ -503,7 +503,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#36A3D9</string>
+				<string>#50B4E6</string>
 			</dict>
 		</dict>
 		<dict>
@@ -525,7 +525,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#B8CC52</string>
+				<string>#C2D94C</string>
 			</dict>
 		</dict>
 		<dict>
@@ -616,7 +616,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#36A3D9</string>
+				<string>#50B4E6</string>
 			</dict>
 		</dict>
 		<dict>
@@ -627,7 +627,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#36A3D9</string>
+				<string>#50B4E6</string>
 			</dict>
 		</dict>
 		<dict>
@@ -638,7 +638,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#36A3D9</string>
+				<string>#50B4E6</string>
 			</dict>
 		</dict>
 		<dict>
@@ -649,7 +649,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#36A3D9</string>
+				<string>#50B4E6</string>
 			</dict>
 		</dict>
 		<dict>
@@ -660,7 +660,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#36A3D9</string>
+				<string>#50B4E6</string>
 			</dict>
 		</dict>
 		<dict>
@@ -671,7 +671,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#36A3D9</string>
+				<string>#50B4E6</string>
 			</dict>
 		</dict>
 		<dict>
@@ -682,7 +682,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#36A3D9</string>
+				<string>#50B4E6</string>
 			</dict>
 		</dict>
 		<dict>
@@ -693,7 +693,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#36A3D9</string>
+				<string>#50B4E6</string>
 			</dict>
 		</dict>
 		<dict>
@@ -704,7 +704,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#36A3D9</string>
+				<string>#50B4E6</string>
 			</dict>
 		</dict>
 		<dict>
@@ -715,7 +715,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#36A3D9</string>
+				<string>#50B4E6</string>
 				<key>foreground</key>
 				<string>#FFFFFF</string>
 			</dict>
@@ -728,7 +728,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#B8CC52</string>
+				<string>#C2D94C</string>
 				<key>foreground</key>
 				<string>#FFFFFF</string>
 			</dict>
@@ -767,7 +767,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#36A3D9</string>
+				<string>#50B4E6</string>
 			</dict>
 		</dict>
 		<dict>
diff --git a/ayu-dark2.sublime-theme b/ayu-dark2.sublime-theme
index 45412036..baad69bd 100644
--- a/ayu-dark2.sublime-theme
+++ b/ayu-dark2.sublime-theme
@@ -61,7 +61,7 @@
     "layer0.texture": "ayu/assets/unfold.png",
     "layer0.opacity": 1.0,
     "layer0.inner_margin": 0,
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [81, 92, 102],
     "content_margin": [8, 6, 8, 6]
   },
 
@@ -98,7 +98,7 @@
 
   {
     "class": "auto_complete_label",
-    "fg": [62, 75, 89],
+    "fg": [81, 92, 102],
     "match_fg": [242, 151, 24],
     "selected_fg": [230, 225, 207],
     "selected_match_fg": [242, 151, 24]
@@ -131,7 +131,7 @@
 
   {
     "class": "tool_tip_label_control",
-    "color": [62, 75, 89],
+    "color": [81, 92, 102],
     "font.face": "Roboto mono",
     "font.size": 12
   },
@@ -228,7 +228,7 @@
 
   {
     "class": "quick_panel_label",
-    "fg": [62, 75, 89],
+    "fg": [81, 92, 102],
     "match_fg": [242, 151, 24],
     "selected_fg": [230, 225, 207],
     "selected_match_fg": [242, 151, 24]
@@ -239,7 +239,7 @@
   {
     "class": "quick_panel_label",
     "parents": [{"class": "overlay_control"}],
-    "fg": [62, 75, 89],
+    "fg": [81, 92, 102],
     "match_fg": [242, 151, 24],
     "selected_fg": [230, 225, 207],
     "selected_match_fg": [242, 151, 24]
@@ -251,7 +251,7 @@
     "class": "quick_panel_path_label",
     "fg": [66, 80, 94],
     "match_fg": [230, 225, 207],
-    "selected_fg": [62, 75, 89],
+    "selected_fg": [81, 92, 102],
     "selected_match_fg": [230, 225, 207]
   },
 
@@ -259,8 +259,8 @@
 
   {
     "class": "quick_panel_score_label",
-    "fg": [62, 75, 89],
-    "selected_fg": [62, 75, 89]
+    "fg": [81, 92, 102],
+    "selected_fg": [81, 92, 102]
   },
 
 
@@ -292,7 +292,7 @@
     "content_margin": [0, 0, 0, 0],
     "layer1.opacity": 0.3,
     "layer1.texture": "ayu/assets/separator-bottom.png",
-    "layer1.tint": [62, 75, 89],
+    "layer1.tint": [81, 92, 102],
     "layer1.inner_margin": [1, 0, 1, 2]
   },
   {
@@ -325,12 +325,12 @@
     "settings": ["ui_separator"],
 
     "layer1.texture": "ayu/assets/separator-right.png",
-    "layer1.tint": [62, 75, 89],
+    "layer1.tint": [81, 92, 102],
     "layer1.inner_margin": [0, 1, 2, 1],
     "layer1.opacity": 0.3,
 
     "layer3.texture": "ayu/assets/separator-bottom.png",
-    "layer3.tint": [62, 75, 89],
+    "layer3.tint": [81, 92, 102],
     "layer3.inner_margin": [1, 0, 1, 2],
     "layer3.opacity": 0.3
   },
@@ -367,7 +367,7 @@
   {
     "class": "tab_label",
     "fg": [15, 20, 25, 0],
-    "shadow_color": [62, 75, 89],
+    "shadow_color": [81, 92, 102],
     "shadow_offset": [0, -1],
     "font.size": 12,
     "font.italic": false,
@@ -381,7 +381,7 @@
   },
   {
     "class": "tab_label",
-    "fg": [62, 75, 89],
+    "fg": [81, 92, 102],
     "settings": ["ui_fix_tab_labels"],
     "shadow_color": [15, 20, 25, 0],
     "shadow_offset": [0, 0]
@@ -418,12 +418,12 @@
 
   // Close Icon
     "layer0.texture": "ayu/assets/close.png",
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [81, 92, 102],
     "layer0.opacity": 1.0,
 
   // Dirty Icon
     "layer1.texture": "ayu/assets/dirty.png",
-    "layer1.tint": [62, 75, 89],
+    "layer1.tint": [81, 92, 102],
     "layer1.opacity": 0
   },
 
@@ -503,7 +503,7 @@
     "class": "scroll_tabs_right_button",
     "settings": ["ui_separator"],
     "layer2.texture": "ayu/assets/separator-right.png",
-    "layer2.tint": [62, 75, 89],
+    "layer2.tint": [81, 92, 102],
     "layer2.opacity": 0.3,
     "layer2.inner_margin" : [0, 1, 2, 1]
   },
@@ -544,7 +544,7 @@
     "class": "sidebar_container",
     "settings": ["ui_separator"],
     "layer1.texture": "ayu/assets/separator-right.png",
-    "layer1.tint": [62, 75, 89],
+    "layer1.tint": [81, 92, 102],
     "layer1.inner_margin": [0, 1, 2, 1],
     "layer1.opacity": 0.3
   },
@@ -596,7 +596,7 @@
 
   {
     "class": "sidebar_label",
-    "color": [62, 75, 89],
+    "color": [81, 92, 102],
     "shadow_color": [0, 0, 0],
     "shadow_offset": [0, 0],
     "font.face": "Roboto mono",
@@ -625,7 +625,7 @@
   {
     "class": "sidebar_label",
     "parents": [{"class": "tree_row","attributes": ["expandable"]}],
-    "color": [62, 75, 89],
+    "color": [81, 92, 102],
     "font.bold": false
   },
 
@@ -707,7 +707,7 @@
     "layer0.texture": "ayu/assets/close.png",
     "layer0.opacity": 0,
     "layer0.inner_margin": [0, 0],
-    "layer0.tint": [62, 75, 89]
+    "layer0.tint": [81, 92, 102]
   },
 
 
@@ -724,7 +724,7 @@
     "class": "close_button",
     "attributes": ["dirty"],
     "layer0.texture": "ayu/assets/dirty.png",
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [81, 92, 102],
     "layer0.opacity": 1.0
   },
 
@@ -888,7 +888,7 @@
 
   {
     "class": "label_control",
-    "color": [62, 75, 89],
+    "color": [81, 92, 102],
     "shadow_color": [0, 0, 0, 0],
     "shadow_offset": [0, 0],
     "font.bold": false,
@@ -906,7 +906,7 @@
   {
     "class": "label_control",
     "parents": [{"class": "status_bar"}],
-    "color": [62, 75, 89],
+    "color": [81, 92, 102],
     "font.bold": false
   },
 
@@ -956,7 +956,7 @@
     "settings": ["ui_separator"],
     "layer0.tint": [20, 25, 31],
     "layer1.texture": "ayu/assets/separator-top.png",
-    "layer1.tint": [62, 75, 89],
+    "layer1.tint": [81, 92, 102],
     "layer1.inner_margin": [1, 2, 1, 0],
     "layer1.opacity": 0.3
   },
@@ -967,7 +967,7 @@
     "class": "panel_close_button",
     "layer0.texture": "ayu/assets/close.png",
     "layer0.opacity": 1.0,
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [81, 92, 102],
     "content_margin": [0, 0] // 8,8 to show
   },
   // !!!
@@ -989,7 +989,7 @@
     "layer1.texture": "ayu/assets/input-border.png",
     "layer1.opacity": 0.3,
     "layer1.inner_margin": [10, 8],
-    "layer1.tint": [62, 75, 89],
+    "layer1.tint": [81, 92, 102],
     "content_margin": [10, 7, 10, 5]
   },
 
@@ -1048,7 +1048,7 @@
   {
     "class": "label_control",
     "parents": [{"class": "button_control"}],
-    "color":  [62, 75, 89]
+    "color":  [81, 92, 102]
   },
 
   {
@@ -1076,7 +1076,7 @@
   {
     "class": "icon_regex",
     "layer0.texture": "ayu/assets/regex.png",
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [81, 92, 102],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1092,7 +1092,7 @@
   {
     "class": "icon_case",
     "layer0.texture": "ayu/assets/matchcase.png",
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [81, 92, 102],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1108,7 +1108,7 @@
   {
     "class": "icon_whole_word",
     "layer0.texture": "ayu/assets/word.png",
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [81, 92, 102],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1125,7 +1125,7 @@
   {
     "class": "icon_wrap",
     "layer0.texture": "ayu/assets/wrap.png",
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [81, 92, 102],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1141,7 +1141,7 @@
   {
     "class": "icon_in_selection",
     "layer0.texture": "ayu/assets/inselection.png",
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [81, 92, 102],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1157,7 +1157,7 @@
   {
     "class": "icon_highlight",
     "layer0.texture": "ayu/assets/highlight.png",
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [81, 92, 102],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1173,7 +1173,7 @@
   {
     "class": "icon_preserve_case",
     "layer0.texture": "ayu/assets/replace-preserve-case.png",
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [81, 92, 102],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1189,7 +1189,7 @@
   {
     "class": "icon_context",
     "layer0.texture": "ayu/assets/context.png",
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [81, 92, 102],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1206,7 +1206,7 @@
   {
     "class": "icon_use_buffer",
     "layer0.texture": "ayu/assets/buffer.png",
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [81, 92, 102],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1222,7 +1222,7 @@
   {
     "class": "icon_reverse",
     "layer0.texture": "ayu/assets/reverse.png",
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [81, 92, 102],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
diff --git a/ayu-light.sublime-theme b/ayu-light.sublime-theme
index 0c522065..91129be1 100644
--- a/ayu-light.sublime-theme
+++ b/ayu-light.sublime-theme
@@ -61,7 +61,7 @@
     "layer0.texture": "ayu/assets/unfold.png",
     "layer0.opacity": 1.0,
     "layer0.inner_margin": 0,
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [133, 136, 140],
     "content_margin": [8, 6, 8, 6]
   },
 
@@ -98,9 +98,9 @@
 
   {
     "class": "auto_complete_label",
-    "fg": [130, 140, 153],
+    "fg": [133, 136, 140],
     "match_fg": [255, 106, 0],
-    "selected_fg": [92, 103, 115],
+    "selected_fg": [92, 96, 102],
     "selected_match_fg": [255, 106, 0]
   },
 
@@ -131,7 +131,7 @@
 
   {
     "class": "tool_tip_label_control",
-    "color": [130, 140, 153],
+    "color": [133, 136, 140],
     "font.face": "Roboto mono",
     "font.size": 12
   },
@@ -151,7 +151,7 @@
     "layer0.texture": "ayu/assets/overlay-shadow.png",
     "layer0.inner_margin": [25, 45, 25, 35],
     "layer0.opacity": 1.0,
-    "layer0.tint": [160, 160, 160],
+    "layer0.tint": [126, 132, 140],
 
     "layer1.texture": "ayu/assets/overlay-bg.png",
     "layer1.inner_margin": [25, 45, 25, 35],
@@ -228,9 +228,9 @@
 
   {
     "class": "quick_panel_label",
-    "fg": [130, 140, 153],
+    "fg": [133, 136, 140],
     "match_fg": [255, 106, 0],
-    "selected_fg": [92, 103, 115],
+    "selected_fg": [92, 96, 102],
     "selected_match_fg": [255, 106, 0]
   },
 
@@ -239,9 +239,9 @@
   {
     "class": "quick_panel_label",
     "parents": [{"class": "overlay_control"}],
-    "fg": [130, 140, 153],
+    "fg": [133, 136, 140],
     "match_fg": [255, 106, 0],
-    "selected_fg": [92, 103, 115],
+    "selected_fg": [92, 96, 102],
     "selected_match_fg": [255, 106, 0]
   },
 
@@ -249,18 +249,18 @@
 
   {
     "class": "quick_panel_path_label",
-    "fg": [176, 190, 197],
-    "match_fg": [92, 103, 115],
-    "selected_fg": [130, 140, 153],
-    "selected_match_fg": [92, 103, 115]
+    "fg": [149, 156, 166],
+    "match_fg": [92, 96, 102],
+    "selected_fg": [133, 136, 140],
+    "selected_match_fg": [92, 96, 102]
   },
 
   // Panels data / score
 
   {
     "class": "quick_panel_score_label",
-    "fg": [130, 140, 153],
-    "selected_fg": [130, 140, 153]
+    "fg": [133, 136, 140],
+    "selected_fg": [133, 136, 140]
   },
 
 
@@ -292,7 +292,7 @@
     "content_margin": [0, 0, 0, 0],
     "layer1.opacity": 0.2,
     "layer1.texture": "ayu/assets/separator-bottom.png",
-    "layer1.tint": [130, 140, 153],
+    "layer1.tint": [133, 136, 140],
     "layer1.inner_margin": [1, 0, 1, 2]
   },
   {
@@ -325,12 +325,12 @@
     "settings": ["ui_separator"],
 
     "layer1.texture": "ayu/assets/separator-right.png",
-    "layer1.tint": [130, 140, 153],
+    "layer1.tint": [133, 136, 140],
     "layer1.inner_margin": [0, 1, 2, 1],
     "layer1.opacity": 0.2,
 
     "layer3.texture": "ayu/assets/separator-bottom.png",
-    "layer3.tint": [130, 140, 153],
+    "layer3.tint": [133, 136, 140],
     "layer3.inner_margin": [1, 0, 1, 2],
     "layer3.opacity": 0.2
   },
@@ -367,7 +367,7 @@
   {
     "class": "tab_label",
     "fg": [250, 250, 250, 0],
-    "shadow_color": [130, 140, 153],
+    "shadow_color": [133, 136, 140],
     "shadow_offset": [0, -1],
     "font.size": 12,
     "font.italic": false,
@@ -388,7 +388,7 @@
   },
   {
     "class": "tab_label",
-    "fg": [130, 140, 153],
+    "fg": [133, 136, 140],
     "settings": ["ui_fix_tab_labels"],
     "shadow_color": [250, 250, 250, 0],
     "shadow_offset": [0, 0]
@@ -406,14 +406,14 @@
     "class": "tab_label",
     "parents": [{"class": "tab_control", "attributes": ["selected"]}],
     "fg": [250, 250, 250, 0],
-    "shadow_color": [92, 103, 115],
+    "shadow_color": [92, 96, 102],
     "shadow_offset": [0, -1],
   },
   {
     "class": "tab_label",
     "settings": ["ui_fix_tab_labels"],
     "parents": [{"class": "tab_control", "attributes": ["selected"]}],
-    "fg": [92, 103, 115],
+    "fg": [92, 96, 102],
     "shadow_color": [250, 250, 250, 0],
     "shadow_offset": [0, 0]
   },
@@ -431,12 +431,12 @@
 
   // Close Icon
     "layer0.texture": "ayu/assets/close.png",
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [133, 136, 140],
     "layer0.opacity": 1.0,
 
   // Dirty Icon
     "layer1.texture": "ayu/assets/dirty.png",
-    "layer1.tint": [130, 140, 153],
+    "layer1.tint": [133, 136, 140],
     "layer1.opacity": 0,
   },
 
@@ -496,7 +496,7 @@
     "class": "scroll_tabs_left_button",
     "content_margin": [12, 15],
     "layer0.texture": "ayu/assets/arrow-left.png",
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [135, 143, 153],
     "layer0.opacity": 1.0
   },
 
@@ -510,14 +510,14 @@
     "class": "scroll_tabs_right_button",
     "content_margin": [12, 15],
     "layer0.texture": "ayu/assets/arrow-right.png",
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [135, 143, 153],
     "layer0.opacity": 1.0
   },
   {
     "class": "scroll_tabs_right_button",
     "settings": ["ui_separator"],
     "layer2.texture": "ayu/assets/separator-right.png",
-    "layer2.tint": [130, 140, 153],
+    "layer2.tint": [133, 136, 140],
     "layer2.opacity": 0.2,
     "layer2.inner_margin" : [0, 1, 2, 1]
   },
@@ -532,7 +532,7 @@
     "class": "show_tabs_dropdown_button",
     "content_margin": [12, 12],
     "layer0.texture": "ayu/assets/overflow-menu.png",
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [135, 143, 153],
     "layer0.opacity": 1.0,
     "layer0.inner_margin": [0, 0]
   },
@@ -558,7 +558,7 @@
     "class": "sidebar_container",
     "settings": ["ui_separator"],
     "layer1.texture": "ayu/assets/separator-right.png",
-    "layer1.tint": [130, 140, 153],
+    "layer1.tint": [133, 136, 140],
     "layer1.inner_margin": [0, 1, 2, 1],
     "layer1.opacity": 0.2
   },
@@ -610,7 +610,7 @@
 
   {
     "class": "sidebar_label",
-    "color": [130, 140, 153],
+    "color": [133, 136, 140],
     "shadow_color": [0, 0, 0],
     "shadow_offset": [0, 0],
     "font.face": "Roboto mono",
@@ -625,13 +625,13 @@
   {
     "class": "sidebar_label",
     "parents": [{"class": "tree_row","attributes": ["hover"]}],
-    "color": [92, 103, 115]
+    "color": [92, 96, 102]
   },
 
   {
     "class": "sidebar_label",
     "parents": [{"class": "tree_row","attributes": ["selected"]}],
-    "color": [92, 103, 115],
+    "color": [92, 96, 102],
     "shadow_color": [0, 0, 0],
     "shadow_offset": [0, 0]
   },
@@ -639,7 +639,7 @@
   {
     "class": "sidebar_label",
     "parents": [{"class": "tree_row","attributes": ["expandable"]}],
-    "color": [130, 140, 153],
+    "color": [133, 136, 140],
     "font.bold": false
   },
 
@@ -653,13 +653,13 @@
   {
     "class": "sidebar_label",
     "parents": [{"class": "tree_row", "attributes": ["expandable", "hover"]}],
-    "color": [92, 103, 115]
+    "color": [92, 96, 102]
   },
 
   {
     "class": "sidebar_label",
     "parents": [{"class": "tree_row", "attributes": ["expanded"]}],
-    "color": [92, 103, 115]
+    "color": [92, 96, 102]
   },
 
   {
@@ -672,7 +672,7 @@
   // {
   //  "class": "sidebar_label",
   //  "parents": [{"class": "tree_row", "attributes": ["expanded", "selected"]}],
-  //  "color": [92, 103, 115]
+  //  "color": [92, 96, 102]
   // },
 
   {
@@ -710,7 +710,7 @@
     "layer0.opacity": 0,
 
     "layer1.texture": "ayu/assets/folder.png",
-    "layer1.tint": [130, 140, 153],
+    "layer1.tint": [135, 143, 153],
     "layer1.opacity": 1,
 
     "layer2.texture": "ayu/assets/folder-open.png",
@@ -794,11 +794,11 @@
     "class": "icon_folder_dup",
     "content_margin": [9, 9],
     "layer0.texture": "ayu/assets/folder.png",
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [135, 143, 153],
     "layer0.opacity": 1.0,
 
     "layer1.texture": "ayu/assets/folder-symlink.png",
-    "layer1.tint": [130, 140, 153],
+    "layer1.tint": [133, 136, 140],
     "layer1.opacity": 0.3
   },
 
@@ -830,7 +830,7 @@
     "layer0.texture": "ayu/assets/close.png",
     "layer0.opacity": 0,
     "layer0.inner_margin": [0, 0],
-    "layer0.tint": [130, 140, 153]
+    "layer0.tint": [133, 136, 140]
   },
 
 
@@ -847,7 +847,7 @@
     "class": "close_button",
     "attributes": ["dirty"],
     "layer0.texture": "ayu/assets/dirty.png",
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [133, 136, 140],
     "layer0.opacity": 1.0
   },
 
@@ -868,7 +868,7 @@
     "layer0.opacity": 1.0,
 
     "layer1.texture": "ayu/assets/scrollbar-vertical-wide.png",
-    "layer1.tint": [130, 140, 153],
+    "layer1.tint": [133, 136, 140],
     "layer1.opacity": 0.1,
     "layer1.inner_margin": [0, 10],
     "blur": false
@@ -894,7 +894,7 @@
   {
     "class": "puck_control",
     "layer0.texture": "ayu/assets/scrollbar-vertical-wide.png",
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [133, 136, 140],
     "layer0.opacity": 0.3,
     "layer0.inner_margin": [0, 10],
     "content_margin": [6, 12],
@@ -1009,7 +1009,7 @@
 
   {
     "class": "label_control",
-    "color": [130, 140, 153],
+    "color": [133, 136, 140],
     "shadow_color": [0, 0, 0, 0],
     "shadow_offset": [0, 0],
     "font.bold": false,
@@ -1027,7 +1027,7 @@
   {
     "class": "label_control",
     "parents": [{"class": "status_bar"}],
-    "color": [130, 140, 153],
+    "color": [133, 136, 140],
     "font.bold": false
   },
 
@@ -1062,7 +1062,7 @@
   {
     "class": "panel_button_control",
     "layer0.texture": "ayu/assets/switch-panel.png",
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [133, 136, 140],
     "layer0.opacity": 1.0
   },
 
@@ -1089,7 +1089,7 @@
     "settings": ["ui_separator"],
     "layer0.tint": [255, 255, 255],
     "layer1.texture": "ayu/assets/separator-top.png",
-    "layer1.tint": [130, 140, 153],
+    "layer1.tint": [133, 136, 140],
     "layer1.inner_margin": [1, 2, 1, 0],
     "layer1.opacity": 0.2
   },
@@ -1100,7 +1100,7 @@
     "class": "panel_close_button",
     "layer0.texture": "ayu/assets/close.png",
     "layer0.opacity": 1.0,
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [133, 136, 140],
     "content_margin": [0, 0] // 8,8 to show
   },
   // !!!
@@ -1122,7 +1122,7 @@
     "layer1.texture": "ayu/assets/input-border.png",
     "layer1.opacity": 0.2,
     "layer1.inner_margin": [10, 8],
-    "layer1.tint": [130, 140, 153],
+    "layer1.tint": [133, 136, 140],
     "content_margin": [10, 7, 10, 5]
   },
 
@@ -1146,7 +1146,7 @@
     "class": "dropdown_button_control",
     "content_margin": [12, 12],
     "layer0.texture": "ayu/assets/overflow-menu.png",
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [135, 143, 153],
     "layer0.opacity": 1.0
   },
   {
@@ -1181,7 +1181,7 @@
   {
     "class": "label_control",
     "parents": [{"class": "button_control"}],
-    "color":  [130, 140, 153]
+    "color":  [133, 136, 140]
   },
 
   {
@@ -1196,7 +1196,7 @@
     "class": "icon_button_control",
     "layer0.tint": [0, 0, 0],
     "layer0.opacity": 0,
-    "layer2.tint": [92, 103, 115],
+    "layer2.tint": [92, 96, 102],
     "layer2.opacity": { "target": 0.0, "speed": 10.0, "interpolation": "smoothstep" },
     "content_margin": [10, 5]
   },
@@ -1209,7 +1209,7 @@
   {
     "class": "icon_regex",
     "layer0.texture": "ayu/assets/regex.png",
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [133, 136, 140],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1225,7 +1225,7 @@
   {
     "class": "icon_case",
     "layer0.texture": "ayu/assets/matchcase.png",
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [133, 136, 140],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1241,7 +1241,7 @@
   {
     "class": "icon_whole_word",
     "layer0.texture": "ayu/assets/word.png",
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [133, 136, 140],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1258,7 +1258,7 @@
   {
     "class": "icon_wrap",
     "layer0.texture": "ayu/assets/wrap.png",
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [133, 136, 140],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1274,7 +1274,7 @@
   {
     "class": "icon_in_selection",
     "layer0.texture": "ayu/assets/inselection.png",
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [133, 136, 140],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1290,7 +1290,7 @@
   {
     "class": "icon_highlight",
     "layer0.texture": "ayu/assets/highlight.png",
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [133, 136, 140],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1306,7 +1306,7 @@
   {
     "class": "icon_preserve_case",
     "layer0.texture": "ayu/assets/replace-preserve-case.png",
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [133, 136, 140],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1322,7 +1322,7 @@
   {
     "class": "icon_context",
     "layer0.texture": "ayu/assets/context.png",
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [133, 136, 140],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1339,7 +1339,7 @@
   {
     "class": "icon_use_buffer",
     "layer0.texture": "ayu/assets/buffer.png",
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [133, 136, 140],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1355,7 +1355,7 @@
   {
     "class": "icon_reverse",
     "layer0.texture": "ayu/assets/reverse.png",
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [133, 136, 140],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
diff --git a/ayu-light.tmTheme b/ayu-light.tmTheme
index ad119b28..4032d1b2 100644
--- a/ayu-light.tmTheme
+++ b/ayu-light.tmTheme
@@ -26,7 +26,7 @@
 				<key>findHighlightForeground</key>
 				<string>#FAFAFA</string>
 				<key>foreground</key>
-				<string>#5C6773</string>
+				<string>#5C6066</string>
 				<key>guide</key>
 				<string>#D9D8D7</string>
 				<key>gutter</key>
@@ -45,7 +45,7 @@
 				<string>html, body {
   background-color: #FFFFFF;
   font-size: 12px;
-  color: #5C6773;
+  color: #5C6066;
   padding: 0;
 }
 body {
@@ -105,7 +105,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#5C6773</string>
+				<string>#5C6066</string>
 			</dict>
 		</dict>
 		<dict>
@@ -492,7 +492,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#5C6773</string>
+				<string>#5C6066</string>
 			</dict>
 		</dict>
 		<dict>
@@ -564,7 +564,7 @@ a {
 				<key>background</key>
 				<string>#ffffff10</string>
 				<key>foreground</key>
-				<string>#5C6773</string>
+				<string>#5C6066</string>
 			</dict>
 		</dict>
 		<dict>
diff --git a/ayu-light2.sublime-theme b/ayu-light2.sublime-theme
index 3043f7c3..932a325b 100644
--- a/ayu-light2.sublime-theme
+++ b/ayu-light2.sublime-theme
@@ -61,7 +61,7 @@
     "layer0.texture": "ayu/assets/unfold.png",
     "layer0.opacity": 1.0,
     "layer0.inner_margin": 0,
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [133, 136, 140],
     "content_margin": [8, 6, 8, 6]
   },
 
@@ -98,9 +98,9 @@
 
   {
     "class": "auto_complete_label",
-    "fg": [130, 140, 153],
+    "fg": [133, 136, 140],
     "match_fg": [255, 106, 0],
-    "selected_fg": [92, 103, 115],
+    "selected_fg": [92, 96, 102],
     "selected_match_fg": [255, 106, 0]
   },
 
@@ -131,7 +131,7 @@
 
   {
     "class": "tool_tip_label_control",
-    "color": [130, 140, 153],
+    "color": [133, 136, 140],
     "font.face": "Roboto mono",
     "font.size": 12
   },
@@ -151,7 +151,7 @@
     "layer0.texture": "ayu/assets/overlay-shadow.png",
     "layer0.inner_margin": [25, 45, 25, 35],
     "layer0.opacity": 1.0,
-    "layer0.tint": [160, 160, 160],
+    "layer0.tint": [126, 132, 140],
 
     "layer1.texture": "ayu/assets/overlay-bg.png",
     "layer1.inner_margin": [25, 45, 25, 35],
@@ -228,9 +228,9 @@
 
   {
     "class": "quick_panel_label",
-    "fg": [130, 140, 153],
+    "fg": [133, 136, 140],
     "match_fg": [255, 106, 0],
-    "selected_fg": [92, 103, 115],
+    "selected_fg": [92, 96, 102],
     "selected_match_fg": [255, 106, 0]
   },
 
@@ -239,9 +239,9 @@
   {
     "class": "quick_panel_label",
     "parents": [{"class": "overlay_control"}],
-    "fg": [130, 140, 153],
+    "fg": [133, 136, 140],
     "match_fg": [255, 106, 0],
-    "selected_fg": [92, 103, 115],
+    "selected_fg": [92, 96, 102],
     "selected_match_fg": [255, 106, 0]
   },
 
@@ -249,18 +249,18 @@
 
   {
     "class": "quick_panel_path_label",
-    "fg": [176, 190, 197],
-    "match_fg": [92, 103, 115],
-    "selected_fg": [130, 140, 153],
-    "selected_match_fg": [92, 103, 115]
+    "fg": [149, 156, 166],
+    "match_fg": [92, 96, 102],
+    "selected_fg": [133, 136, 140],
+    "selected_match_fg": [92, 96, 102]
   },
 
   // Panels data / score
 
   {
     "class": "quick_panel_score_label",
-    "fg": [130, 140, 153],
-    "selected_fg": [130, 140, 153]
+    "fg": [133, 136, 140],
+    "selected_fg": [133, 136, 140]
   },
 
 
@@ -292,7 +292,7 @@
     "content_margin": [0, 0, 0, 0],
     "layer1.opacity": 0.2,
     "layer1.texture": "ayu/assets/separator-bottom.png",
-    "layer1.tint": [130, 140, 153],
+    "layer1.tint": [133, 136, 140],
     "layer1.inner_margin": [1, 0, 1, 2]
   },
   {
@@ -325,12 +325,12 @@
     "settings": ["ui_separator"],
 
     "layer1.texture": "ayu/assets/separator-right.png",
-    "layer1.tint": [130, 140, 153],
+    "layer1.tint": [133, 136, 140],
     "layer1.inner_margin": [0, 1, 2, 1],
     "layer1.opacity": 0.2,
 
     "layer3.texture": "ayu/assets/separator-bottom.png",
-    "layer3.tint": [130, 140, 153],
+    "layer3.tint": [133, 136, 140],
     "layer3.inner_margin": [1, 0, 1, 2],
     "layer3.opacity": 0.2
   },
@@ -367,7 +367,7 @@
   {
     "class": "tab_label",
     "fg": [250, 250, 250, 0],
-    "shadow_color": [130, 140, 153],
+    "shadow_color": [133, 136, 140],
     "shadow_offset": [0, -1],
     "font.size": 12,
     "font.italic": false,
@@ -381,7 +381,7 @@
   },
   {
     "class": "tab_label",
-    "fg": [130, 140, 153],
+    "fg": [133, 136, 140],
     "settings": ["ui_fix_tab_labels"],
     "shadow_color": [250, 250, 250, 0],
     "shadow_offset": [0, 0]
@@ -393,14 +393,14 @@
     "class": "tab_label",
     "parents": [{"class": "tab_control", "attributes": ["selected"]}],
     "fg": [250, 250, 250, 0],
-    "shadow_color": [92, 103, 115],
+    "shadow_color": [92, 96, 102],
     "shadow_offset": [0, -1]
   },
   {
     "class": "tab_label",
     "settings": ["ui_fix_tab_labels"],
     "parents": [{"class": "tab_control", "attributes": ["selected"]}],
-    "fg": [92, 103, 115],
+    "fg": [92, 96, 102],
     "shadow_color": [250, 250, 250, 0],
     "shadow_offset": [0, 0]
   },
@@ -418,12 +418,12 @@
 
   // Close Icon
     "layer0.texture": "ayu/assets/close.png",
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [133, 136, 140],
     "layer0.opacity": 1.0,
 
   // Dirty Icon
     "layer1.texture": "ayu/assets/dirty.png",
-    "layer1.tint": [130, 140, 153],
+    "layer1.tint": [133, 136, 140],
     "layer1.opacity": 0
   },
 
@@ -482,7 +482,7 @@
     "class": "scroll_tabs_left_button",
     "content_margin": [12, 15],
     "layer0.texture": "ayu/assets/arrow-left.png",
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [135, 143, 153],
     "layer0.opacity": 1.0
   },
 
@@ -496,14 +496,14 @@
     "class": "scroll_tabs_right_button",
     "content_margin": [12, 15],
     "layer0.texture": "ayu/assets/arrow-right.png",
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [135, 143, 153],
     "layer0.opacity": 1.0
   },
   {
     "class": "scroll_tabs_right_button",
     "settings": ["ui_separator"],
     "layer2.texture": "ayu/assets/separator-right.png",
-    "layer2.tint": [130, 140, 153],
+    "layer2.tint": [133, 136, 140],
     "layer2.opacity": 0.2,
     "layer2.inner_margin" : [0, 1, 2, 1]
   },
@@ -518,7 +518,7 @@
     "class": "show_tabs_dropdown_button",
     "content_margin": [12, 12],
     "layer0.texture": "ayu/assets/overflow-menu.png",
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [135, 143, 153],
     "layer0.opacity": 1.0,
     "layer0.inner_margin": [0, 0]
   },
@@ -544,7 +544,7 @@
     "class": "sidebar_container",
     "settings": ["ui_separator"],
     "layer1.texture": "ayu/assets/separator-right.png",
-    "layer1.tint": [130, 140, 153],
+    "layer1.tint": [133, 136, 140],
     "layer1.inner_margin": [0, 1, 2, 1],
     "layer1.opacity": 0.2
   },
@@ -596,7 +596,7 @@
 
   {
     "class": "sidebar_label",
-    "color": [130, 140, 153],
+    "color": [133, 136, 140],
     "shadow_color": [0, 0, 0],
     "shadow_offset": [0, 0],
     "font.face": "Roboto mono",
@@ -611,13 +611,13 @@
   {
     "class": "sidebar_label",
     "parents": [{"class": "tree_row","attributes": ["hover"]}],
-    "color": [92, 103, 115]
+    "color": [92, 96, 102]
   },
 
   {
     "class": "sidebar_label",
     "parents": [{"class": "tree_row","attributes": ["selected"]}],
-    "color": [92, 103, 115],
+    "color": [92, 96, 102],
     "shadow_color": [0, 0, 0],
     "shadow_offset": [0, 0]
   },
@@ -625,7 +625,7 @@
   {
     "class": "sidebar_label",
     "parents": [{"class": "tree_row","attributes": ["expandable"]}],
-    "color": [130, 140, 153],
+    "color": [133, 136, 140],
     "font.bold": false
   },
 
@@ -639,13 +639,13 @@
   {
     "class": "sidebar_label",
     "parents": [{"class": "tree_row", "attributes": ["expandable", "hover"]}],
-    "color": [92, 103, 115]
+    "color": [92, 96, 102]
   },
 
   {
     "class": "sidebar_label",
     "parents": [{"class": "tree_row", "attributes": ["expanded"]}],
-    "color": [92, 103, 115]
+    "color": [92, 96, 102]
   },
 
   {
@@ -658,7 +658,7 @@
   // {
   //  "class": "sidebar_label",
   //  "parents": [{"class": "tree_row", "attributes": ["expanded", "selected"]}],
-  //  "color": [92, 103, 115]
+  //  "color": [92, 96, 102]
   // },
 
   {
@@ -672,7 +672,7 @@
   {
     "class": "disclosure_button_control",
     "layer0.texture": "ayu/assets/arrow-right.png",
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [135, 143, 153],
     "layer0.opacity": 1,
     "layer0.inner_margin": 0,
     "content_margin": [12, 15]
@@ -707,7 +707,7 @@
     "layer0.texture": "ayu/assets/close.png",
     "layer0.opacity": 0,
     "layer0.inner_margin": [0, 0],
-    "layer0.tint": [130, 140, 153]
+    "layer0.tint": [133, 136, 140]
   },
 
 
@@ -724,7 +724,7 @@
     "class": "close_button",
     "attributes": ["dirty"],
     "layer0.texture": "ayu/assets/dirty.png",
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [133, 136, 140],
     "layer0.opacity": 1.0
   },
 
@@ -888,7 +888,7 @@
 
   {
     "class": "label_control",
-    "color": [130, 140, 153],
+    "color": [133, 136, 140],
     "shadow_color": [0, 0, 0, 0],
     "shadow_offset": [0, 0],
     "font.bold": false,
@@ -906,7 +906,7 @@
   {
     "class": "label_control",
     "parents": [{"class": "status_bar"}],
-    "color": [130, 140, 153],
+    "color": [133, 136, 140],
     "font.bold": false
   },
 
@@ -956,7 +956,7 @@
     "settings": ["ui_separator"],
     "layer0.tint": [255, 255, 255],
     "layer1.texture": "ayu/assets/separator-top.png",
-    "layer1.tint": [130, 140, 153],
+    "layer1.tint": [133, 136, 140],
     "layer1.inner_margin": [1, 2, 1, 0],
     "layer1.opacity": 0.2
   },
@@ -967,7 +967,7 @@
     "class": "panel_close_button",
     "layer0.texture": "ayu/assets/close.png",
     "layer0.opacity": 1.0,
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [133, 136, 140],
     "content_margin": [0, 0] // 8,8 to show
   },
   // !!!
@@ -989,7 +989,7 @@
     "layer1.texture": "ayu/assets/input-border.png",
     "layer1.opacity": 0.2,
     "layer1.inner_margin": [10, 8],
-    "layer1.tint": [130, 140, 153],
+    "layer1.tint": [133, 136, 140],
     "content_margin": [10, 7, 10, 5]
   },
 
@@ -1013,7 +1013,7 @@
     "class": "dropdown_button_control",
     "content_margin": [12, 12],
     "layer0.texture": "ayu/assets/overflow-menu.png",
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [135, 143, 153],
     "layer0.opacity": 1.0
   },
   {
@@ -1048,7 +1048,7 @@
   {
     "class": "label_control",
     "parents": [{"class": "button_control"}],
-    "color":  [130, 140, 153]
+    "color":  [133, 136, 140]
   },
 
   {
@@ -1063,7 +1063,7 @@
     "class": "icon_button_control",
     "layer0.tint": [0, 0, 0],
     "layer0.opacity": 0,
-    "layer2.tint": [92, 103, 115],
+    "layer2.tint": [92, 96, 102],
     "layer2.opacity": { "target": 0.0, "speed": 10.0, "interpolation": "smoothstep" },
     "content_margin": [10, 5]
   },
@@ -1076,7 +1076,7 @@
   {
     "class": "icon_regex",
     "layer0.texture": "ayu/assets/regex.png",
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [133, 136, 140],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1092,7 +1092,7 @@
   {
     "class": "icon_case",
     "layer0.texture": "ayu/assets/matchcase.png",
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [133, 136, 140],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1108,7 +1108,7 @@
   {
     "class": "icon_whole_word",
     "layer0.texture": "ayu/assets/word.png",
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [133, 136, 140],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1125,7 +1125,7 @@
   {
     "class": "icon_wrap",
     "layer0.texture": "ayu/assets/wrap.png",
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [133, 136, 140],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1141,7 +1141,7 @@
   {
     "class": "icon_in_selection",
     "layer0.texture": "ayu/assets/inselection.png",
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [133, 136, 140],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1157,7 +1157,7 @@
   {
     "class": "icon_highlight",
     "layer0.texture": "ayu/assets/highlight.png",
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [133, 136, 140],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1173,7 +1173,7 @@
   {
     "class": "icon_preserve_case",
     "layer0.texture": "ayu/assets/replace-preserve-case.png",
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [133, 136, 140],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1189,7 +1189,7 @@
   {
     "class": "icon_context",
     "layer0.texture": "ayu/assets/context.png",
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [133, 136, 140],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1206,7 +1206,7 @@
   {
     "class": "icon_use_buffer",
     "layer0.texture": "ayu/assets/buffer.png",
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [133, 136, 140],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1222,7 +1222,7 @@
   {
     "class": "icon_reverse",
     "layer0.texture": "ayu/assets/reverse.png",
-    "layer0.tint": [130, 140, 153],
+    "layer0.tint": [133, 136, 140],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
diff --git a/ayu-mirage.sublime-theme b/ayu-mirage.sublime-theme
index 37670ab0..159699ed 100644
--- a/ayu-mirage.sublime-theme
+++ b/ayu-mirage.sublime-theme
@@ -61,7 +61,7 @@
     "layer0.texture": "ayu/assets/unfold.png",
     "layer0.opacity": 1.0,
     "layer0.inner_margin": 0,
-    "layer0.tint": [96, 112, 128],
+    "layer0.tint": [115, 134, 153],
     "content_margin": [8, 6, 8, 6]
   },
 
@@ -98,7 +98,7 @@
 
   {
     "class": "auto_complete_label",
-    "fg": [96, 112, 128],
+    "fg": [115, 134, 153],
     "match_fg": [255, 204, 102],
     "selected_fg": [217, 215, 206],
     "selected_match_fg": [255, 204, 102]
@@ -131,7 +131,7 @@
 
   {
     "class": "tool_tip_label_control",
-    "color": [96, 112, 128],
+    "color": [115, 134, 153],
     "font.face": "Roboto mono",
     "font.size": 12
   },
@@ -228,7 +228,7 @@
 
   {
     "class": "quick_panel_label",
-    "fg": [96, 112, 128],
+    "fg": [115, 134, 153],
     "match_fg": [255, 204, 102],
     "selected_fg": [217, 215, 206],
     "selected_match_fg": [255, 204, 102]
@@ -239,7 +239,7 @@
   {
     "class": "quick_panel_label",
     "parents": [{"class": "overlay_control"}],
-    "fg": [96, 112, 128],
+    "fg": [115, 134, 153],
     "match_fg": [255, 204, 102],
     "selected_fg": [217, 215, 206],
     "selected_match_fg": [255, 204, 102]
@@ -249,9 +249,9 @@
 
   {
     "class": "quick_panel_path_label",
-    "fg": [96, 112, 128],
+    "fg": [102, 115, 127],
     "match_fg": [217, 215, 206],
-    "selected_fg": [96, 112, 128],
+    "selected_fg": [115, 134, 153],
     "selected_match_fg": [217, 215, 206]
   },
 
@@ -259,8 +259,8 @@
 
   {
     "class": "quick_panel_score_label",
-    "fg": [96, 112, 128],
-    "selected_fg": [96, 112, 128]
+    "fg": [115, 134, 153],
+    "selected_fg": [115, 134, 153]
   },
 
 
@@ -292,7 +292,7 @@
     "content_margin": [0, 0, 0, 0],
     "layer1.opacity": 0.3,
     "layer1.texture": "ayu/assets/separator-bottom.png",
-    "layer1.tint": [96, 112, 128],
+    "layer1.tint": [115, 134, 153],
     "layer1.inner_margin": [1, 0, 1, 2]
   },
   {
@@ -325,12 +325,12 @@
     "settings": ["ui_separator"],
 
     "layer1.texture": "ayu/assets/separator-right.png",
-    "layer1.tint": [96, 112, 128],
+    "layer1.tint": [115, 134, 153],
     "layer1.inner_margin": [0, 1, 2, 1],
     "layer1.opacity": 0.3,
 
     "layer3.texture": "ayu/assets/separator-bottom.png",
-    "layer3.tint": [96, 112, 128],
+    "layer3.tint": [115, 134, 153],
     "layer3.inner_margin": [1, 0, 1, 2],
     "layer3.opacity": 0.3
   },
@@ -367,7 +367,7 @@
   {
     "class": "tab_label",
     "fg": [33, 39, 51, 0],
-    "shadow_color": [96, 112, 128],
+    "shadow_color": [115, 134, 153],
     "shadow_offset": [0, -1],
     "font.size": 12,
     "font.italic": false,
@@ -388,7 +388,7 @@
   },
   {
     "class": "tab_label",
-    "fg": [96, 112, 128],
+    "fg": [115, 134, 153],
     "settings": ["ui_fix_tab_labels"],
     "shadow_color": [33, 39, 51, 0],
     "shadow_offset": [0, 0]
@@ -431,12 +431,12 @@
 
   // Close Icon
     "layer0.texture": "ayu/assets/close.png",
-    "layer0.tint": [96, 112, 128],
+    "layer0.tint": [115, 134, 153],
     "layer0.opacity": 1.0,
 
   // Dirty Icon
     "layer1.texture": "ayu/assets/dirty.png",
-    "layer1.tint": [96, 112, 128],
+    "layer1.tint": [115, 134, 153],
     "layer1.opacity": 0,
   },
 
@@ -517,7 +517,7 @@
     "class": "scroll_tabs_right_button",
     "settings": ["ui_separator"],
     "layer2.texture": "ayu/assets/separator-right.png",
-    "layer2.tint": [96, 112, 128],
+    "layer2.tint": [115, 134, 153],
     "layer2.opacity": 0.3,
     "layer2.inner_margin" : [0, 1, 2, 1]
   },
@@ -558,7 +558,7 @@
     "class": "sidebar_container",
     "settings": ["ui_separator"],
     "layer1.texture": "ayu/assets/separator-right.png",
-    "layer1.tint": [96, 112, 128],
+    "layer1.tint": [115, 134, 153],
     "layer1.inner_margin": [0, 1, 2, 1],
     "layer1.opacity": 0.3
   },
@@ -610,7 +610,7 @@
 
   {
     "class": "sidebar_label",
-    "color": [96, 112, 128],
+    "color": [115, 134, 153],
     "shadow_color": [0, 0, 0],
     "shadow_offset": [0, 0],
     "font.face": "Roboto mono",
@@ -639,7 +639,7 @@
   {
     "class": "sidebar_label",
     "parents": [{"class": "tree_row","attributes": ["expandable"]}],
-    "color": [96, 112, 128],
+    "color": [115, 134, 153],
     "font.bold": false
   },
 
@@ -798,7 +798,7 @@
     "layer0.opacity": 1.0,
 
     "layer1.texture": "ayu/assets/folder-symlink.png",
-    "layer1.tint": [96, 112, 128],
+    "layer1.tint": [115, 134, 153],
     "layer1.opacity": 0.3
   },
 
@@ -830,7 +830,7 @@
     "layer0.texture": "ayu/assets/close.png",
     "layer0.opacity": 0,
     "layer0.inner_margin": [0, 0],
-    "layer0.tint": [96, 112, 128]
+    "layer0.tint": [115, 134, 153]
   },
 
 
@@ -847,7 +847,7 @@
     "class": "close_button",
     "attributes": ["dirty"],
     "layer0.texture": "ayu/assets/dirty.png",
-    "layer0.tint": [96, 112, 128],
+    "layer0.tint": [115, 134, 153],
     "layer0.opacity": 1.0
   },
 
@@ -868,7 +868,7 @@
     "layer0.opacity": 1.0,
 
     "layer1.texture": "ayu/assets/scrollbar-vertical-wide.png",
-    "layer1.tint": [96, 112, 128],
+    "layer1.tint": [115, 134, 153],
     "layer1.opacity": 0.1,
     "layer1.inner_margin": [0, 10],
     "blur": false
@@ -894,7 +894,7 @@
   {
     "class": "puck_control",
     "layer0.texture": "ayu/assets/scrollbar-vertical-wide.png",
-    "layer0.tint": [96, 112, 128],
+    "layer0.tint": [115, 134, 153],
     "layer0.opacity": 0.3,
     "layer0.inner_margin": [0, 10],
     "content_margin": [6, 12],
@@ -1009,7 +1009,7 @@
 
   {
     "class": "label_control",
-    "color": [96, 112, 128],
+    "color": [115, 134, 153],
     "shadow_color": [0, 0, 0, 0],
     "shadow_offset": [0, 0],
     "font.bold": false,
@@ -1027,7 +1027,7 @@
   {
     "class": "label_control",
     "parents": [{"class": "status_bar"}],
-    "color": [96, 112, 128],
+    "color": [115, 134, 153],
     "font.bold": false
   },
 
@@ -1062,7 +1062,7 @@
   {
     "class": "panel_button_control",
     "layer0.texture": "ayu/assets/switch-panel.png",
-    "layer0.tint": [96, 112, 128],
+    "layer0.tint": [115, 134, 153],
     "layer0.opacity": 1.0
   },
 
@@ -1089,7 +1089,7 @@
     "settings": ["ui_separator"],
     "layer0.tint": [39, 45, 56],
     "layer1.texture": "ayu/assets/separator-top.png",
-    "layer1.tint": [96, 112, 128],
+    "layer1.tint": [115, 134, 153],
     "layer1.inner_margin": [1, 2, 1, 0],
     "layer1.opacity": 0.3
   },
@@ -1100,7 +1100,7 @@
     "class": "panel_close_button",
     "layer0.texture": "ayu/assets/close.png",
     "layer0.opacity": 1.0,
-    "layer0.tint": [96, 112, 128],
+    "layer0.tint": [115, 134, 153],
     "content_margin": [0, 0] // 8,8 to show
   },
   // !!!
@@ -1122,7 +1122,7 @@
     "layer1.texture": "ayu/assets/input-border.png",
     "layer1.opacity": 0.3,
     "layer1.inner_margin": [10, 8],
-    "layer1.tint": [96, 112, 128],
+    "layer1.tint": [115, 134, 153],
     "content_margin": [10, 7, 10, 5]
   },
 
@@ -1181,7 +1181,7 @@
   {
     "class": "label_control",
     "parents": [{"class": "button_control"}],
-    "color":  [96, 112, 128]
+    "color":  [115, 134, 153]
   },
 
   {
@@ -1209,7 +1209,7 @@
   {
     "class": "icon_regex",
     "layer0.texture": "ayu/assets/regex.png",
-    "layer0.tint": [96, 112, 128],
+    "layer0.tint": [115, 134, 153],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1225,7 +1225,7 @@
   {
     "class": "icon_case",
     "layer0.texture": "ayu/assets/matchcase.png",
-    "layer0.tint": [96, 112, 128],
+    "layer0.tint": [115, 134, 153],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1241,7 +1241,7 @@
   {
     "class": "icon_whole_word",
     "layer0.texture": "ayu/assets/word.png",
-    "layer0.tint": [96, 112, 128],
+    "layer0.tint": [115, 134, 153],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1258,7 +1258,7 @@
   {
     "class": "icon_wrap",
     "layer0.texture": "ayu/assets/wrap.png",
-    "layer0.tint": [96, 112, 128],
+    "layer0.tint": [115, 134, 153],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1274,7 +1274,7 @@
   {
     "class": "icon_in_selection",
     "layer0.texture": "ayu/assets/inselection.png",
-    "layer0.tint": [96, 112, 128],
+    "layer0.tint": [115, 134, 153],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1290,7 +1290,7 @@
   {
     "class": "icon_highlight",
     "layer0.texture": "ayu/assets/highlight.png",
-    "layer0.tint": [96, 112, 128],
+    "layer0.tint": [115, 134, 153],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1306,7 +1306,7 @@
   {
     "class": "icon_preserve_case",
     "layer0.texture": "ayu/assets/replace-preserve-case.png",
-    "layer0.tint": [96, 112, 128],
+    "layer0.tint": [115, 134, 153],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1322,7 +1322,7 @@
   {
     "class": "icon_context",
     "layer0.texture": "ayu/assets/context.png",
-    "layer0.tint": [96, 112, 128],
+    "layer0.tint": [115, 134, 153],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1339,7 +1339,7 @@
   {
     "class": "icon_use_buffer",
     "layer0.texture": "ayu/assets/buffer.png",
-    "layer0.tint": [96, 112, 128],
+    "layer0.tint": [115, 134, 153],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1355,7 +1355,7 @@
   {
     "class": "icon_reverse",
     "layer0.texture": "ayu/assets/reverse.png",
-    "layer0.tint": [96, 112, 128],
+    "layer0.tint": [115, 134, 153],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
diff --git a/ayu-mirage2.sublime-theme b/ayu-mirage2.sublime-theme
index bb86ad38..c382be71 100644
--- a/ayu-mirage2.sublime-theme
+++ b/ayu-mirage2.sublime-theme
@@ -61,7 +61,7 @@
     "layer0.texture": "ayu/assets/unfold.png",
     "layer0.opacity": 1.0,
     "layer0.inner_margin": 0,
-    "layer0.tint": [96, 112, 128],
+    "layer0.tint": [115, 134, 153],
     "content_margin": [8, 6, 8, 6]
   },
 
@@ -98,7 +98,7 @@
 
   {
     "class": "auto_complete_label",
-    "fg": [96, 112, 128],
+    "fg": [115, 134, 153],
     "match_fg": [255, 204, 102],
     "selected_fg": [217, 215, 206],
     "selected_match_fg": [255, 204, 102]
@@ -131,7 +131,7 @@
 
   {
     "class": "tool_tip_label_control",
-    "color": [96, 112, 128],
+    "color": [115, 134, 153],
     "font.face": "Roboto mono",
     "font.size": 12
   },
@@ -228,7 +228,7 @@
 
   {
     "class": "quick_panel_label",
-    "fg": [96, 112, 128],
+    "fg": [115, 134, 153],
     "match_fg": [255, 204, 102],
     "selected_fg": [217, 215, 206],
     "selected_match_fg": [255, 204, 102]
@@ -239,7 +239,7 @@
   {
     "class": "quick_panel_label",
     "parents": [{"class": "overlay_control"}],
-    "fg": [96, 112, 128],
+    "fg": [115, 134, 153],
     "match_fg": [255, 204, 102],
     "selected_fg": [217, 215, 206],
     "selected_match_fg": [255, 204, 102]
@@ -249,9 +249,9 @@
 
   {
     "class": "quick_panel_path_label",
-    "fg": [96, 112, 128],
+    "fg": [102, 115, 127],
     "match_fg": [217, 215, 206],
-    "selected_fg": [96, 112, 128],
+    "selected_fg": [115, 134, 153],
     "selected_match_fg": [217, 215, 206]
   },
 
@@ -259,8 +259,8 @@
 
   {
     "class": "quick_panel_score_label",
-    "fg": [96, 112, 128],
-    "selected_fg": [96, 112, 128]
+    "fg": [115, 134, 153],
+    "selected_fg": [115, 134, 153]
   },
 
 
@@ -292,7 +292,7 @@
     "content_margin": [0, 0, 0, 0],
     "layer1.opacity": 0.3,
     "layer1.texture": "ayu/assets/separator-bottom.png",
-    "layer1.tint": [96, 112, 128],
+    "layer1.tint": [115, 134, 153],
     "layer1.inner_margin": [1, 0, 1, 2]
   },
   {
@@ -325,12 +325,12 @@
     "settings": ["ui_separator"],
 
     "layer1.texture": "ayu/assets/separator-right.png",
-    "layer1.tint": [96, 112, 128],
+    "layer1.tint": [115, 134, 153],
     "layer1.inner_margin": [0, 1, 2, 1],
     "layer1.opacity": 0.3,
 
     "layer3.texture": "ayu/assets/separator-bottom.png",
-    "layer3.tint": [96, 112, 128],
+    "layer3.tint": [115, 134, 153],
     "layer3.inner_margin": [1, 0, 1, 2],
     "layer3.opacity": 0.3
   },
@@ -367,7 +367,7 @@
   {
     "class": "tab_label",
     "fg": [33, 39, 51, 0],
-    "shadow_color": [96, 112, 128],
+    "shadow_color": [115, 134, 153],
     "shadow_offset": [0, -1],
     "font.size": 12,
     "font.italic": false,
@@ -381,7 +381,7 @@
   },
   {
     "class": "tab_label",
-    "fg": [96, 112, 128],
+    "fg": [115, 134, 153],
     "settings": ["ui_fix_tab_labels"],
     "shadow_color": [33, 39, 51, 0],
     "shadow_offset": [0, 0]
@@ -418,12 +418,12 @@
 
   // Close Icon
     "layer0.texture": "ayu/assets/close.png",
-    "layer0.tint": [96, 112, 128],
+    "layer0.tint": [115, 134, 153],
     "layer0.opacity": 1.0,
 
   // Dirty Icon
     "layer1.texture": "ayu/assets/dirty.png",
-    "layer1.tint": [96, 112, 128],
+    "layer1.tint": [115, 134, 153],
     "layer1.opacity": 0
   },
 
@@ -503,7 +503,7 @@
     "class": "scroll_tabs_right_button",
     "settings": ["ui_separator"],
     "layer2.texture": "ayu/assets/separator-right.png",
-    "layer2.tint": [96, 112, 128],
+    "layer2.tint": [115, 134, 153],
     "layer2.opacity": 0.3,
     "layer2.inner_margin" : [0, 1, 2, 1]
   },
@@ -544,7 +544,7 @@
     "class": "sidebar_container",
     "settings": ["ui_separator"],
     "layer1.texture": "ayu/assets/separator-right.png",
-    "layer1.tint": [96, 112, 128],
+    "layer1.tint": [115, 134, 153],
     "layer1.inner_margin": [0, 1, 2, 1],
     "layer1.opacity": 0.3
   },
@@ -596,7 +596,7 @@
 
   {
     "class": "sidebar_label",
-    "color": [96, 112, 128],
+    "color": [115, 134, 153],
     "shadow_color": [0, 0, 0],
     "shadow_offset": [0, 0],
     "font.face": "Roboto mono",
@@ -625,7 +625,7 @@
   {
     "class": "sidebar_label",
     "parents": [{"class": "tree_row","attributes": ["expandable"]}],
-    "color": [96, 112, 128],
+    "color": [115, 134, 153],
     "font.bold": false
   },
 
@@ -707,7 +707,7 @@
     "layer0.texture": "ayu/assets/close.png",
     "layer0.opacity": 0,
     "layer0.inner_margin": [0, 0],
-    "layer0.tint": [96, 112, 128]
+    "layer0.tint": [115, 134, 153]
   },
 
 
@@ -724,7 +724,7 @@
     "class": "close_button",
     "attributes": ["dirty"],
     "layer0.texture": "ayu/assets/dirty.png",
-    "layer0.tint": [96, 112, 128],
+    "layer0.tint": [115, 134, 153],
     "layer0.opacity": 1.0
   },
 
@@ -888,7 +888,7 @@
 
   {
     "class": "label_control",
-    "color": [96, 112, 128],
+    "color": [115, 134, 153],
     "shadow_color": [0, 0, 0, 0],
     "shadow_offset": [0, 0],
     "font.bold": false,
@@ -906,7 +906,7 @@
   {
     "class": "label_control",
     "parents": [{"class": "status_bar"}],
-    "color": [96, 112, 128],
+    "color": [115, 134, 153],
     "font.bold": false
   },
 
@@ -956,7 +956,7 @@
     "settings": ["ui_separator"],
     "layer0.tint": [39, 45, 56],
     "layer1.texture": "ayu/assets/separator-top.png",
-    "layer1.tint": [96, 112, 128],
+    "layer1.tint": [115, 134, 153],
     "layer1.inner_margin": [1, 2, 1, 0],
     "layer1.opacity": 0.3
   },
@@ -967,7 +967,7 @@
     "class": "panel_close_button",
     "layer0.texture": "ayu/assets/close.png",
     "layer0.opacity": 1.0,
-    "layer0.tint": [96, 112, 128],
+    "layer0.tint": [115, 134, 153],
     "content_margin": [0, 0] // 8,8 to show
   },
   // !!!
@@ -989,7 +989,7 @@
     "layer1.texture": "ayu/assets/input-border.png",
     "layer1.opacity": 0.3,
     "layer1.inner_margin": [10, 8],
-    "layer1.tint": [96, 112, 128],
+    "layer1.tint": [115, 134, 153],
     "content_margin": [10, 7, 10, 5]
   },
 
@@ -1048,7 +1048,7 @@
   {
     "class": "label_control",
     "parents": [{"class": "button_control"}],
-    "color":  [96, 112, 128]
+    "color":  [115, 134, 153]
   },
 
   {
@@ -1076,7 +1076,7 @@
   {
     "class": "icon_regex",
     "layer0.texture": "ayu/assets/regex.png",
-    "layer0.tint": [96, 112, 128],
+    "layer0.tint": [115, 134, 153],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1092,7 +1092,7 @@
   {
     "class": "icon_case",
     "layer0.texture": "ayu/assets/matchcase.png",
-    "layer0.tint": [96, 112, 128],
+    "layer0.tint": [115, 134, 153],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1108,7 +1108,7 @@
   {
     "class": "icon_whole_word",
     "layer0.texture": "ayu/assets/word.png",
-    "layer0.tint": [96, 112, 128],
+    "layer0.tint": [115, 134, 153],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1125,7 +1125,7 @@
   {
     "class": "icon_wrap",
     "layer0.texture": "ayu/assets/wrap.png",
-    "layer0.tint": [96, 112, 128],
+    "layer0.tint": [115, 134, 153],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1141,7 +1141,7 @@
   {
     "class": "icon_in_selection",
     "layer0.texture": "ayu/assets/inselection.png",
-    "layer0.tint": [96, 112, 128],
+    "layer0.tint": [115, 134, 153],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1157,7 +1157,7 @@
   {
     "class": "icon_highlight",
     "layer0.texture": "ayu/assets/highlight.png",
-    "layer0.tint": [96, 112, 128],
+    "layer0.tint": [115, 134, 153],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1173,7 +1173,7 @@
   {
     "class": "icon_preserve_case",
     "layer0.texture": "ayu/assets/replace-preserve-case.png",
-    "layer0.tint": [96, 112, 128],
+    "layer0.tint": [115, 134, 153],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1189,7 +1189,7 @@
   {
     "class": "icon_context",
     "layer0.texture": "ayu/assets/context.png",
-    "layer0.tint": [96, 112, 128],
+    "layer0.tint": [115, 134, 153],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1206,7 +1206,7 @@
   {
     "class": "icon_use_buffer",
     "layer0.texture": "ayu/assets/buffer.png",
-    "layer0.tint": [96, 112, 128],
+    "layer0.tint": [115, 134, 153],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1222,7 +1222,7 @@
   {
     "class": "icon_reverse",
     "layer0.texture": "ayu/assets/reverse.png",
-    "layer0.tint": [96, 112, 128],
+    "layer0.tint": [115, 134, 153],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
diff --git a/messages.json b/messages.json
index 647df65a..513fd2ac 100644
--- a/messages.json
+++ b/messages.json
@@ -10,5 +10,6 @@
   "2.0.3": "messages/2.0.3.txt",
   "2.1.0": "messages/2.1.0.txt",
   "2.1.1": "messages/2.1.1.txt",
-  "2.2.0": "messages/2.2.0.txt"
+  "2.2.0": "messages/2.2.0.txt",
+  "2.2.1": "messages/2.2.1.txt"
 }
diff --git a/messages/2.2.1.txt b/messages/2.2.1.txt
new file mode 100644
index 00000000..3ec1e3e3
--- /dev/null
+++ b/messages/2.2.1.txt
@@ -0,0 +1,8 @@
+ayu theme for Sublime Text
+https://github.com/dempfi/ayu/releases
+
+Version 2.2.1
+********************************************************************************
+
+
+🎨 💄 Improved color contrast
diff --git a/package.json b/package.json
index ecb71c81..33d8e00e 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "url": "https://github.com/dempfi/ayu/issues"
   },
   "scripts": {
-    "start": "gulp watch",
+    "watch": "gulp watch",
     "b": "gulp",
     "c": "gulp clean"
   },
diff --git a/src/templates/sublime.syntax.xml b/src/templates/sublime.syntax.xml
index 57b65a29..20d6d762 100644
--- a/src/templates/sublime.syntax.xml
+++ b/src/templates/sublime.syntax.xml
@@ -28,11 +28,11 @@
 				<key>foreground</key>
 				<string>#"{common.fg.hex}"</string>
 				<key>guide</key>
-				<string>#"{syntax.gutterFg.hex}"</string>
+				<string>#"{syntax.gutter.hex}"</string>
 				<key>gutter</key>
 				<string>#"{common.bg.hex}"</string>
 				<key>gutterForeground</key>
-				<string>#"{syntax.gutterFg.hex}"</string>
+				<string>#"{syntax.gutter.hex}"</string>
 				<key>inactiveBackground</key>
 				<string>#"{common.bg.hex}"</string>
 				<key>inactiveSelection</key>
diff --git a/src/templates/sublime.syntax.yml b/src/templates/sublime.syntax.yml
index 080867a9..41f4cbc1 100644
--- a/src/templates/sublime.syntax.yml
+++ b/src/templates/sublime.syntax.yml
@@ -20,7 +20,7 @@ settings:
     findHighlight: &constant '#"{syntax.constant.hex}"'
     findHighlightForeground: *bg
     foreground: &fg '#"{common.fg.hex}"'
-    guide: &gutter '#"{syntax.gutterFg.hex}"'
+    guide: &gutter '#"{syntax.gutter.hex}"'
     gutter: *bg
     gutterForeground: *gutter
     invisibles: '#FF0000'
diff --git a/src/themes/dark.yml b/src/themes/dark.yml
index 3f4f021b..c8df4631 100644
--- a/src/themes/dark.yml
+++ b/src/themes/dark.yml
@@ -6,7 +6,7 @@ common:
   accent: F29718
 
 ui:
-  fg: '3E4B59'
+  fg: '515C66'
   panel:
     bg: 14191F
     shadow: '000000'
@@ -26,15 +26,15 @@ ui:
 syntax:
   error: FF3333
   line_hg: 151A1F
-  gutterFg: 2D3640
+  gutter: 35404C
   selection: '253340'
   stack_guide: 1A2633
   active_guide: '314559'
 
-  tag: 36A3D9
+  tag: 50B4E6
   func: FFB454
   regexp: 95E6CB
-  string: B8CC52
+  string: C2D94C
   sup_var: F07178
   keyword: FF7733
   es_spec: E6B673
diff --git a/src/themes/light.yml b/src/themes/light.yml
index 5ca693a2..f732fa2c 100644
--- a/src/themes/light.yml
+++ b/src/themes/light.yml
@@ -1,20 +1,20 @@
 theme: light
 
 common:
-  fg: 5C6773
-  bg: FAFAFA
-  accent: FF6A00
+  accent: 'FF6A00'
+  bg: 'FAFAFA'
+  fg: '5C6066'
 
 ui:
-  fg: '828C99'
+  fg: '85888C'
   panel:
     bg: FFFFFF
-    shadow: 'A0A0A0'
-    path_fg: B0BEC5
     row_bg: F5F5F5
+    shadow: '7E848C'
+    path_fg: 959CA6
 
   folder:
-    normal: '828C99'
+    normal: '878F99'
 
   scrollbar:
     puck: '000000'
@@ -26,7 +26,7 @@ ui:
 syntax:
   error: FF3333
   line_hg: F2F2F2
-  gutterFg: D9D8D7
+  gutter: D9D8D7
   selection: F0EEE4
   stack_guide: DEDDDC
   active_guide: B3B2B1
diff --git a/src/themes/mirage.yml b/src/themes/mirage.yml
index f1b9050a..b5991499 100644
--- a/src/themes/mirage.yml
+++ b/src/themes/mirage.yml
@@ -6,11 +6,11 @@ common:
   accent: FFCC66
 
 ui:
-  fg: '607080'
+  fg: '738699'
   panel:
     bg: 272D38
     shadow: '11141A'
-    path_fg: '607080'
+    path_fg: '66737F'
     row_bg: '303540'
 
   folder:
@@ -19,13 +19,13 @@ ui:
   scrollbar:
     puck: 'FFFFFF'
 
-  opacity: '0.3'
   grid_divider: '343D4A' # {fg} at {opacity}
   minimap: '100, 100, 100'
+  opacity: '0.3'
 
 syntax:
   error: FF3333
-  gutterFg: 3D4752
+  gutter: 3D4752
   line_hg: '242B38'
   selection: '343F4C'
   stack_guide: '39434D'
diff --git a/widgets/Widget - ayu-dark.stTheme b/widgets/Widget - ayu-dark.stTheme
index 910f3b0c..8ed0294f 100644
--- a/widgets/Widget - ayu-dark.stTheme	
+++ b/widgets/Widget - ayu-dark.stTheme	
@@ -79,7 +79,7 @@
       <key>settings</key>
       <dict>
         <key>foreground</key>
-        <string>#B8CC52</string>
+        <string>#C2D94C</string>
       </dict>
     </dict>
     <dict>
diff --git a/widgets/Widget - ayu-light.stTheme b/widgets/Widget - ayu-light.stTheme
index d3eb86cc..0e6bcfc9 100644
--- a/widgets/Widget - ayu-light.stTheme	
+++ b/widgets/Widget - ayu-light.stTheme	
@@ -23,7 +23,7 @@
         <key>caret</key>
         <string>#FF6A00</string>
         <key>foreground</key>
-        <string>#5C6773</string>
+        <string>#5C6066</string>
         <key>inactiveSelection</key>
         <string>#F0EEE488</string>
         <key>invisibles</key>