From 57a2aa32b7b779b697f74bf93a6da9ae8a05b8c8 Mon Sep 17 00:00:00 2001
From: Ike Ku <dempfi@yahoo.com>
Date: Sat, 9 Dec 2017 21:52:24 +0200
Subject: [PATCH] UI (#159)

* Prepare new themes

* New color format

* Simplified ui colors

* Improved shadows and borders

* Better separators

* Tabs

* Adjust tabs to separators

* Remove redundand files

* Correct invisibles color in widgets

* Remove sublime text 2 themes

* New version

* Prepare new version release
---
 Preferences.sublime-settings            |   19 +
 README.md                               |   46 +-
 activation.py                           |   10 +-
 assets/close.png                        |  Bin 158 -> 148 bytes
 assets/close@2x.png                     |  Bin 289 -> 266 bytes
 assets/dirty.png                        |  Bin 214 -> 193 bytes
 assets/dirty@2x.png                     |  Bin 331 -> 279 bytes
 assets/input-search.png                 |  Bin 463 -> 445 bytes
 assets/input-search@2x.png              |  Bin 969 -> 984 bytes
 assets/overlay-bg.png                   |  Bin 343 -> 280 bytes
 assets/overlay-bg@2x.png                |  Bin 790 -> 585 bytes
 assets/overlay-border.png               |  Bin 394 -> 384 bytes
 assets/overlay-border@2x.png            |  Bin 956 -> 814 bytes
 assets/overlay-shadow.png               |  Bin 2137 -> 1380 bytes
 assets/overlay-shadow@2x.png            |  Bin 6360 -> 4013 bytes
 assets/tree-highlight-separators.png    |  Bin 118 -> 107 bytes
 assets/tree-highlight-separators@2x.png |  Bin 159 -> 145 bytes
 assets/tree-highlight.png               |  Bin 234 -> 176 bytes
 assets/tree-highlight@2x.png            |  Bin 383 -> 284 bytes
 ayu-dark.sublime-theme                  |  377 +++----
 ayu-dark.tmTheme                        |   64 +-
 ayu-dark2.sublime-theme                 | 1280 -----------------------
 ayu-light.sublime-theme                 |  421 ++++----
 ayu-light.tmTheme                       |   66 +-
 ayu-light2.sublime-theme                | 1280 -----------------------
 ayu-mirage.sublime-theme                |  377 +++----
 ayu-mirage.tmTheme                      |   64 +-
 ayu-mirage2.sublime-theme               | 1280 -----------------------
 gulpfile.js                             |   44 +-
 messages.json                           |    3 +-
 messages/4.0.0.md                       |   22 +
 package.json                            |    8 +-
 src/templates/sublime.syntax.xml        |  202 ++--
 src/templates/sublime.syntax.yml        |   74 +-
 src/templates/sublime.ui.json           |  323 +++---
 src/templates/sublime2.ui.json          | 1280 -----------------------
 src/templates/sublime2.widget.json      |    9 -
 src/templates/widget.xml                |   28 +-
 src/themes/color.js                     |   47 +
 src/themes/dark.js                      |   60 ++
 src/themes/dark.yml                     |   44 -
 src/themes/light.js                     |   60 ++
 src/themes/light.yml                    |   44 -
 src/themes/mirage.js                    |   60 ++
 src/themes/mirage.yml                   |   44 -
 widgets/Widget - ayu-dark.stTheme       |   16 +-
 widgets/Widget - ayu-light.stTheme      |   16 +-
 widgets/Widget - ayu-mirage.stTheme     |   16 +-
 yarn.lock                               | 1095 -------------------
 49 files changed, 1228 insertions(+), 7551 deletions(-)
 create mode 100644 Preferences.sublime-settings
 delete mode 100644 ayu-dark2.sublime-theme
 delete mode 100644 ayu-light2.sublime-theme
 delete mode 100644 ayu-mirage2.sublime-theme
 create mode 100644 messages/4.0.0.md
 delete mode 100644 src/templates/sublime2.ui.json
 delete mode 100644 src/templates/sublime2.widget.json
 create mode 100644 src/themes/color.js
 create mode 100644 src/themes/dark.js
 delete mode 100644 src/themes/dark.yml
 create mode 100644 src/themes/light.js
 delete mode 100644 src/themes/light.yml
 create mode 100644 src/themes/mirage.js
 delete mode 100644 src/themes/mirage.yml
 delete mode 100644 yarn.lock

diff --git a/Preferences.sublime-settings b/Preferences.sublime-settings
new file mode 100644
index 00000000..8d077ff8
--- /dev/null
+++ b/Preferences.sublime-settings
@@ -0,0 +1,19 @@
+{
+    // ayu theme: Use native titlebars on macOs
+    "ui_native_titlebar": false,
+
+    // ayu theme: Show separators between panels
+    "ui_separator": false,
+
+    // ayu theme: Use smaller font size for UI
+    "ui_font_size_small": false,
+
+    // ayu theme: Use Source Code Pro as UI font
+    "ui_font_source_code_pro": false,
+
+    // ayu theme: Use Roboto Mono as UI font
+    "ui_font_roboto_mono": false,
+
+    // ayu theme: Display wider scrollbars
+    "ui_wide_scrollbars": false
+}
diff --git a/README.md b/README.md
index 6c64a41e..03492b57 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-![ayu](https://i.imgur.com/lt4pIAI.png)
+![ayu](https://i.imgur.com/akLUOXg.png)
 
 `ayu` is a simple theme with bright colors and comes in three versions — *dark*, *mirage* and *light* for all day long comfortable work.
 
@@ -12,22 +12,22 @@
 
 ### Screenshots
 
-<h6 align='center'>Light with <code>ui_separator</code> option off</h6>
+<h6 align='center'>Light with <code>ui_separator</code> option on</h6>
 
-![Light](https://i.imgur.com/DbWFq76.png)
+![Light](https://i.imgur.com/pQQfIio.png)
 
 ---
 
 
-<h6 align='center'>Mirage with <code>ui_separator</code> option on</h6>
+<h6 align='center'>Mirage with <code>ui_separator</code> option off</h6>
 
-![Mirage](https://i.imgur.com/BOYGmHf.png)
+![Mirage](https://i.imgur.com/KYXJbBu.png)
 
 ---
 
-<h6 align='center'>Dark with <code>ui_separator</code> option off</h6>
+<h6 align='center'>Dark with <code>ui_separator</code> option on</h6>
 
-![Dark](https://i.imgur.com/pmkHtQJ.png)
+![Dark](https://i.imgur.com/lo8XBTr.png)
 
 ### Settings
 
@@ -35,10 +35,8 @@
 "ui_native_titlebar":       true, // use native titlebars on macOs
 "ui_separator":             true, // separators between panels
 "ui_font_size_small":       true, // smaller UI font size(sidebar, statusbar etc)
-"ui_big_tabs":              true, // increased tab height
-"ui_fix_tab_labels":        true, // to fix tab labels if they look not right
 "ui_font_source_code_pro":  true, // use Source Code Pro (https://fonts.google.com/specimen/Source+Code+Pro) as UI font
-"ui_font_default":          true, // use Sublime's default UI font
+"ui_font_roboto_mono":      true, // use Roboto Mono (https://fonts.google.com/specimen/Roboto+Mono) as UI font
 "ui_wide_scrollbars":       true, // wider scrollbars
 ```
 
@@ -99,32 +97,8 @@ For dark theme:
 
 ### Sublime Text 2
 
-_Sublime Text 2 version may have some glitches, if you notice something, please file an issue._
-
-Add this lines to your user settings *Preferences > Setting - User*:
-
-For light theme:
-
-```js
-"theme": "ayu-light2.sublime-theme",
-"color_scheme": "Packages/ayu/ayu-light.tmTheme",
-```
-
-For mirage theme:
-
-```js
-"theme": "ayu-mirage2.sublime-theme",
-"color_scheme": "Packages/ayu/ayu-mirage.tmTheme",
-```
-
-For dark theme:
-
-```js
-"theme": "ayu-dark2.sublime-theme",
-"color_scheme": "Packages/ayu/ayu-dark.tmTheme",
-```
-
-**NOTE:** Restart Sublime Text after activation of the theme to avoid any glitches.
+ayu no longer supports Sublime Text 2. But you still can download
+and install manually [previous version](https://github.com/dempfi/ayu/releases/tag/3.2.2).
 
 ### Related projects and ports
 
diff --git a/activation.py b/activation.py
index da160589..cb536161 100644
--- a/activation.py
+++ b/activation.py
@@ -1,9 +1,5 @@
 # -*- coding: utf-8 -*-
 
-"""
-Material Theme Activation
-"""
-
 import sublime
 import sublime_plugin
 import functools
@@ -66,7 +62,7 @@ def display_list(self, themes):
     self.initial_color_scheme = get_color_scheme()
     self.initial_ui_theme = get_ui_theme()
 
-    quick_list = [theme for theme in self.themes]
+    quick_list = [theme.replace("-", " ") for theme in self.themes]
     self.quick_list = quick_list
 
     self.window.show_quick_panel(quick_list, self.on_done, on_highlight=self.on_highlighted)
@@ -88,10 +84,10 @@ def on_done(self, index):
     activate_ui_theme(ui_theme)
 
   def _quick_list_to_scheme(self, index):
-    return 'Packages/ayu/%s.tmTheme' % self.quick_list[index]
+    return 'Packages/ayu/%s.tmTheme' % THEMES[index]
 
   def _quick_list_to_theme(self, index):
-    return '%s.sublime-theme' % self.quick_list[index]
+    return '%s.sublime-theme' % THEMES[index]
 
   def run(self):
     self.display_list(THEMES)
diff --git a/assets/close.png b/assets/close.png
index 4e6ed8552032d10f39102252b70ba6e057f840e3..a1b25791346701bf1a14c9bf7326856f1ade79b8 100644
GIT binary patch
literal 148
zcmeAS@N?(olHy`uVBq!ia0vp^JU}eK!3HFi66di4DaPU;cPEB*=VV?2Iewlljv*SN
z$q5o_5B~rE|IOhKo6F*A&gC*@oH<DvY)aY=X^S<So;!%vF<esUdFY~6!mILe;@rkF
v$FexgSZ^FTFssmuA@$?Q#I2Pa983%*W?c`%7fnb3n#|zo>gTe~DWM4fa-S|(

literal 158
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;`o-U3d
z7J|tM6091EAO8QZuU4pIUKFU(AX8JMk+o6th+5ks&biHN7-#mb<I|U4^^ti3TOyDC
zK@;PH5+O?`&h0&;c1kEmYC~tDDbIYTnxY6^X~!l8=?7g85B`1k6=(s2r>mdKI;Vst
E060rBy8r+H

diff --git a/assets/close@2x.png b/assets/close@2x.png
index 818472bbcf2c7fc02c73840f34ada3eccc73e3f9..597a9ff497c99bf32ee8d7c8ba802a8ca93e7df4 100644
GIT binary patch
literal 266
zcmV+l0rmcgP)<h;3K|Lk000e1NJLTq000;O001Be1^@s62wu2200001b5ch_0Itp)
z=>Px##7RU!R7ef&RSOEjFccfRgC26{6+BLtlnGraSt1GweehU6NnRIT>9Wk24*Z`3
zrIZbMOHWP?xsrE?<5M0;y9lud2Om+S16oC5PC`hqC+i%dgE@)z6D6SbdL20*360jI
z$kk>i_{5yau$tgXzwSefZTJ$VILB5SuU3U`f_PFS?O=S?A_%tP)$`HXTR*6T)Sgw$
z5pXcWVhJ(9)?zUMtcU|J-vUN-iGXjL!Fm&{OVoOdB6p+~ZwYfe9rzswcJ${4*1Q7O
Q)c^nh07*qoM6N<$f~^o{0{{R3

literal 289
zcmV++0p9+JP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004XF*Lt006O%
z3;baP0002kNkl<ZSPAV`0SbgL3={uwKGOFd+;e6k9?UUoGk4-a2gS{%Nvu;g3^Aeu
z(SfITAf+@TUaC*luvV?x;Wu$y(i`D6LF`t8%LNk!k;_C&&F-nog+i!cOC59VA@*QQ
zk+Y;FVCBwurF>1Oc26Qz!G+)lYX*mFld5`EJjD2!eT6B`x%)HCNymKg7jr%-g6-zG
z_Z2`e7hm6b?cPs1X$e`mE@nIe9!!%Ng;>G5%(M`;)Et@t8P5V7(oY8Xe6w~r6UaXq
nn3xdP#1C5&iReIdpkoIX{`dygwstd100000NkvXXu0mjfy^C{<

diff --git a/assets/dirty.png b/assets/dirty.png
index d395f5b9f9ab7e098748d014231ac23f06259f8a..e56f7ef98acb20482d7ea8e1b8ff9f50f6689f1f 100644
GIT binary patch
literal 193
zcmeAS@N?(olHy`uVBq!ia0vp^JU}eK!3HFi66di4DaPU;cPEB*=VV?2In|ynjv*SN
zR|5|6HYf-@j%k-H5x5(cULevd-@LZyi9*JoOHXz%u}00wmJf2{P^?(PTUaYLaqE>O
zmPdrUZY0fpkt`I^#M{4U0o%T+#lcPY7V{a0?`mG*n$ExCL3}%Z)T&0a$xGju<rtW-
rN=cdU|NXZ1jI+-C`@b?~N$bC!T>5T8!)X_wGZ;Kw{an^LB{Ts5c<M#L

literal 214
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6<No-U3d
z7J|tM60AKtnjZZB|NoYQrS*zGif(SlR^PZ{lqk%S)yL2k&zO{~v5!H7`}i_3XPy*e
zf&Xkt%rjIvc#kMB6p3;jc*YdHpv%=kJ-%UO%ckc{KMnK`E|J(E$uM1|o3Tjk#>N?O
z43*r6xg&HLwR#wmCbaDg;90VPU1?zkODj8v%rVhkftM3~nHWrBLp5jTh`$6njKR~@
K&t;ucLK6V=6h!p^

diff --git a/assets/dirty@2x.png b/assets/dirty@2x.png
index 7fe0dbc3f011fa354c095f1468fbb73f0e541bc1..2e6df8fb5bab7172ba9ef0e09d20cbfdece2a1c6 100644
GIT binary patch
literal 279
zcmV+y0qFjTP)<h;3K|Lk000e1NJLTq000;O001Be1^@s62wu2200001b5ch_0Itp)
z=>Px#(Md!>R7ef&RKX2{FbpJp!wlVpnYutnY8Rmcv=TeechfsWL`3aCfQpYJSq*3V
z&Rj`~!j?H;4jk`*_r5}05e=dnf_q}srU^k%BU*&En5$Qbuo3amm?NAuc_L__Evd;P
z{(j3^(XNy7dKchlB`3kGWzVvOX&%!N7d$r-yOThWb-+t0m%!f6xgVP}ixNC}DNW#&
zN7Gk7r5;V-CKb<M_nG{d#(%KeXF9S@b`bgBK?_=gNb10?zbYb;aM|%}?0eY-5&Ja<
d%z<qVd;#jBjtMMKL}LH|002ovPDHLkV1m|XZ{h#|

literal 331
zcmV-R0kr;!P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004XF*Lt006O%
z3;baP00033Nkl<ZSPAWw%MHRX5JV&HDIk4Nf$x-)0&<`rD1io`0FdZ`J7!+Az7R!T
ziI@oCl}2{F<Nb^ir)jEH1*!s7fnQS~#@Gsja26g0=B%|v`%!`*+=V&A7m5@?VBu+*
zPa1bZXJF1624~qK6cE`{=X=dJ?_IJc;KSf9cN_}F`C@cANuG+qXB-W2Nb4Vu3U(o)
zY?liLXJqOn&2im+1>|kVy4)r>BU5{FT>P_gdNwb?@fL8iWLrnl#JM`SZUqh&te3pA
zMVqfT?$J|#i=)8neuh-3B7(5aMU-T+BGQGV$BE$!iC<(?0*-@=iM!#uKcgZY)u2^@
ds=(hX@B%V@b5PtAN7MiS002ovPDHLkV1i34hbRC5

diff --git a/assets/input-search.png b/assets/input-search.png
index 8a1e47c6ba639dab20dd91a8d7edde266e57a938..b66dda5442553e64e0ac67d1ef75c6e8c73947bd 100644
GIT binary patch
literal 445
zcmV;u0Yd(XP)<h;3K|Lk000e1NJLTq001fg001Ef1^@s6uLL=m00001b5ch_0Itp)
z=>Px$cS%G+R9Fe^mLX3<Q5c4qG=h@YL=r|AT4m1J7(al`Vzv7R40I#GA7Ig9U^7uP
zQA`kUBql*O2o?+5_4&dzeA~HPwtKkXzOy~!p7Xu;ye}V@1DT8s>wtB@I$#~xiVg%p
zkb`S@g*p7d81A695pRMZb(lgIT5t$?IENefhFi#{78r90`30A*5Y)=>0v(se>pI5r
zaZ4wiA;SP@_Fw{yaBXd`n94KRjcbUu38T3B#B`X-7pJw#hUh<`r0?0$3klCF?Dw|f
zo}xe1_xKK)!*Hfem(1tX7h2;x=m&<!+H}eMi277(d<X4ec&1HVbDqrtwS5@6G+x#*
zu7Mop<v0fD9-tjZo45vJ`NfgLd^c)y>Q^A68m04A!#E2aki)#GjaVzdBZT9fi=x)8
zZH{>ZMj+?pGu*=fX3&NzNJts!hLx@mq68Npe@;%|?~&m805&IV)W@j8_M^0^*9cpL
nK0Ku!#sXLetOM48f6{?phcZYIS1pv$00000NkvXXu0mjf-S@@}

literal 463
zcmV;=0WkiFP)<h;3K|Lk000e1NJLTq001KZ001Ef1^@s6QxOtU00004XF*Lt006O%
z3;baP0004oNkl<ZSPAWvy-EW?6os=Ug^E~9)F(&?R)S)mDy3kXN3gd_Z<)e6m7OnO
zWn~IGi-?fMlnPcVsOxuNMlQ=Hi|%fMI0rs<es1nPxjQ?RN>J!P=s@VeAL~FI$E$D*
zSMUTca1UqDn%m!@*gi~Pnm*Y$g=(p$C?F%RAdR654cLG-48W^jni(qS)%cE_GhRz8
z#(D?dKx(JO<X$7O&WJRIR3p9!`zIic{92(;66>%^-K@mK)IbMY+OqLWc9LV<aK9a9
z<%pu_otPUJcVOd-GPB~6KHB6n#y;-D#uQ~{;*##z<TJ)T?qNpE@3wgNy3nLSRt92r
zLHErwtY^jlc%P&#SAa*{nU;XPWw=!k>P?Hwy-sr7tdi~#eZDoDl({<MjWCRxcE8Xu
z$*a&;6(@bZm!L~<1bQ`AcTDPqnn)(2fUbTOPfBN`2ThO>seD5+NTF>wf<xGY@59P?
z6Xt6u*)==IOx+l|wtEX1J3~XB7Yi{EiiQq^4*a_gd;!79##!pG#E1X@002ovPDHLk
FV1kiV%g_J-

diff --git a/assets/input-search@2x.png b/assets/input-search@2x.png
index a2197eabfd697615eb447d1bdaedc705a5b62a62..195443226628b3b87b6eeeb0137de9a7a2b8a79e 100644
GIT binary patch
literal 984
zcmeAS@N?(olHy`uVBq!ia0vp^AwcZJ!3HExKKbYlq!^2X+?^QKos)UVz`#7o)5S5Q
zg7NLFv)&<r631j0-pWX6S@BRwL?>#?$xzjax{C^=w@kkE)IoPqs8fBD#MNV4cTZTf
zpddV8w%s(*Ru|Wu8j}<{c=GojpQ&tR@wo7vt=aQ)zYpb~+gpCF@?7nF%kQu6WM*zO
zU_ZlHd_V>_wZKwF<B8>270+EK-j~d*^IBVez<fsg^$!ekVqC5AQ^a0dHcVuHz^Bvb
zuM?EXRdxMx_N`orP0V=*;{*OQN$y~1Um(2AnO~;O+ko3B<fHUD=j_X~UI-m;$*W-F
zk~C(V`|fv?>epY1Qg=G`9WSb0Yqs-W-;>m5?g4w+o4=~~>`wf_*A;#ttl#fSu18e+
zPU)Hc5%=b*Dc<^i&^q8w>ocoAo<Fu3shb!D&wN?OQNotMC=!16+nwnut5@&TbFfOk
zRyrfxm~*dSz#o?N#f7G8Gqz1$k=H9CtXL*>*ZuS>Pa{dE{R>Szw{Vw)URxVDL9peW
zf=0>0Th{{EQuZ3FRK(2`GLFn%f6e*-*&=<<Me6H#m7i(P@c!_xEpplF2VeSso;Z@T
zV%}NN^WLr-{Fm>)zr1}0?^`|fA6L~cij>azXD8n~gZFNzU%^2zzwXgu!OaV2H3h%X
z6g_A+_unFaenaV1KYd*NS8{xN`NjU{7XhHOOqdKrx;w$vq{-lW+w)W3+cztIZ@06X
z{@YS+)BOMId?(2+=uCW=x6tUWeu;nMBjzJDCcl3=O$t6WZN|6khw<EJnf6SvFno94
z=+P{dTimlUFB$(Wn6`33xu8gVLi)5@ylY)IRk1I*z~UA!X5D>G;1A=`n>r?oFDg6?
zyI`%*ns$r*(i@w%smtnQ#E+U(1#VOQTm}($H=E6oTXOD7;yX9BZf(PDk$Ydfo?IpU
zLUsbTFCYIe6*t@1vv*lfY+bLj*XQh2d-no|?PlQ*q;_0CkRN$XWKLSI$;E}~#kPL0
zIA3VYY23Tu!uRQp!q?0f7<K(Q{3Pw^u{-ON*ZjL+z`6Q->zXj$yXk$0PhFk!G->KB
zQ}?WOZW&KK4hrnuX2I#a;HQu8!OUwJf?smh9Y4AJ!;FdBU3RLaXi4WRSy!m~lxtbv
zRpX%Gvf1ySnfl0{Eq}(id3DmN*-kt+iu;ycH!RgV{xZ)uYlaoqX9ITiZOg)6AH|aa
gz?q}*Sn&h-Qz=y?YI_)-1G6fFr>mdKI;Vst0H@c;#Q*>R

literal 969
zcmV;)12+7LP)<h;3K|Lk000e1NJLTq002e+002S=1^@s6>c60p00004XF*Lt006O%
z3;baP000AkNkl<ZcmeI0&r4N76vur+*djwAL<xy9%66>-BZBD1vW3t>5Lzm@b0_sL
zWK^5}g$jefek{sG(IRM3^a~`6!bQIg`eFI{9C*p`aNl(AbJTh7odX}<oO@@^J@b8c
z=FUt@i<>Lp3b+EUfGgk%xB{+#E8q&a0<M57;0m|`uE2UKP+HH2t@c^va=DurCo1gb
zSNu+R5A*O0ZoqV@RQkkkV;h3(gDbEEd2EqNm!Y>Im7!y8a1nk(E%t*(XQ8!W1fnxN
z@Bm`ib%L}P5huwxhEDX*iHDFi6kc)tD%^oN_zc@%Cme;7upO*D=E4AT&o_IcE__6h
z;gj{I%yE4Pg2STHevIFbU~P&E!S>0DMB<lhZ}9JeycM~P`hD;Otc~Xml1fE-AYY$9
zrYHCCH`S6O?K<GOiT4%1tCn~h)`o=TldMgKPoX!(CQti4AYy2nwDpqp$+{ctI%OzE
z!o)oT+CJda^cKd*r%((MJ*_jR{1T!}l*DO=FQDysD8VQX4n3g2J)7t?KCMdy+E=Yg
zoCR*)G8GOQe}$WpFtYd2c3V3U$~InqC}v8+$f8c$8|_3W+jz1dtZFF<(_ylVy*sw?
z%I0}1+?0foqXTWL`b_IUm9mYum{Di>QcA+ed5X5+tF9~NEZcZ?Xsrm7k}z_}r0tk?
zB9v{sM-gJKeFzp9r}QF&@>^(&@nqt3!FSMhC`Rlxk3q(rASZ9y#$r5}fai2j%C8}%
z(Gu<^$;xr0HaR-z3%3g2rTqc;se@9U2)9b?E(!O797k$<ieo?JxiY8S4wwgR?{K!}
z3XoDIl9n@CYcII4w@9AUmp8?VB5?<c#7U+uiMN8B(OO&Jf`}G8yXC%2v@)msf-D=&
z)7es<O6y&R-bm+XV1LH5WkYxq{+;>CidGhHyFku-55r~%*(e*!3!w_h-b0)%FqQR}
zN4hqWZ0G-%7y`(!8V7p<mscB^Xa`}mN`v|pN5rF3GH*<RoV?{RS*J|E^4EuQA#swN
zW2(JLbWV;VkH7%*gY17~mn<7X+55;c|31uQ9dd~{+&d4}>UYkuJ*m}4oDs;f`W{xb
z3ZmPgO0{7%tm`#p8F8}SocX2{!*)7DoLO6^X??^Q2H85yf-DZ*Tme_W6>tSy0aw5k
ra0OfeSHKl;1zZ7Fz!h)>Hb8;D#`^cJ2a<DO00000NkvXXu0mjfA)Lv$

diff --git a/assets/overlay-bg.png b/assets/overlay-bg.png
index 81cb6b0acbd2d20c62246498768f0910ecb2941b..e238c92fa67827580a55b0128a5db73e5a7f2111 100644
GIT binary patch
literal 280
zcmeAS@N?(olHy`uVBq!ia0vp^8bIvG!3HE3vp)L|q!^2X+?^QKos)S9<XrM}aSX{|
zeS6K3ugQU@HSt(<hK2p}4<;Kv@jR}6)Fhj0<tF@JO;v5n++VFneS{ksm^c&~(1-)^
z9AECGKV1|v^=3hT_4EFO$_<|uu4zl}i4SuA``-PiP-xCYr`&C;zDcdMUwJz!d;8>B
z*I%D$vNbY@TFmO49>0irf9Ub1&`K7;HC!RTf3kro<NFW7Y~NgvpEot~L!HHfU&T+>
z)QZP$uls%ImFa!&UyokBt~R^#_}<6uFYiuJhdat4?g6L!<3@!X$u41_?-)E?{an^L
HB{Ts5e`9i*

literal 343
zcmeAS@N?(olHy`uVBq!ia0vp^Hb5N3!3HFs1e%%xDVB6cUq=Rpjs4tz5?L7-82LP1
z978G?-`;TKI^@8^8t__I<otU}o8EOc&c0o%ox~@JSp8s2Q&gS*B=zYWKR!k#77hUg
zhXw`$3?6lZ^PhF!*}gM=w_ZJa(>Jpt4{m1MDZlgTWY1%MS>I=6yUy*cJ{?@1;Pb2J
zjCb(6>{-jQgRco~K7OD$yV<ZX{oYRFoE9DC{tZjL`psf4N-w<D=6)k+sk`*L7rg=5
zhm~_yUV1DiT^A}9b+s%__hL2Ap9s^~pEqZQzD(Y2_D}BLb!La4n)Y+;4K?e2eogVc
nCij19a`pRtc%5EQ(a3M|vQa@ZuJ<}Hq!>J1{an^LB{Ts5a4LIO

diff --git a/assets/overlay-bg@2x.png b/assets/overlay-bg@2x.png
index 9605b43fc79c26b4b1f49dc5aadde772235809ca..a7dff1c950cea456e2d9057c60869d1a711e3f8e 100644
GIT binary patch
literal 585
zcmeAS@N?(olHy`uVBq!ia0vp^0YKcu!3HERKKJhgQjEnx?oJHr&dI!FU|?eQba4!+
zV0?S~peJ*n0K<hN&VIL=csax#9`ssseDZ|usT^jCHyU(jtX}sywN>HZ;dAnTU;Q>%
zaOljreRKbwe7HL*l7&M+!J&bHk%?-Iy7mLRcAd?fb?%W=xZrfb<$}irr)G;Eov-vx
zDewC0ugOo3p2}jsqxMMck?N!6VY|y-CkB@-7Hy3_Ecjh;@tSMioR0!o6Rzy(+o7>)
z?~<I?OTS*JExphD*mJw>d&Nbs9_qMO^d9+quR7_d?>7FPu3g>_?LI~Muid_G^&_|2
z%ipe8U7atw{zLJL(E8BGUkzm+x#sKm+D!>(w2<9(L8G4gz`E}-AG!LIzUtO8_!u#>
z%n<QdHrt`WvoU2CCpjD$femxdOP7|uUz@}<-|cGmzFptL7;pHs_3hgA{o2<V&cVfd
zbS<qv|J<Fs$;b6q*}Jui%I?p4Yms|ozr~~5;d$$C_566wKePNk^LL*6^>e<v{D1aA
i^4NP~BjZEs0qIDw;^vw5`#XSXgTd3)&t;ucLK6UwaObW7

literal 790
zcmeAS@N?(olHy`uVBq!ia0vp^6+pa&gAGW=`@N6_QY`6?zK#qG8~eHcB(gFvFrD>u
zaSW+oe0yi3@8JLeh6^o9qH7K?dGI(MR5|0^I;G8XLIhJM>n5hmgLnFaTtyCE^gs9f
z`%>)*kLK?#x3d=cmXs){;LyOp$i%`SFqjz!44F<R+f8|CeAwWQtDV1Kzu<Pk>w>n|
z&CKq*>~Y<rH~sYadGThq_b%SJx?_6B`ws85-|p(RU(J!excCE`)JM6Asas>zE<RZ;
z$NO@_^Wrx@FC^aI7`-hf%I{_Puj&FHuiek<TvDth>y?)Oe)IiFPDZ`2%Wuc2hUcdR
zpVs|)ildz4TAgls?9AfZGkqTl{S}@0?O%At8_q4g-e1n%Xg*(fM?}hI4s+6*a+l^{
zX}^a;w%6_zDlRy9)SsF6+Ji?-M^76cl!}R2P*JHC(cH}~qJN$xyP&Y~(bJg;yn1>8
zdu)W)96ZX}H9ft_bjJ>dkDq)tu!)On#LeTx(5$a_Vcz+(yNsT1GoF2jC4W<y`KMEJ
zZl_4ynYZRVSk(LP4cF5b9xq-#_x4Nui@%@eUtd1;=F=Bn?Y8U9KA&~@+pZRl^#v>L
ze65|lx8>=4U%z^OyEW<c{@<jQI!n|G4`345Eb@bO=f&dY0KPL`z=Y1=>FVdQ&MBb@
E0HKNt<p2Nx

diff --git a/assets/overlay-border.png b/assets/overlay-border.png
index c8c417369c10004fba28fb9e9c87c2035553e4e7..bcac0638af0cb0161f2b427489b0ce732815e3ab 100644
GIT binary patch
literal 384
zcmeAS@N?(olHy`uVBq!ia0vp^8bIvG!3HE3vp)L|q*&4&eH|GXHuiJ>Nn~YUU^Mr1
zaSX{|eLH<4*C7W17h&#X%^TecTtE5${?`+mbcmlLLTa{!^E$zzo4n%8hje%j-M#nb
z-scw6(;`X=OxTft;sp0=?9+FzyPf!$BX?nvf#$v&Nv}DtR?aj3xaGZUd2`0Qmc{HV
znxsT3A6}NV*zahhAK}D5Xa8>g=uQ>(*o9lCX1~46yvrfyTF=y(7u7#xuPu1J-PnGX
zm`$F?g5{F;*nU2{^ZwYHTh$jY^W-<P=GnbG+Z)Okw@!ZM_JbR%?C%CQudHwlU<u}2
zGVi*y$iWb%mCyI)Z#Y_Uq%v<BN1RN;*$-wXJa3rppDFsAr3!3@=^U>+HPafW#tGP-
zoniE8{=;qU7CCxmpLR<>2|YYx-;4Qb*FrlQIH2gjf1w`?0?q;F?WP300R}09r>mdK
II;Vst0C^*uaR2}S

literal 394
zcmeAS@N?(olHy`uVBq!ia0vp^Hb5N3!3HFs1e%%xDVB6cUq=Rpjs4tz5?L7-7#%%b
z978G?-`+UO+vFh7mYBpYr`vYKEQ59TCcfDhnx|~6i)Z2#=bL@=g@XP`w*P5!D%pf@
zu6yjjz{ny%B=Jo@!0YAKcTxFkZyh%5dt0u!(8+!6^lJ-BSL)s}EPfOGe52XF)$_v}
z=dGD->%RYn<(4}o_dHiy#CJJwxv6?@=bYlodGFRd`ty7BzMkz;g?i8LRQ-Rxe)Wz^
zyE?8}`mg0aGq1mGv%f}^yl@{^T7UYXo9ZHK`#IfNHy<~C_(r(v+V!eKlmGoT+glmX
z9K7XZY0c|4d9S+IddCkNi!Ia7IbZ(D){uXze<R}q!xcAg-}&-C|D(?Jxl(rL)b3p}
gNhjdRZ+agX57$b}Z<+ty5E!@&p00i_>zopr0BiM@-T(jq

diff --git a/assets/overlay-border@2x.png b/assets/overlay-border@2x.png
index bc8a03431ab1d75b194178204533ddb4a081090b..b41c57bfbd263324fa5455f88d20d8454fd5fb73 100644
GIT binary patch
literal 814
zcmeAS@N?(olHy`uVBq!ia0vp^0YKcu!3HERKKJhgQY`6?zK#qG8~eHcB(gFvFg^8j
zaSW+oe0zJpzH^|&v5#WRNd^-Pwsvx^KKS2Wa?K2tw=Rbg1WXsqTW+h)(>8nG`>D?R
z@;`l3vOQjGZ@b-o(&d8<P7I7J0uD4Fc5(6SzE?Q)_u1#4O?$01_O5=stSa_y`rhnM
z;a?~Jx@RlHXJ7JWX%(}`y@f*aS8T8LyjOck{O;GNj`F+hCHvE@7Cf+dzVX+JBNf*Q
zSJefaFHy>W`hKs>m;dG_AE#Bt+XlT~5xf1B^xywKA8lVU+m2!HtDffz!e4ooWt_da
z@>H|swYmOR?XE|s?!0EWHi+?bYW1>`W4i-x9N)5}v2#kc|Kamj?e2R&_1Zn>ugd%&
zu9rLa{E7)*`@quY<fGLGOM^D))pOrl#;DaEpZmAz;qyJ6ySC2Kn6TM$@#bYAW(%Bs
zzjiFQ3rwGrdD29;*p&0d_e#C}x3)!@MxT{BH*+V`U$vX2(Q>o)ti73at>A>ufurg?
zv08igo$sFWaeGeY{5B&-<>%khk26WsykKB4&=8P0$3-EP!*Rjdnf=y|$A2q*uWiri
zUL&b!9R47i^U2xXwP9z&Hn$b0F;)3*I&JM7y>`~xG~VZDSiZF7UH6#o_3GH!r&~7O
zo|GAqwlXq#a#o4i0`rn;|4$Kjqk2V8+?=z~)*<)K$8gS9{~ib1KDrln+hwZGJ@vPr
z`u=WNZ@VNui|e%7=cmkDZ{=35dzj6)`eSXckV^cPpN}Hmsw@6-J@tFy-FsoL=Pt~g
uEp2+;|Lf}bufH@I>Ya&AZx8G_YM2yKrUyK8<9!6o01Te4elF{r5}E*o7D{vg

literal 956
zcmeAS@N?(olHy`uVBq!ia0vp^6+pa&gAGW=`@N6_QY`6?zK#qG8~eHcB(gFvFc*8e
zIEGX(zP)3ZCmbli_P`>@%Fp2-V^A>@S60vykxUEsa}%5k1iYkFvh)O`T3TjymM<*{
zY%4WVuJ^BsQ-1pP-|xQ_vfdx(&6Q-~5KwSvU|?h#v<!Xq4b?lH|Nfu&?e|~TH%~7c
z-9P><_l&t=zh&LgbM?pmNPYG`cQ^05`nF@!m;&F0o{=|<uTE)Ot$Y6MlJBB3o*U-N
zZ~dh^ufDHR^7D=L_cq%cD_UcdCRZ&x^W~o<r*A%b!d$5Pz1(JhrSBD+Z<7=^KiP5j
zk&J(tJmZY%Ph~iNE#!7di!?fV?CGv6-Unij#N02=_p-KpwCKdN@X0bW4eNgz&r=r2
zxV}<c`TqA?d#|T1Q;p8~cKy8N_UV6amKF5-+1c|w-O=5zTF>wQ+eUBZyJ;@j*X$T~
zt9OPU{a%xKWXGFXrkib5de+1mZ#yem@SXeKMSHGLL8bV*mQ#iCcaNW3XT9U?_q&X{
zp1=7ccW3Wy!Ji^Fi<VV+uwH-bwkG65$E;V1qA}a0HwGP4&RW$TQgAo#h!<=Bij{If
z2TOMgYKu};@u_pH&&^-U@0))+)aajD)!)T`+SkYym+4vL&z|u3ZsO%ng=e>=<%(}A
zK3M7BBO}j0ds=_?Hq-3W6Lg)AK0SZkJ=$z@;0lc!;s?w(<?NoVaZ^|3*0#-o8#HeE
zMwo5N**RO|M(&g-v(1Goo)+!BH%0Z|&#dGty%+AB`tb69M_%fWEfePtP*P3Ua=>1Y
X`A)pp#1B=#?8xBh>gTe~DWM4fVs2zL

diff --git a/assets/overlay-shadow.png b/assets/overlay-shadow.png
index f89bb627e773392b98be785f288b8ef027a40913..37993d2d9b8a57ab189b400a9ac05776ca650427 100644
GIT binary patch
literal 1380
zcmV-q1)KVbP)<h;3K|Lk000e1NJLTq001Ze002P<1^@s6qXp*w00001b5ch_0Itp)
z=>Px)9!W$&RA>e5nAvt4ArJ+n#Mzhs|Ih5J(uJn*6@#Qa`T@@AGy_d{abd=e4~Ny3
z0!x9Vz*1l-uoPGdECrSVOM#`pQeY{t6nL@<9Pg2xPN!MS|BRg`xp!m7<8e2Z>t=-x
z1C%lMeCEx*0QdZ125Zrla014>G4`KL#*9fY`ao$u|DB9w%mrvq9B_`|g_(KBh|4vC
z=q(PIaM!$RI^+W*(JZD10((Aq$MwbwDimI@^nbQ-eLe1!X6(=aLp{bQVqxKk12VmH
z#tK<sy_isf{H{6rde-oaH<nGc_kcT@3R(bfaiLz+n8q6V!m2K7SW8Rg01)a|^?}1<
z)?}W>y3BD_uuYvORD+_JP%o?hstm6QDd-GPFrj|ddd+x&YN`R^QL`!eupO^KcoqsL
z%<CG%fYdt&Am-+(+m8z{OsF5#|6XQ1^{idpM=-{V?WTexK_!6RZ1#5Z0w<(LT_LTI
z>InxJMowY{8?S@UX9X*e=1%Y|RzVcQ0DM>Wz6{6&1=8b2MH)wx#|qfDvae-qTsU70
zJR71eeR*~-iN~aR6h|$9fcvm{V1@K<dTce-0a1@*1&%n?t8TkvK&iCX0R}hFcf){i
zDo8;AQ7|Dt)-#ZdvjJ6PEsdhQr2wLyF)A#SZ!>Y$WsbO}BoH(u6*LuO=c))4Dr%~D
z3lQ~~r>OT!c+|!6iX_X$OHy$cDkda=-ou1cMUT%7d;ct+$}-2e_fj}wJjLpsn+bW6
z+#nVRsfsFza=>vf0cReS5`<&RJIB#^C&`nWN;o+x<P3m!5I+N?5CDP#r2$Jpm8foe
zgGV@y71i7f^RAfz!qQ(7`nMoe5=c#0)nMEc;TYK{jmr+4>+pgRe-*CgjwY;rZ-S~M
zo+QL#?mWH4&6jW)cMXhq>sI%%nXt)O!|7d+p!O43aJ|`4&M|x{Wu64f+T>`@1U%`+
z&S>rD-ryPYyM-EQerWyr=bfw2_LAfreb!_S`_`E;^h-@rn+r^UPawbk={*TzX#nv_
z$r$^BkHFSteQzk3<OT^hf>BiSBb;!a2oM1AS;2^Po!~Q2>vtv-=EMl+&PhD}1mNP+
z*a&ZOJ{!-EIxS(%3uvmDEEh-Y#0*d{3h*n_2tzSHA=T}_YOxNuFJ-L5QdQPn1FWgX
z4{Lj<e`atfK~f8$dMZT`KfdEQYgq@_r!qh>#>mP146=sL?b;E0hdd^gLnXgmY)1H7
zfVnv#RnogDBso1vd^=(XQaxV|0X#kxN;rSEve|rL*rXd&Mb!IT24Je_G4Jl83Re8Z
zH!l?g3iC@(5_atUQoR`<ac)vb;Dj8HS&^E071v)9Rm1}z1d3?YZJSUTk^_eU$0kxi
zau_S5$E|{F5@RFQO_mN=^IbudGC2iRPWVwh;8ZUGQ3Jq)1O`Yweew}Q&Ao#Bd4d0b
zRs)0%K?K{}kp%_xUZ#4v8S@CqI+WCaq|Z1eV1udW)A*+k;cD(CAW4PuetHc?Kp{O5
zKmZoXXXXWDjgY$|uDPzFeHF9_P#&rG&a04sZdgdXM>%@t1hXFX&w$%8XYw(aMeb6y
z(z8}0uSF742)t_PvmWcO{(X>yG<*X4OhU$m6Utb9=An-XXn*D_ti|G6Ghut!{*bgy
zbw!N9V;(1Qjv2#PHsSEJgvv4FS`a7NI`z*q@dT83W3PF0j^1MTd_UGqV6hy#=nt^Y
m&DM=$0=Wji8%wn^(EdMD!me$C4Lt_{0000<MNUMnLSTYId3Ue?

literal 2137
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
Mi0hS>OMw~x0-EtUf&c&j

diff --git a/assets/overlay-shadow@2x.png b/assets/overlay-shadow@2x.png
index 80f066a62aba89e5f751aebe7f0fe4a5c14b4e85..3def38e83a0b7b3c46ba6650ad61c3595e9918d1 100644
GIT binary patch
literal 4013
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

literal 6360
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

diff --git a/assets/tree-highlight-separators.png b/assets/tree-highlight-separators.png
index 23679037f8b049d6554ef0f6d35fb85491b1046d..12b5bc9a3a08e0f0089f7248e3c99fc42e53e795 100644
GIT binary patch
delta 63
zcmXTRo?vLD>gnPbVj-CPho6N<gh`F-YxCBAsV2#;#fe5zYBLlYG>s}QaWdpfvdD-S
R%GEIdfv2mV%Q~loCIDL(5(EGM

delta 74
zcmc~Un_%c_;OXKRVj-CP=l}ozrfgh{+yVa+xy~jeEV{xl;a{M$fpejWkK17uV-^Ef
diIssO3=G%Ka&*}*v4~~>0#8>zmvv4FO#l($8Sel9

diff --git a/assets/tree-highlight-separators@2x.png b/assets/tree-highlight-separators@2x.png
index e13ba60b65158df00c6e8bd0ee2045e93e9b4f6e..ecce3f148e12e5e2b8ee776df4992470af0e6a03 100644
GIT binary patch
delta 103
zcmV-t0GR)u0g(ZaF<?tcL_t(o3GLFc5daVr1wr)RGe)=-2u^m{pY`UxZ+!692RFPE
zI>etyBoPJdHj;<}b{k1V0lSSPqJZ5-5>dczBZ(+rw~<5?un%g)1Uz1D=pz6C002ov
JPDHLkV1hO4CrJPR

delta 117
zcmbQpIG=HXVP2%Ci(^Ox=i3__c^MRVm>rvL)N7U{%x%!9XA<`pJUO?t$hGvlBx62X
z$q&(MyR8@c^mMpdu)B&ZWY{bn*ur!s&qa{SV7H*F#(_6(aKWef3?6#IZXB!L%uf?#
O00K`}KbLh*2~7a5z$q&L

diff --git a/assets/tree-highlight.png b/assets/tree-highlight.png
index 614f3871ee159351554d134282b251519de137d4..915cc41ec316ad57fade2d8515a2234353e9f924 100644
GIT binary patch
delta 134
zcmV;10D1rF0k8p(F@I`FL_t(I5o2IL0{{R2X9MC6AbtkK*Z@czB+rJV4V4L1fK4;H
zSO=<3Bpy&DE*GF1@(f8E10ymAq!O8rkIe`KFnJ~zgA#hw5X{gU4HLp)@*GnMRuL3+
o=mEP3s}@W_-0FZ?hpeIi016MUHo4ZBr2qf`07*qoM6N<$g23o6_W%F@

delta 193
zcmV;y06zb)0qOyeF@K~<L_t(I5o2V4g8%>jGXt49KpX<Z!cbvs)LWq78X%s+$jJB?
zq<{rPKmo{rFd)7K#Mhu=*eEujAV?huOau{(AOZw{E;$UO?f~&G5T5`58KeSqi7iMS
z6Ov+(7l<(cqy?l7?qy^{K$2vEQA03;Z8S{qhY2WSfs!*Z06L@&q#g{A0~VAs)qt3g
vK_GdMI*@uWK+eTepkl-n1*?E+Vd@zGY*!graJFT#00000NkvXXu0mjfcZ*1H

diff --git a/assets/tree-highlight@2x.png b/assets/tree-highlight@2x.png
index c300679668c16465a1513287acb95e58a4423e45..2fdfc9dcf8798983a2d3c0347dd4d5ea13b2bafb 100644
GIT binary patch
delta 244
zcmV<Q01N;B0-OSnFn<8nNkl<ZSPAV|ITC{~3`D7u2k=0i#Z%JrfxHBIXEg)OjwKE&
z6AEcYg=}`UUaK)(w-colK@P|XIU|pTeybS8%1#@98w5S_jcg6&=>2ZSE`aJpgoy1B
z%5~lufYj3H7>sk<%TS>A8y%C?(X<K*W`Ld+@Z$O+BCi_O6KzszfYvn#srG!d5=Y@v
z2s@dMq$BJA*Eu8U2s^-a&PY1K4se|_l8&$gTzfOJ@W%nQ$>|CC1T<y}lhYG2GD|>x
uo)hnydptSy^bqs^NBDLPt200UE%62GoQT_?<Rb3?0000<MNUMnLSTYGWNo+r

delta 344
zcmV-e0jK_)0{;S#Fn<9#Nkl<ZSPAWz!EFLD6htvXAWlgONYp?XDS#UtP)a(;Ed`{E
z9H;<^0=Oh61VUQoE%}!C>s%HKarh&RWv}u4Vb&ZzY48u4rb*g*6PMy#oQi#L(4npP
zDSoAtnvw{`I*^H1J$x4zoz43meCzmHW`4X($H-q2ANn9Bj(_4#{1s1PAB=VAMVyHf
z5i={F%uo+KcpYY9qxoL!YXWV~qJb7)3~g%Mpk#zQ0Z8K9&gu+kp$V+Ub)~Ungo_Dy
z9kpSaRwL_|jM%T^p4X8JxQS_6jl5klk~beY2_ru3NF);R3HWu~kx0ZR;MZ|SA`zc}
zU&kGZM0^5%T~WFtbY_5lq&7^`YGnPA5!ypQQ&bzKX*IHb$p}3vpfek_vpNG>XacKo
qU1@xpma}67i%-#nTUL+$TjByJ@<y8qe1&EJ0000<MNUMnLSTYZpOt9<

diff --git a/ayu-dark.sublime-theme b/ayu-dark.sublime-theme
index 29213b40..63a9ddc1 100644
--- a/ayu-dark.sublime-theme
+++ b/ayu-dark.sublime-theme
@@ -8,9 +8,9 @@
    */
 
   {
-    "class" : "sheet_container_control",
-    "layer0.tint" : [15, 20, 25],
-    "layer0.opacity" : 1
+    "class": "sheet_container_control",
+    "layer0.tint": [15, 20, 25],
+    "layer0.opacity": 1
   },
 
 
@@ -21,7 +21,7 @@
   {
     "class": "grid_layout_control",
     "border_size": 0,
-    "border_color": [29, 36, 44]
+    "border_color": [10, 13, 16]
   },
   {
     "class": "grid_layout_control",
@@ -60,7 +60,7 @@
     "layer0.texture": "ayu/assets/unfold.png",
     "layer0.opacity": 1.0,
     "layer0.inner_margin": 0,
-    "layer0.tint": [81, 92, 102],
+    "layer0.tint": [71, 82, 89],
     "content_margin": [8, 6, 8, 6]
   },
 
@@ -82,7 +82,7 @@
    */
   {
     "class": "popup_control",
-    "layer0.tint": [20, 25, 31],
+    "layer0.tint": [19, 24, 29],
     "layer0.opacity": 1.0,
     "content_margin": [0, 0]
   },
@@ -90,22 +90,22 @@
   {
     "class": "auto_complete",
     "row_padding": [12, 6],
-    "layer0.tint": [20, 25, 31],
+    "layer0.tint": [19, 24, 29],
     "layer0.opacity": 1.0
   },
 
   {
     "class": "auto_complete_label",
-    "fg": [81, 92, 102],
+    "fg": [71, 82, 89],
     "match_fg": [242, 151, 24],
-    "selected_fg": [230, 225, 207],
+    "selected_fg": [191, 186, 176],
     "selected_match_fg": [242, 151, 24],
     "fg_blend": true
   },
 
   {
     "class": "table_row",
-    "layer0.tint": [25, 31, 38],
+    "layer0.tint": [12, 16, 20],
     "layer0.opacity": 0.0
   },
 
@@ -129,8 +129,7 @@
 
   {
     "class": "tool_tip_label_control",
-    "color": [81, 92, 102],
-    "font.face": "Roboto mono",
+    "color": [71, 82, 89],
     "font.size": 13
   },
   {
@@ -140,8 +139,8 @@
   },
   {
     "class": "tool_tip_label_control",
-    "settings": ["ui_font_default"],
-    "font.face": ""
+    "settings": ["ui_font_roboto_mono"],
+    "font.face": "Roboto mono"
   },
 
   /* OVERLAY PANELS
@@ -152,21 +151,21 @@
   {
     "class": "overlay_control",
     "layer0.texture": "ayu/assets/overlay-shadow.png",
-    "layer0.inner_margin": [25, 45, 25, 35],
-    "layer0.opacity": 1.0,
-    "layer0.tint": [0, 0, 0],
+    "layer0.inner_margin": [15, 35, 15, 25],
+    "layer0.opacity": 0.6,
+    "layer0.tint": [10, 14, 18],
 
     "layer1.texture": "ayu/assets/overlay-border.png",
-    "layer1.inner_margin": [25, 45, 25, 35],
+    "layer1.inner_margin": [15, 35, 15, 25],
     "layer1.opacity": 1.0,
-    "layer1.tint": [230, 225, 207, 30],
+    "layer1.tint": [3, 4, 5],
 
     "layer2.texture": "ayu/assets/overlay-bg.png",
-    "layer2.inner_margin": [25, 45, 25, 35],
+    "layer2.inner_margin": [15, 35, 15, 25],
     "layer2.opacity": 1.0,
-    "layer2.tint": [20, 25, 31],
+    "layer2.tint": [19, 24, 29],
 
-    "content_margin": [20, 45, 20, 35]
+    "content_margin": [10, 35, 10, 20]
   },
 
   // Command Panel list item style (cmd + shift + p)
@@ -183,7 +182,7 @@
   {
     "class": "mini_quick_panel_row",
     "attributes": ["selected"],
-    "layer0.tint": [25, 31, 38]
+    "layer0.tint": [12, 16, 20]
   },
 
   // Quick panel project setting (project manager) (cmd + ctrl + p)
@@ -191,7 +190,7 @@
   {
     "class": "quick_panel",
     "row_padding": [32, 12],
-    "layer0.tint": [20, 25, 31],
+    "layer0.tint": [19, 24, 29],
     "layer0.opacity": 1.0
   },
 
@@ -200,7 +199,7 @@
   {
     "class": "quick_panel_row",
     "layer0.texture": "",
-    "layer0.tint": [20, 25, 31],
+    "layer0.tint": [19, 24, 29],
     "layer0.inner_margin": 0,
     "layer0.opacity": 1.0
   },
@@ -210,84 +209,77 @@
   {
     "class": "quick_panel_row",
     "parents": [{"class": "overlay_control"}],
-    "layer0.tint": [20, 25, 31],
+    "layer0.tint": [19, 24, 29],
     "layer0.opacity": 1.0
   },
 
   // Quick panel (project) style inside overlay_control (cmd + shift + p)
-
   {
     "class": "quick_panel",
     "parents": [{"class": "overlay_control"}],
-    "row_padding": [20, 5],
-    "layer0.tint": [20, 25, 31],
+    "row_padding": [24, 8],
+    "layer0.tint": [19, 24, 29],
     "layer0.opacity": 1.0
   },
 
   // Quick Panel selected list item style
-
   {
     "class": "quick_panel_row",
     "attributes": ["selected"],
-    "layer0.tint": [25, 31, 38]
+    "layer0.tint": [12, 16, 20]
   },
 
   // Panel labels
-
   {
     "class": "quick_panel_label",
-    "fg": [81, 92, 102],
+    "fg": [71, 82, 89],
+    "font.bold": false,
     "match_fg": [242, 151, 24],
-    "selected_fg": [230, 225, 207],
+    "selected_fg": [191, 186, 176],
     "selected_match_fg": [242, 151, 24]
   },
 
   // Panel labels
-
   {
     "class": "quick_panel_label",
     "parents": [{"class": "overlay_control"}],
-    "fg": [81, 92, 102],
+    "fg": [71, 82, 89],
     "match_fg": [242, 151, 24],
-    "selected_fg": [230, 225, 207],
+    "selected_fg": [191, 186, 176],
     "selected_match_fg": [242, 151, 24]
   },
 
   // Panels sublabels
-
   {
     "class": "quick_panel_path_label",
-    "fg": [66, 80, 94],
-    "match_fg": [230, 225, 207],
-    "selected_fg": [81, 92, 102],
-    "selected_match_fg": [230, 225, 207]
+    "fg": [54, 63, 70],
+    "match_fg": [156, 153, 146],
+    "selected_fg": [54, 63, 70],
+    "selected_match_fg": [156, 153, 146]
   },
 
   // Panels data / score
-
   {
     "class": "quick_panel_score_label",
-    "fg": [81, 92, 102],
-    "selected_fg": [81, 92, 102]
+    "fg": [71, 82, 89],
+    "selected_fg": [242, 151, 24]
   },
 
 
-
   /* TABS
    * Tabs settings and behavioring
    */
-
   {
     "class": "tabset_control",
     "mouse_wheel_switch": false,
     "tab_min_width": 50,
     "tab_overlap": 0,
-    "tab_height": 30,
+    "tab_height": 36,
     "tab_width": 50,
 
     "layer0.tint": [15, 20, 25],
     "layer0.opacity": 1.0,
-    "content_margin": [0, 0] // <<<<<<<<<<<<<
+    "content_margin": [10, 0]
   },
   {
     "class": "tabset_control",
@@ -298,114 +290,107 @@
     "class": "tabset_control",
     "settings": ["ui_separator"],
     "content_margin": [0, 0, 0, 0],
-    "layer1.opacity": 0.3,
+    "layer1.opacity": 1,
     "layer1.texture": "ayu/assets/separator-bottom.png",
-    "layer1.tint": [81, 92, 102],
+    "layer1.tint": [10, 13, 16],
     "layer1.inner_margin": [1, 0, 1, 2]
   },
   {
     "class": "tabset_control",
     "platforms": ["osx"],
     "settings": ["ui_separator", "!ui_native_titlebar"],
-    "layer2.opacity": 0.3,
+    "layer2.opacity": 1,
     "layer2.texture": "ayu/assets/separator-top.png",
-    "layer2.tint": [81, 92, 102],
+    "layer2.tint": [10, 13, 16],
     "layer2.inner_margin": [1, 2, 1, 0]
   },
 
-  {
-    "class": "tabset_control",
-    "settings": ["ui_big_tabs"],
-    "tab_height": 40
-  },
-
   // Tabs
   {
     "class": "tab_control",
-
-    "layer0.tint": [15, 20, 25, 0],
+    // Background
+    "layer0.tint": [15, 20, 25],
     "layer0.opacity": 1.0,
 
-    "layer1.texture": "",
+    // Top
+    "layer1.texture": "ayu/assets/separator-top.png",
+    "layer1.tint": [10, 13, 16],
+    "layer1.inner_margin": [0, 1, 0, 0],
+    "layer1.opacity": 0.0,
 
-    "layer2.texture": "ayu/assets/separator-bottom.png",
-    "layer2.tint": [242, 151, 24],
-    "layer2.inner_margin": [1, 0, 1, 2],
+    // Right
+    "layer2.texture": "ayu/assets/separator-right.png",
+    "layer2.tint": [10, 13, 16],
+    "layer2.inner_margin": [0, 0, 1, 0],
     "layer2.opacity": 0.0,
 
-    "layer3.texture": "",
+    // Bottom
+    "layer3.texture": "ayu/assets/separator-bottom.png",
+    "layer3.tint": [10, 13, 16],
+    "layer3.inner_margin": [0, 0, 0, 1],
+    "layer3.opacity": 0.0,
 
-    "content_margin": [10, -2, 10, 0],
+    "content_margin": [15, -2, 15, 0],
     "max_margin_trim": 12
   },
   {
     "class": "tab_control",
     "settings": ["ui_separator"],
 
-    "layer1.texture": "ayu/assets/separator-right.png",
-    "layer1.tint": [81, 92, 102],
-    "layer1.inner_margin": [0, 1, 2, 1],
-    "layer1.opacity": 0.3,
+    "layer1.opacity": 1.0,
 
-    "layer3.texture": "ayu/assets/separator-bottom.png",
-    "layer3.tint": [81, 92, 102],
-    "layer3.inner_margin": [1, 0, 1, 2],
-    "layer3.opacity": 0.3
-  },
-  {
-    "class": "tab_control",
-    "settings": ["ui_big_tabs"],
-    "content_margin": [15, -2, 15, 0]
+    "layer2.opacity": 1.0,
+
+    "layer3.opacity": 1.0
   },
 
   // Selected current tab
-
   {
     "class": "tab_control", "attributes": ["selected"],
-    "layer2.opacity": 1.0,
-    "layer3.opacity": 0.0
+    "settings": ["!ui_separator"],
+    "layer3.tint": [242, 151, 24],
+    "layer3.opacity": 1.0
   },
   {
     "class": "tab_control", "attributes": ["selected"],
     "settings": ["ui_separator"],
-    "layer0.tint": [81, 92, 102, 15]
+    "layer1.tint": [242, 151, 24],
+    "layer3.opacity": 0.0
   },
 
   // Hovered current tab
-
   {
     "class": "tab_control", "attributes": ["hover"],
-    "layer2.opacity": 0.3
+    "settings": ["!ui_separator"],
+    "layer3.tint": [242, 151, 24],
+    "layer3.opacity": 0.3
   },
   {
     "class": "tab_control", "attributes": ["hover"],
     "settings": ["ui_separator"],
-    "layer0.tint": [81, 92, 102, 6],
+    "layer0.tint": [10, 13, 16, 70],
   },
 
   // Selected current tab
-
   {
     "class": "tab_control", "attributes": ["selected", "hover"],
-    "layer2.opacity": 1.0
+    "settings": ["!ui_separator"],
+    "layer3.opacity": 1.0
   },
   {
     "class": "tab_control", "attributes": ["selected", "hover"],
     "settings": ["ui_separator"],
-    "layer0.tint": [81, 92, 102, 15]
+    "layer0.tint": [15, 20, 25]
   },
 
   // Tab Labels
 
   {
     "class": "tab_label",
-    "fg": [15, 20, 25, 0],
-    "shadow_color": [81, 92, 102],
-    "shadow_offset": [0, -1],
+    "fg": [71, 82, 89],
     "font.italic": false,
     "font.bold": false,
-    "font.size": 12,
-    "font.face": "Roboto mono"
+    "font.size": 12
   },
   {
     "class": "tab_label",
@@ -414,28 +399,15 @@
   },
   {
     "class": "tab_label",
-    "settings": ["ui_font_default"],
-    "font.face": ""
+    "settings": ["ui_font_roboto_mono"],
+    "font.face": "Roboto mono"
   },
   {
     "class": "tab_label",
     "settings": ["highlight_modified_tabs"],
     "font.italic": true,
     "attributes": ["dirty"],
-    "shadow_color": [242, 151, 24]
-  },
-  {
-    "class": "tab_label",
-    "fg": [81, 92, 102],
-    "settings": ["ui_fix_tab_labels"],
-    "shadow_color": [15, 20, 25, 0],
-    "shadow_offset": [0, 0]
-  },
-  {
-    "class": "tab_label",
-    "fg": [242, 151, 24],
-    "attributes": ["dirty"],
-    "settings": ["ui_fix_tab_labels", "highlight_modified_tabs"]
+    "fg": [242, 151, 24]
   },
 
   // Tab selected label color
@@ -443,17 +415,7 @@
   {
     "class": "tab_label",
     "parents": [{"class": "tab_control", "attributes": ["selected"]}],
-    "fg": [15, 20, 25, 0],
-    "shadow_color": [230, 225, 207],
-    "shadow_offset": [0, -1],
-  },
-  {
-    "class": "tab_label",
-    "settings": ["ui_fix_tab_labels"],
-    "parents": [{"class": "tab_control", "attributes": ["selected"]}],
-    "fg": [230, 225, 207],
-    "shadow_color": [15, 20, 25, 0],
-    "shadow_offset": [0, 0]
+    "fg": [191, 186, 176]
   },
 
   {
@@ -469,12 +431,12 @@
 
   // Close Icon
     "layer0.texture": "ayu/assets/close.png",
-    "layer0.tint": [81, 92, 102],
+    "layer0.tint": [71, 82, 89],
     "layer0.opacity": 1.0,
 
   // Dirty Icon
     "layer1.texture": "ayu/assets/dirty.png",
-    "layer1.tint": [81, 92, 102],
+    "layer1.tint": [71, 82, 89],
     "layer1.opacity": 0,
   },
 
@@ -482,7 +444,7 @@
   {
     "class": "tab_close_button",
     "settings": ["show_tab_close_buttons"],
-    "content_margin": [8, 8]
+    "content_margin": [6, 8]
   },
 
   // Default hover
@@ -499,7 +461,7 @@
     "parents": [{"class": "tab_control", "attributes": ["dirty"]}],
     "layer0.opacity": 0, // Close Icon
     "layer1.opacity": 1.0, // dirty Icon
-    "content_margin": [8, 8]
+    "content_margin": [6, 8]
   },
 
   // Dirty tab on hover
@@ -534,7 +496,7 @@
     "class": "scroll_tabs_left_button",
     "content_margin": [12, 15],
     "layer0.texture": "ayu/assets/arrow-left.png",
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [46, 54, 60],
     "layer0.opacity": 1.0
   },
 
@@ -548,16 +510,16 @@
     "class": "scroll_tabs_right_button",
     "content_margin": [12, 15],
     "layer0.texture": "ayu/assets/arrow-right.png",
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [46, 54, 60],
     "layer0.opacity": 1.0
   },
   {
     "class": "scroll_tabs_right_button",
     "settings": ["ui_separator"],
     "layer2.texture": "ayu/assets/separator-right.png",
-    "layer2.tint": [81, 92, 102],
-    "layer2.opacity": 0.3,
-    "layer2.inner_margin" : [0, 1, 2, 1]
+    "layer2.tint": [10, 13, 16],
+    "layer2.opacity": 1,
+    "layer2.inner_margin": [0, 1, 2, 1]
   },
 
   {
@@ -570,7 +532,7 @@
     "class": "show_tabs_dropdown_button",
     "content_margin": [12, 12],
     "layer0.texture": "ayu/assets/overflow-menu.png",
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [46, 54, 60],
     "layer0.opacity": 1.0,
     "layer0.inner_margin": [0, 0]
   },
@@ -588,7 +550,7 @@
 
   {
     "class": "sidebar_container",
-    "content_margin": [0, 4, 0, 0],
+    "content_margin": [0, 6, 0, 0],
     "layer0.opacity": 1,
     "layer0.tint": [15, 20, 25]
   },
@@ -597,32 +559,23 @@
     "settings": ["ui_separator"],
     "layer1.texture": "ayu/assets/separator-right.png",
     "layer1.inner_margin": [0, 1, 2, 1],
-    "layer1.opacity": 0.3,
-    "layer1.tint": [81, 92, 102]
-  },
-  {
-    "class": "sidebar_container",
-    "platforms": ["osx"],
-    "settings": ["ui_separator", "!ui_native_titlebar"],
-    "layer2.opacity": 0.3,
-    "layer2.texture": "ayu/assets/separator-top.png",
-    "layer2.tint": [81, 92, 102],
-    "layer2.inner_margin": [1, 2, 1, 0]
+    "layer1.opacity": 1,
+    "layer1.tint": [10, 13, 16],
   },
+
   {
     "class": "sidebar_tree",
     "indent_top_level": false,
     "row_padding": [20, 6],
     "dark_content": false,
     "spacer_rows": true,
-    "indent_offset": 0,
-    "indent": 12
+    "indent_offset": 2,
+    "indent": 10
   },
 
   {
     "class": "sidebar_heading",
-    "color": [81, 92, 102],
-    "font.face": "Roboto mono",
+    "color": [49, 57, 63],
     "font.bold": true,
     "font.size": 11
   },
@@ -633,34 +586,33 @@
   },
   {
     "class": "sidebar_heading",
-    "settings": ["ui_font_default"],
-    "font.face": ""
+    "settings": ["ui_font_roboto_mono"],
+    "font.face": "Roboto mono"
   },
 
   {
     "class": "tree_row",
-    "layer1.texture": "ayu/assets/tree-highlight.png",
-    "layer1.tint": [81, 92, 102, 50],
-    "layer1.inner_margin": [8, 4, 8, 4],
-    "layer1.opacity": 0
+    "layer0.texture": "ayu/assets/tree-highlight.png",
+    "layer0.tint": [10, 13, 16],
+    "layer0.inner_margin": [8, 4, 8, 4],
+    "layer0.opacity": 0
   },
 
   {
     "class": "tree_row",
-    "layer1.texture": "ayu/assets/tree-highlight-separators.png",
+    "layer0.texture": "ayu/assets/tree-highlight-separators.png",
     "settings": ["ui_separator"]
   },
 
   {
     "class": "tree_row",
     "attributes": ["selected"],
-    "layer1.opacity": 1
+    "layer0.opacity": 1
   },
 
   {
     "class": "sidebar_label",
-    "color": [81, 92, 102],
-    "font.face": "Roboto mono",
+    "color": [71, 82, 89],
     "font.size": 12
   },
   {
@@ -670,26 +622,26 @@
   },
   {
     "class": "sidebar_label",
-    "settings": ["ui_font_default"],
-    "font.face": ""
+    "settings": ["ui_font_roboto_mono"],
+    "font.face": "Roboto mono"
   },
 
   {
     "class": "sidebar_label",
     "parents": [{"class": "tree_row","attributes": ["hover"]}],
-    "color": [230, 225, 207]
+    "color": [191, 186, 176]
   },
 
   {
     "class": "sidebar_label",
     "parents": [{"class": "tree_row","attributes": ["selected"]}],
-    "color": [230, 225, 207]
+    "color": [191, 186, 176]
   },
 
   {
     "class": "sidebar_label",
     "parents": [{"class": "tree_row","attributes": ["expandable"]}],
-    "color": [81, 92, 102],
+    "color": [71, 82, 89],
     "font.bold": false
   },
 
@@ -703,13 +655,13 @@
   {
     "class": "sidebar_label",
     "parents": [{"class": "tree_row", "attributes": ["expandable", "hover"]}],
-    "color": [230, 225, 207]
+    "color": [191, 186, 176]
   },
 
   {
     "class": "sidebar_label",
     "parents": [{"class": "tree_row", "attributes": ["expanded"]}],
-    "color": [230, 225, 207]
+    "color": [191, 186, 176]
   },
 
   {
@@ -722,7 +674,7 @@
   // {
   //  "class": "sidebar_label",
   //  "parents": [{"class": "tree_row", "attributes": ["expanded", "selected"]}],
-  //  "color": [230, 225, 207]
+  //  "color": [191, 186, 176]
   // },
 
   {
@@ -745,7 +697,7 @@
     "layer0.opacity": 0,
 
     "layer1.texture": "ayu/assets/folder.png",
-    "layer1.tint": [62, 75, 89],
+    "layer1.tint": [46, 54, 60],
     "layer1.opacity": 1,
 
     "layer2.texture": "ayu/assets/folder-open.png",
@@ -829,11 +781,11 @@
     "class": "icon_folder_dup",
     "content_margin": [9, 9],
     "layer0.texture": "ayu/assets/folder.png",
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [46, 54, 60],
     "layer0.opacity": 1.0,
 
     "layer1.texture": "ayu/assets/folder-symlink.png",
-    "layer1.tint": [81, 92, 102],
+    "layer1.tint": [71, 82, 89],
     "layer1.opacity": 0.3
   },
 
@@ -859,13 +811,13 @@
   // Opened files
   {
     "class": "close_button",
-    "content_margin": [8, 8],
+    "content_margin": [6, 8],
 
   // Default Close icon
     "layer0.texture": "ayu/assets/close.png",
     "layer0.opacity": 0,
     "layer0.inner_margin": [0, 0],
-    "layer0.tint": [81, 92, 102]
+    "layer0.tint": [71, 82, 89]
   },
 
 
@@ -874,15 +826,14 @@
   {
     "class": "close_button",
     "parents": [{ "class": "tree_row", "attributes": ["hover"] }],
-  // Default Close icon
-    "layer0.opacity": 0.6
+    "layer0.opacity": 1
   },
 
   {
     "class": "close_button",
     "attributes": ["dirty"],
     "layer0.texture": "ayu/assets/dirty.png",
-    "layer0.tint": [81, 92, 102],
+    "layer0.tint": [71, 82, 89],
     "layer0.opacity": 1.0
   },
 
@@ -903,7 +854,7 @@
     "layer0.opacity": 1.0,
 
     "layer1.texture": "ayu/assets/scrollbar-vertical-wide.png",
-    "layer1.tint": [81, 92, 102],
+    "layer1.tint": [71, 82, 89],
     "layer1.opacity": 0.1,
     "layer1.inner_margin": [0, 10],
     "blur": false
@@ -911,7 +862,7 @@
   {
     "class": "scroll_bar_control",
     "parents": [{"class": "overlay_control"}],
-    "layer0.tint": [20, 25, 31],
+    "layer0.tint": [19, 24, 29],
     "blur": false
   },
   {
@@ -929,7 +880,7 @@
   {
     "class": "puck_control",
     "layer0.texture": "ayu/assets/scrollbar-vertical-wide.png",
-    "layer0.tint": [81, 92, 102],
+    "layer0.tint": [71, 82, 89],
     "layer0.opacity": 0.3,
     "layer0.inner_margin": [0, 10],
     "content_margin": [6, 12],
@@ -1017,14 +968,14 @@
   {
     "class": "minimap_control",
     "settings": ["always_show_minimap_viewport"],
-    "viewport_color": [100, 100, 100],
-    "viewport_opacity": 0.3
+    "viewport_color": [5, 6, 8],
+    "viewport_opacity": 0.2
   },
 
   {
     "class": "minimap_control",
     "settings": ["!always_show_minimap_viewport"],
-    "viewport_color": [100, 100, 100],
+    "viewport_color": [5, 6, 8],
     "viewport_opacity": { "target": 0, "speed": 4.0, "interpolation": "smoothstep" }
   },
 
@@ -1044,11 +995,10 @@
 
   {
     "class": "label_control",
-    "color": [81, 92, 102],
+    "color": [71, 82, 89],
     "shadow_color": [0, 0, 0, 0],
     "shadow_offset": [0, 0],
     "font.bold": false,
-    "font.face": "Roboto mono",
     "font.size": 12
   },
   {
@@ -1058,8 +1008,8 @@
   },
   {
     "class": "label_control",
-    "settings": ["ui_font_default"],
-    "font.face": ""
+    "settings": ["ui_font_roboto_mono"],
+    "font.face": "Roboto mono"
   },
 
   // Status bar labels
@@ -1067,7 +1017,7 @@
   {
     "class": "label_control",
     "parents": [{"class": "status_bar"}],
-    "color": [81, 92, 102],
+    "color": [71, 82, 89],
     "font.bold": false
   },
 
@@ -1079,14 +1029,15 @@
     "layer0.tint": [15, 20, 25],
     "layer0.opacity": 1,
     "layer1.texture": "ayu/assets/separator-top.png",
+    "layer1.tint": [10, 13, 16],
     "layer1.inner_margin": [1, 2, 1, 0],
-    "content_margin": [10, 0]
+    "content_margin": [16, 3]
   },
   {
     "class": "status_bar",
     "settings": ["ui_separator"],
-    "layer0.tint": [20, 25, 31]
-    // "layer1.opacity": 0.3
+    // "layer0.tint": [19, 24, 29],
+    // "layer1.opacity": 1
   },
 
   {
@@ -1102,7 +1053,7 @@
   {
     "class": "panel_button_control",
     "layer0.texture": "ayu/assets/switch-panel.png",
-    "layer0.tint": [81, 92, 102],
+    "layer0.tint": [71, 82, 89],
     "layer0.opacity": 1.0
   },
 
@@ -1127,11 +1078,11 @@
   {
     "class": "panel_control",
     "settings": ["ui_separator"],
-    "layer0.tint": [20, 25, 31],
+    // "layer0.tint": [19, 24, 29],
     "layer1.texture": "ayu/assets/separator-top.png",
-    "layer1.tint": [81, 92, 102],
+    "layer1.tint": [10, 13, 16],
     "layer1.inner_margin": [1, 2, 1, 0],
-    "layer1.opacity": 0.3
+    "layer1.opacity": 1
   },
 
   // Status bar panel close icon
@@ -1140,7 +1091,7 @@
     "class": "panel_close_button",
     "layer0.texture": "ayu/assets/close.png",
     "layer0.opacity": 1.0,
-    "layer0.tint": [81, 92, 102],
+    "layer0.tint": [71, 82, 89],
     "content_margin": [0, 0] // 8,8 to show
   },
   {
@@ -1156,12 +1107,12 @@
     "layer0.texture": "ayu/assets/input-bg.png",
     "layer0.opacity": 1,
     "layer0.inner_margin": [10, 8],
-    "layer0.tint": [20, 25, 31],
+    "layer0.tint": [19, 24, 29],
 
     "layer1.texture": "ayu/assets/input-border.png",
-    "layer1.opacity": 0.3,
+    "layer1.opacity": 1,
     "layer1.inner_margin": [10, 8],
-    "layer1.tint": [81, 92, 102],
+    "layer1.tint": [10, 13, 16],
     "content_margin": [10, 7, 10, 5]
   },
 
@@ -1175,9 +1126,9 @@
     "layer0.opacity": 0,
     "layer1.texture": "ayu/assets/input-search.png",
     "layer1.opacity": 1,
-    "layer1.tint": [242, 151, 24],
-    "layer1.inner_margin": [35, 0, 0, 0],
-    "content_margin": [43, 7, 10, 4]
+    "layer1.tint": [71, 82, 89, 100],
+    "layer1.inner_margin": [60, 0, 0, 0],
+    "content_margin": [50, 7, 10, 4]
   },
 
   // Textline input oveflow menu
@@ -1185,7 +1136,7 @@
     "class": "dropdown_button_control",
     "content_margin": [12, 12],
     "layer0.texture": "ayu/assets/overflow-menu.png",
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [46, 54, 60],
     "layer0.opacity": 1.0
   },
   {
@@ -1220,7 +1171,7 @@
   {
     "class": "label_control",
     "parents": [{"class": "button_control"}],
-    "color":  [81, 92, 102]
+    "color":  [71, 82, 89]
   },
 
   {
@@ -1234,7 +1185,7 @@
     "class": "icon_button_control",
     "layer0.tint": [0, 0, 0],
     "layer0.opacity": 0,
-    "layer2.tint": [230, 225, 207],
+    "layer2.tint": [191, 186, 176],
     "layer2.opacity": { "target": 0.0, "speed": 10.0, "interpolation": "smoothstep" },
     "content_margin": [10, 5]
   },
@@ -1247,7 +1198,7 @@
   {
     "class": "icon_regex",
     "layer0.texture": "ayu/assets/regex.png",
-    "layer0.tint": [81, 92, 102],
+    "layer0.tint": [71, 82, 89],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1263,7 +1214,7 @@
   {
     "class": "icon_case",
     "layer0.texture": "ayu/assets/matchcase.png",
-    "layer0.tint": [81, 92, 102],
+    "layer0.tint": [71, 82, 89],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1279,7 +1230,7 @@
   {
     "class": "icon_whole_word",
     "layer0.texture": "ayu/assets/word.png",
-    "layer0.tint": [81, 92, 102],
+    "layer0.tint": [71, 82, 89],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1295,7 +1246,7 @@
   {
     "class": "icon_wrap",
     "layer0.texture": "ayu/assets/wrap.png",
-    "layer0.tint": [81, 92, 102],
+    "layer0.tint": [71, 82, 89],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1311,7 +1262,7 @@
   {
     "class": "icon_in_selection",
     "layer0.texture": "ayu/assets/inselection.png",
-    "layer0.tint": [81, 92, 102],
+    "layer0.tint": [71, 82, 89],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1327,7 +1278,7 @@
   {
     "class": "icon_highlight",
     "layer0.texture": "ayu/assets/highlight.png",
-    "layer0.tint": [81, 92, 102],
+    "layer0.tint": [71, 82, 89],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1343,7 +1294,7 @@
   {
     "class": "icon_preserve_case",
     "layer0.texture": "ayu/assets/replace-preserve-case.png",
-    "layer0.tint": [81, 92, 102],
+    "layer0.tint": [71, 82, 89],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1359,7 +1310,7 @@
   {
     "class": "icon_context",
     "layer0.texture": "ayu/assets/context.png",
-    "layer0.tint": [81, 92, 102],
+    "layer0.tint": [71, 82, 89],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1376,7 +1327,7 @@
   {
     "class": "icon_use_buffer",
     "layer0.texture": "ayu/assets/buffer.png",
-    "layer0.tint": [81, 92, 102],
+    "layer0.tint": [71, 82, 89],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1392,7 +1343,7 @@
   {
     "class": "icon_reverse",
     "layer0.texture": "ayu/assets/reverse.png",
-    "layer0.tint": [81, 92, 102],
+    "layer0.tint": [71, 82, 89],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1408,7 +1359,7 @@
   {
     "class": "title_bar",
     "bg": [15, 20, 25],
-    "fg": [230, 225, 207]
+    "fg": [191, 186, 176]
   },
   {
     "class": "title_bar",
diff --git a/ayu-dark.tmTheme b/ayu-dark.tmTheme
index 9d13aa89..a6d90da4 100644
--- a/ayu-dark.tmTheme
+++ b/ayu-dark.tmTheme
@@ -18,35 +18,35 @@
 				<key>accent</key>
 				<string>#F29718</string>
 				<key>activeGuide</key>
-				<string>#314559</string>
+				<string>#363F46</string>
 				<key>background</key>
 				<string>#0F1419</string>
 				<key>caret</key>
 				<string>#F29718</string>
 				<key>findHighlight</key>
-				<string>#FFEE99</string>
+				<string>#F29718</string>
 				<key>findHighlightForeground</key>
 				<string>#0F1419</string>
 				<key>foreground</key>
-				<string>#E6E1CF</string>
+				<string>#BFBAB0</string>
 				<key>guide</key>
-				<string>#35404C</string>
+				<string>#20272C</string>
 				<key>gutter</key>
 				<string>#0F1419</string>
 				<key>gutterForeground</key>
-				<string>#35404C</string>
+				<string>#252D33</string>
 				<key>inactiveBackground</key>
 				<string>#0F1419</string>
 				<key>inactiveSelection</key>
-				<string>#25334088</string>
+				<string>#131E27</string>
 				<key>invisibles</key>
-				<string>#35404C</string>
+				<string>#252D33</string>
 				<key>lineHighlight</key>
-				<string>#151A1F</string>
+				<string>#0A0E12</string>
 				<key>popupCss</key>
 				<string>html, body {
-  background-color: #14191F;
-  color: #E6E1CF;
+  background-color: #13181D;
+  color: #BFBAB0;
 }
 body {
   padding: 1px 3px;
@@ -56,13 +56,13 @@ a {
 }
 </string>
 				<key>selection</key>
-				<string>#253340</string>
+				<string>#16242E</string>
 				<key>selectionBorder</key>
-				<string>#253340</string>
+				<string>#192B37</string>
 				<key>shadow</key>
 				<string>#00000010</string>
 				<key>stackGuide</key>
-				<string>#1A2633</string>
+				<string>#20272C</string>
 			</dict>
 		</dict>
 		<dict>
@@ -86,7 +86,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#E6E1CF</string>
+				<string>#BFBAB0</string>
 			</dict>
 		</dict>
 		<dict>
@@ -108,7 +108,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#FFEE99</string>
+				<string>#F29718</string>
 			</dict>
 		</dict>
 		<dict>
@@ -130,7 +130,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#FFEE99</string>
+				<string>#F29718</string>
 			</dict>
 		</dict>
 		<dict>
@@ -141,7 +141,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#FFEE99</string>
+				<string>#F29718</string>
 			</dict>
 		</dict>
 		<dict>
@@ -185,7 +185,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#E6E1CFCC</string>
+				<string>#BFBAB0CC</string>
 			</dict>
 		</dict>
 		<dict>
@@ -196,7 +196,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#E6E1CF</string>
+				<string>#BFBAB0</string>
 			</dict>
 		</dict>
 		<dict>
@@ -218,7 +218,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#E6E1CFCC</string>
+				<string>#BFBAB0CC</string>
 			</dict>
 		</dict>
 		<dict>
@@ -297,7 +297,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#FFEE99</string>
+				<string>#F29718</string>
 			</dict>
 		</dict>
 		<dict>
@@ -698,7 +698,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#E6E1CF07</string>
+				<string>#BFBAB007</string>
 			</dict>
 		</dict>
 		<dict>
@@ -709,7 +709,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#E6E1CF10</string>
+				<string>#BFBAB010</string>
 			</dict>
 		</dict>
 		<dict>
@@ -720,7 +720,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#E6E1CF10</string>
+				<string>#BFBAB010</string>
 				<key>fontStyle</key>
 				<string>bold</string>
 				<key>foreground</key>
@@ -737,7 +737,7 @@ a {
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
-				<string>#FFEE99</string>
+				<string>#F29718</string>
 			</dict>
 		</dict>
 		<dict>
@@ -781,7 +781,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#FF3333</string>
+				<string>#F07178</string>
 			</dict>
 		</dict>
 		<dict>
@@ -803,7 +803,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#E6E1CF10</string>
+				<string>#BFBAB010</string>
 				<key>foreground</key>
 				<string>#39BAE6</string>
 			</dict>
@@ -838,9 +838,9 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#E6E1CF10</string>
+				<string>#BFBAB010</string>
 				<key>foreground</key>
-				<string>#E6E1CF</string>
+				<string>#BFBAB0</string>
 			</dict>
 		</dict>
 		<dict>
@@ -851,7 +851,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#E6E1CF10</string>
+				<string>#BFBAB010</string>
 				<key>foreground</key>
 				<string>#5C6773</string>
 			</dict>
@@ -908,7 +908,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#5C6773</string>
+				<string>#20272C</string>
 			</dict>
 		</dict>
 		<dict>
@@ -919,7 +919,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#5C6773</string>
+				<string>#20272C</string>
 			</dict>
 		</dict>
 		<dict>
diff --git a/ayu-dark2.sublime-theme b/ayu-dark2.sublime-theme
deleted file mode 100644
index e5ee64e8..00000000
--- a/ayu-dark2.sublime-theme
+++ /dev/null
@@ -1,1280 +0,0 @@
-// prefix=""
-// sublime="2"
-// ext="sublime-theme"
-[
-
-  /* @ EMPTY WINDOW
-  * Style for empty (no tabs) window
-  ========================================================================= */
-
-  {
-    "class" : "sheet_container_control",
-    "layer0.tint" : [15, 20, 25],
-    "layer0.opacity" : 1.0
-  },
-
-
-  /* @ GRID LAYOUT
-  * Grid style
-  ========================================================================= */
-
-  {
-    "class": "grid_layout_control",
-    "border_size": 0,
-    "border_color": [29, 36, 44]
-  },
-  {
-    "class": "grid_layout_control",
-    "settings": ["ui_separator"],
-    "border_size": 1
-  },
-
-  /* @ DIALOG POPUP
-  * Dialog popup style and progressbar
-  ========================================================================= */
-  // !!!
-  {
-    "class": "progress_gauge_control",
-    "layer0.tint": [242, 151, 24],
-    "layer0.opacity": 1.0,
-    "content_margin": [0, 6]
-  },
-
-  {
-    "class": "dialog",
-    "layer0.tint": [15, 20, 25],
-    "layer0.opacity": 1.0
-  },
-
-  {
-    "class": "progress_bar_control",
-    "layer0.tint": [15, 20, 25],
-    "layer0.opacity": 1.0
-  },
-
-
-  /* @ CODE FOLDING
-  * Folding arrow setting and behavioring
-  ========================================================================= */
-  {
-    "class": "fold_button_control",
-    "layer0.texture": "ayu/assets/unfold.png",
-    "layer0.opacity": 1.0,
-    "layer0.inner_margin": 0,
-    "layer0.tint": [81, 92, 102],
-    "content_margin": [8, 6, 8, 6]
-  },
-
-  {
-    "class": "fold_button_control",
-    "attributes": ["hover"],
-    "layer0.tint": [242, 151, 24]
-  },
-
-  {
-    "class": "fold_button_control",
-    "attributes": ["expanded"],
-    "layer0.texture": "ayu/assets/fold.png"
-  },
-
-
-  /* @ AUTOCOMPLETE
-  * Autocomplete popup setting and behavioring
-  ========================================================================= */
-
-  {
-    "class": "popup_control",
-    "layer0.tint": [20, 25, 31],
-    "layer0.opacity": 1.0,
-    "content_margin": [0, 0]
-  },
-
-  {
-    "class": "auto_complete",
-    "row_padding": [12, 6],
-    "layer0.tint": [20, 25, 31],
-    "layer0.opacity": 1.0
-  },
-
-  {
-    "class": "auto_complete_label",
-    "fg": [81, 92, 102],
-    "match_fg": [242, 151, 24],
-    "selected_fg": [230, 225, 207],
-    "selected_match_fg": [242, 151, 24]
-  },
-
-  {
-    "class": "table_row",
-    "layer0.tint": [25, 31, 38],
-    "layer0.opacity": 0.0
-  },
-
-  {
-    "class": "table_row",
-    "attributes": ["selected"],
-    "layer0.opacity": 1.0
-  },
-
-
-  /* @ TOOLTIP
-  * Tooltip setting and behavioring
-  ========================================================================= */
-
-  {
-    "class": "tool_tip_control",
-    "layer0.tint": [15, 20, 25],
-    "layer0.inner_margin": [0, 0],
-    "layer0.opacity": 1.0,
-    "content_margin": [10, 6]
-  },
-
-  {
-    "class": "tool_tip_label_control",
-    "color": [81, 92, 102],
-    "font.face": "Roboto mono",
-    "font.size": 12
-  },
-  {
-    "class": "tool_tip_label_control",
-    "settings": ["ui_font_source_code_pro"],
-    "font.face": "Source Code Pro"
-  },
-  {
-    "class": "tool_tip_label_control",
-    "settings": ["ui_font_default"],
-    "font.face": ""
-  },
-
-  /* @OVERLAY PANELS
-  * Overlay panels setting and behavioring
-  ========================================================================= */
-
-  // Command Panel
-  {
-    "class": "overlay_control",
-    "layer0.texture": "ayu/assets/overlay-shadow.png",
-    "layer0.inner_margin": [25, 45, 25, 35],
-    "layer0.opacity": 1.0,
-    "layer0.tint": [0, 0, 0],
-
-    "layer1.texture": "ayu/assets/overlay-bg.png",
-    "layer1.inner_margin": [25, 45, 25, 35],
-    "layer1.opacity": 1.0,
-    "layer1.tint": [20, 25, 31],
-
-    "content_margin": [20, 45, 20, 35]
-  },
-
-  // Command Panel list item style (cmd + shift + p)
-
-  {
-    "class": "mini_quick_panel_row",
-    "layer0.tint": [15, 20, 25, 0],
-    "layer0.inner_margin": [2, 2, 2, 2],
-    "layer0.opacity": 1.0
-  },
-
-  // Command Panel selected list item style (cmd + p)
-
-  {
-    "class": "mini_quick_panel_row",
-    "attributes": ["selected"],
-    "layer0.tint": [25, 31, 38]
-  },
-
-  // Quick panel project setting (project manager) (cmd + ctrl + p)
-
-  {
-    "class": "quick_panel",
-    "row_padding": [32, 12],
-    "layer0.tint": [20, 25, 31],
-    "layer0.opacity": 1.0
-  },
-
-  // Quick Panel row default style (project manager)
-
-  {
-    "class": "quick_panel_row",
-    "layer0.texture": "",
-    "layer0.tint": [20, 25, 31],
-    "layer0.inner_margin": 0,
-    "layer0.opacity": 1.0
-  },
-
-  // Row panel style inside comman panel (cmd + shift + p)
-
-  {
-    "class": "quick_panel_row",
-    "parents": [{"class": "overlay_control"}],
-    "layer0.tint": [20, 25, 31],
-    "layer0.opacity": 1.0
-  },
-
-  // Quick panel (project) style inside overlay_control (cmd + shift + p)
-
-  {
-    "class": "quick_panel",
-    "parents": [{"class": "overlay_control"}],
-    "row_padding": [10, 7],
-    "layer0.tint": [20, 25, 31],
-    "layer0.opacity": 1.0
-  },
-
-  // Quick Panel selected list item style
-
-  {
-    "class": "quick_panel_row",
-    "attributes": ["selected"],
-    "layer0.tint": [25, 31, 38]
-  },
-
-  // Panel labels
-
-  {
-    "class": "quick_panel_label",
-    "fg": [81, 92, 102],
-    "match_fg": [242, 151, 24],
-    "selected_fg": [230, 225, 207],
-    "selected_match_fg": [242, 151, 24]
-  },
-
-  // Panel labels
-
-  {
-    "class": "quick_panel_label",
-    "parents": [{"class": "overlay_control"}],
-    "fg": [81, 92, 102],
-    "match_fg": [242, 151, 24],
-    "selected_fg": [230, 225, 207],
-    "selected_match_fg": [242, 151, 24]
-  },
-
-  // Panels sublabels
-
-  {
-    "class": "quick_panel_path_label",
-    "fg": [66, 80, 94],
-    "match_fg": [230, 225, 207],
-    "selected_fg": [81, 92, 102],
-    "selected_match_fg": [230, 225, 207]
-  },
-
-  // Panels data / score
-
-  {
-    "class": "quick_panel_score_label",
-    "fg": [81, 92, 102],
-    "selected_fg": [81, 92, 102]
-  },
-
-
-
-  /* @ TABS
-  * Tabs settings and behavioring
-  ========================================================================= */
-
-  {
-    "class": "tabset_control",
-    "tab_overlap": 0,
-    "tab_width": 50,
-    "tab_min_width": 50,
-    "tab_height": 30,
-    "mouse_wheel_switch": false,
-
-    "layer0.opacity": 1.0,
-    "layer0.tint": [15, 20, 25],
-    "content_margin": [10, 0]
-  },
-  {
-    "class": "tabset_control",
-    "settings": ["mouse_wheel_switches_tabs", "!enable_tab_scrolling"],
-    "mouse_wheel_switch": true
-  },
-  {
-    "class": "tabset_control",
-    "settings": ["ui_separator"],
-    "content_margin": [0, 0, 0, 0],
-    "layer1.opacity": 0.3,
-    "layer1.texture": "ayu/assets/separator-bottom.png",
-    "layer1.tint": [81, 92, 102],
-    "layer1.inner_margin": [1, 0, 1, 2]
-  },
-  {
-    "class": "tabset_control",
-    "settings": ["ui_big_tabs"],
-    "tab_height": 44
-  },
-
-  // Tabs
-  {
-    "class": "tab_control",
-
-    "layer0.tint": [15, 20, 25],
-    "layer0.opacity": 1.0,
-
-    "layer1.texture": "",
-
-    "layer2.texture": "ayu/assets/separator-bottom.png",
-    "layer2.tint": [242, 151, 24],
-    "layer2.inner_margin": [1, 0, 1, 2],
-    "layer2.opacity": 0.0,
-
-    "layer3.texture": "",
-
-    "content_margin": [10, -2, 10, 0],
-    "max_margin_trim": 12
-  },
-  {
-    "class": "tab_control",
-    "settings": ["ui_separator"],
-
-    "layer1.texture": "ayu/assets/separator-right.png",
-    "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": [81, 92, 102],
-    "layer3.inner_margin": [1, 0, 1, 2],
-    "layer3.opacity": 0.3
-  },
-  {
-    "class": "tab_control",
-    "settings": ["ui_big_tabs"],
-    "content_margin": [15, -2, 15, 0]
-  },
-
-  // Selected current tab
-
-  {
-    "class": "tab_control", "attributes": ["selected"],
-    "layer2.opacity": 1.0,
-    "layer3.opacity": 0.0
-  },
-
-  // Hovered current tab
-
-  {
-    "class": "tab_control", "attributes": ["hover"],
-    "layer2.opacity": 0.3
-  },
-
-  // Selected current tab
-
-  {
-    "class": "tab_control", "attributes": ["selected","hover"],
-    "layer2.opacity": 1.0
-  },
-
-  // Tab Labels
-
-  {
-    "class": "tab_label",
-    "fg": [15, 20, 25, 0],
-    "shadow_color": [81, 92, 102],
-    "shadow_offset": [0, -1],
-    "font.size": 12,
-    "font.italic": false,
-    "font.bold": false,
-    "font.face": "Roboto mono"
-  },
-  {
-    "class": "tab_label",
-    "settings": ["ui_font_source_code_pro"],
-    "font.face": "Source Code Pro"
-  },
-  {
-    "class": "tab_label",
-    "settings": ["ui_font_default"],
-    "font.face": ""
-  },
-  {
-    "class": "tab_label",
-    "fg": [81, 92, 102],
-    "settings": ["ui_fix_tab_labels"],
-    "shadow_color": [15, 20, 25, 0],
-    "shadow_offset": [0, 0]
-  },
-
-  // Tab selected label color
-
-  {
-    "class": "tab_label",
-    "parents": [{"class": "tab_control", "attributes": ["selected"]}],
-    "fg": [15, 20, 25, 0],
-    "shadow_color": [230, 225, 207],
-    "shadow_offset": [0, -1]
-  },
-  {
-    "class": "tab_label",
-    "settings": ["ui_fix_tab_labels"],
-    "parents": [{"class": "tab_control", "attributes": ["selected"]}],
-    "fg": [230, 225, 207],
-    "shadow_color": [15, 20, 25, 0],
-    "shadow_offset": [0, 0]
-  },
-
-  {
-    "class": "tab_label",
-    "attributes": ["transient"],
-    "font.italic": true
-  },
-
-  // Tab Close Buttons
-  {
-    "class": "tab_close_button",
-    "content_margin": [0, 0],
-
-  // Close Icon
-    "layer0.texture": "ayu/assets/close.png",
-    "layer0.tint": [81, 92, 102],
-    "layer0.opacity": 1.0,
-
-  // Dirty Icon
-    "layer1.texture": "ayu/assets/dirty.png",
-    "layer1.tint": [81, 92, 102],
-    "layer1.opacity": 0
-  },
-
-  // Default
-  {
-    "class": "tab_close_button",
-    "settings": ["show_tab_close_buttons"],
-    "content_margin": [8, 8]
-  },
-
-  // Default hover
-  {
-    "class": "tab_close_button",
-    "settings": ["show_tab_close_buttons"],
-    "attributes": ["hover"],
-    "layer0.tint": [242, 151, 24]
-  },
-
-  // Dirty tab
-  {
-    "class": "tab_close_button",
-    "parents": [{"class": "tab_control", "attributes": ["dirty"]}],
-    "layer0.opacity": 0, // Close Icon
-    "layer1.opacity": 1.0, // dirty Icon
-    "content_margin": [8, 8]
-  },
-
-  // Dirty tab on hover
-  {
-    "class": "tab_close_button",
-    "parents": [{"class": "tab_control", "attributes": ["dirty"]}],
-    "attributes": ["hover"],
-    "layer0.opacity": 1.0, // Close Icon
-    "layer1.opacity": 0 // Close Icon
-  },
-
-  // Selected dirty tab
-  {
-    "class": "tab_close_button",
-    "parents": [{"class": "tab_control", "attributes": ["selected", "dirty"]}],
-    "layer0.opacity": 0, // Close Icon
-    "layer1.opacity": 1.0, // Dirty Icon
-    "layer1.tint": [242, 151, 24]
-  },
-
-  // Selected dirty tab on hover
-  {
-    "class": "tab_close_button",
-    "parents": [{"class": "tab_control", "attributes": ["selected", "dirty"]}],
-    "attributes": ["hover"],
-    "layer0.opacity": 1.0,
-    "layer1.opacity": 0
-  },
-  // tab set scroll left | scroll right
-  {
-    "class": "scroll_tabs_left_button",
-    "content_margin": [12, 15],
-    "layer0.texture": "ayu/assets/arrow-left.png",
-    "layer0.tint": [62, 75, 89],
-    "layer0.opacity": 1.0
-  },
-
-  {
-    "class": "scroll_tabs_left_button",
-    "attributes": ["hover"],
-    "layer0.tint": [242, 151, 24]
-  },
-
-  {
-    "class": "scroll_tabs_right_button",
-    "content_margin": [12, 15],
-    "layer0.texture": "ayu/assets/arrow-right.png",
-    "layer0.tint": [62, 75, 89],
-    "layer0.opacity": 1.0
-  },
-  {
-    "class": "scroll_tabs_right_button",
-    "settings": ["ui_separator"],
-    "layer2.texture": "ayu/assets/separator-right.png",
-    "layer2.tint": [81, 92, 102],
-    "layer2.opacity": 0.3,
-    "layer2.inner_margin" : [0, 1, 2, 1]
-  },
-
-  {
-    "class": "scroll_tabs_right_button",
-    "attributes": ["hover"],
-    "layer0.tint": [242, 151, 24]
-  },
-
-  {
-    "class": "show_tabs_dropdown_button",
-    "content_margin": [12, 12],
-    "layer0.texture": "ayu/assets/overflow-menu.png",
-    "layer0.tint": [62, 75, 89],
-    "layer0.opacity": 1.0,
-    "layer0.inner_margin": [0, 0]
-  },
-
-  {
-    "class": "show_tabs_dropdown_button",
-    "attributes": ["hover"],
-    "layer0.tint": [242, 151, 24]
-  },
-
-
-  /* @ SIDEBAR
-  * Sidebar panel settings and behavioring
-  ========================================================================= */
-
-  {
-    "class": "sidebar_container",
-    "content_margin": [0, -20, 0, 0],
-    "layer0.opacity": 1,
-    "layer0.tint": [15, 20, 25]
-  },
-  {
-    "class": "sidebar_container",
-    "settings": ["ui_separator"],
-    "layer1.texture": "ayu/assets/separator-right.png",
-    "layer1.tint": [81, 92, 102],
-    "layer1.inner_margin": [0, 1, 2, 1],
-    "layer1.opacity": 0.3
-  },
-
-  {
-    "class": "sidebar_tree",
-    "row_padding": [30, 6],
-    "indent": 12,
-    "indent_offset": 0,
-    "indent_top_level": false,
-    "dark_content": true
-  },
-
-  {
-    "class": "sidebar_heading",
-    "color": [15, 20, 25],
-    "font.face": "Roboto mono",
-    "font.bold": true,
-    "font.size": 11
-  },
-  {
-    "class": "sidebar_heading",
-    "settings": ["ui_font_source_code_pro"],
-    "font.face": "Source Code Pro"
-  },
-  {
-    "class": "sidebar_heading",
-    "settings": ["ui_font_default"],
-    "font.face": ""
-  },
-
-  {
-    "class": "tree_row",
-    "layer1.texture": "ayu/assets/tree-highlight.png",
-    "layer1.opacity": { "target": 0.0, "speed": 5.0, "interpolation": "smoothstep" },
-    "layer1.tint": [242, 151, 24],
-    "layer1.inner_margin": [5, 0, 0, 3],
-    "layer0.tint": [25, 31, 38],
-    "layer0.opacity": 0
-  },
-
-  {
-    "class": "tree_row",
-    "attributes": ["selected"],
-    "layer1.opacity": { "target": 1.0, "speed": 5.0, "interpolation": "smoothstep" }
-  },
-
-  {
-    "class": "sidebar_label",
-    "color": [81, 92, 102],
-    "shadow_color": [0, 0, 0],
-    "shadow_offset": [0, 0],
-    "font.face": "Roboto mono",
-    "font.size": 12
-  },
-  {
-    "class": "sidebar_label",
-    "settings": ["ui_font_source_code_pro"],
-    "font.face": "Source Code Pro"
-  },
-  {
-    "class": "sidebar_label",
-    "settings": ["ui_font_default"],
-    "font.face": ""
-  },
-
-  {
-    "class": "sidebar_label",
-    "parents": [{"class": "tree_row","attributes": ["hover"]}],
-    "color": [230, 225, 207]
-  },
-
-  {
-    "class": "sidebar_label",
-    "parents": [{"class": "tree_row","attributes": ["selected"]}],
-    "color": [230, 225, 207],
-    "shadow_color": [0, 0, 0],
-    "shadow_offset": [0, 0]
-  },
-
-  {
-    "class": "sidebar_label",
-    "parents": [{"class": "tree_row","attributes": ["expandable"]}],
-    "color": [81, 92, 102],
-    "font.bold": false
-  },
-
-  {
-    "class": "sidebar_label",
-    "parents": [{"class": "tree_row", "attributes": ["expandable"]}],
-    "settings": ["bold_folder_labels"],
-    "font.bold": true
-  },
-
-  {
-    "class": "sidebar_label",
-    "parents": [{"class": "tree_row", "attributes": ["expandable", "hover"]}],
-    "color": [230, 225, 207]
-  },
-
-  {
-    "class": "sidebar_label",
-    "parents": [{"class": "tree_row", "attributes": ["expanded"]}],
-    "color": [230, 225, 207]
-  },
-
-  {
-    "class": "sidebar_label",
-    "parents": [{"class": "tree_row", "attributes": ["expanded"]}],
-    "settings": ["bold_folder_labels"],
-    "font.bold": true
-  },
-
-  // {
-  //  "class": "sidebar_label",
-  //  "parents": [{"class": "tree_row", "attributes": ["expanded", "selected"]}],
-  //  "color": [230, 225, 207]
-  // },
-
-  {
-    "class": "sidebar_label",
-    "attributes": ["transient"],
-    "font.italic": false
-  },
-
-  // Hidden arrow icon before folder
-
-  {
-    "class": "disclosure_button_control",
-    "layer0.texture": "ayu/assets/arrow-right.png",
-    "layer0.tint": [62, 75, 89],
-    "layer0.opacity": 1,
-    "layer0.inner_margin": 0,
-    "content_margin": [12, 15]
-  },
-
-  {
-    "class": "disclosure_button_control",
-    "parents": [{ "class": "tree_row", "attributes": ["hover"]}],
-    "layer0.tint": [242, 151, 24]
-  },
-
-  {
-    "class": "disclosure_button_control",
-    "attributes": ["expanded"],
-    "layer0.texture": "ayu/assets/overflow-menu.png",
-    "content_margin": [12, 12]
-  },
-
-  {
-    "class": "disclosure_button_control",
-    "attributes": ["expanded"],
-    "parents": [{ "class": "tree_row", "attributes": ["hover"]}],
-    "layer0.tint": [242, 151, 24]
-  },
-
-  // Opened files
-  {
-    "class": "close_button",
-    "content_margin": [8, 8],
-
-  // Default Close icon
-    "layer0.texture": "ayu/assets/close.png",
-    "layer0.opacity": 0,
-    "layer0.inner_margin": [0, 0],
-    "layer0.tint": [81, 92, 102]
-  },
-
-
-  // Opened file hover
-
-  {
-    "class": "close_button",
-    "parents": [{ "class": "tree_row", "attributes": ["hover"] }],
-  // Default Close icon
-    "layer0.opacity": 0.6
-  },
-
-  {
-    "class": "close_button",
-    "attributes": ["dirty"],
-    "layer0.texture": "ayu/assets/dirty.png",
-    "layer0.tint": [81, 92, 102],
-    "layer0.opacity": 1.0
-  },
-
-  {
-    "class": "close_button",
-    "attributes": ["hover"],
-    "layer0.opacity": 1.0,
-    "layer0.tint": [242, 151, 24]
-  },
-
-
-  /* @ SCROLLBARS
-  * Scrollbars settings and behavioring
-  ========================================================================= */
-
-  // Normal Vertical scrollbar track
-  // !!!
-  {
-    "class": "scroll_bar_control",
-    "layer0.tint" : [15, 20, 25],
-    "layer0.opacity": 1,
-    "layer0.inner_margin": [0, 0],
-    "blur": false
-  },
-
-  // Normal Vertical scrollbar track inside overlay panel
-
-  {
-    "class": "scroll_bar_control",
-    "parents": [{"class": "overlay_control"}],
-    "layer0.tint": [15, 20, 25, 0],
-    "layer0.opacity": 1.0,
-    "layer0.inner_margin": [0, 2],
-    "blur": false
-  },
-
-  // Normal horizontal scrollbar track
-
-  {
-    "class": "scroll_bar_control",
-    "attributes": ["horizontal"],
-    "layer0.texture": "",
-    "layer0.tint" : [15, 20, 25],
-    "layer0.inner_margin": [0, 0],
-    "blur": false
-  },
-
-  // Normal horizontal scrollbar track inside overlay panel
-  // !!!
-  // {
-  //  "class": "scroll_bar_control",
-  //  "attributes": ["horizontal"],
-  //  "parents": [{"class": "overlay_control"}],
-  //  "layer0.tint": [15, 20, 25, 0],
-  //  "layer0.opacity": 0.0,
-  //  "layer0.inner_margin": [0, 2],
-  //  "blur": false
-  //  },
-
-  // Scrollbars corner
-
-  {
-    "class": "scroll_corner_control",
-    "layer0.texture": "",
-    "layer0.tint":[15, 20, 25],
-    "layer0.inner_margin": [0, 0],
-    "layer0.opacity": 1,
-    "blur": false
-  },
-
-  // Vertical puck controller
-
-  {
-    "class": "puck_control",
-    "layer0.texture": "",
-    "layer0.tint": [255, 255, 255, 50],
-    "layer0.opacity": 1,
-    "layer0.inner_margin": [0, 0],
-    "content_margin": [1, 12],
-    "blur": false
-  },
-
-  // Horizontal puck controller
-
-  {
-    "class": "puck_control",
-    "attributes": ["horizontal"],
-    "layer0.texture": "",
-    "layer0.tint": [255, 255, 255, 50],
-    "layer0.inner_margin": [0, 0],
-    "content_margin": [12, 1],
-    "blur": false
-  },
-
-  {
-    "class": "scroll_area_control",
-    "settings": ["overlay_scroll_bars"],
-    "overlay": true
-  },
-
-  {
-    "class": "scroll_area_control",
-    "settings": ["!overlay_scroll_bars"],
-    "overlay": false // set to false for the original behavior
-  },
-
-
-  {
-    "class": "scroll_area_control",
-    "parents": [{"class": "overlay_control"}],
-    "settings": ["overlay_scroll_bars"],
-    "overlay": true // set to false for the original behavior
-  },
-
-  {
-    "class": "scroll_area_control",
-    "parents": [{"class": "sidebar_container"}],
-    "settings": ["!overlay_scroll_bars"],
-    "overlay": false // set to false for the original behavior
-  },
-
-  {
-    "class": "scroll_bar_control",
-    "settings": ["overlay_scroll_bars"],
-    "layer0.tint": [28, 31, 38],
-    "layer0.inner_margin": [0, 5],
-    "blur": false
-  },
-
-  {
-    "class": "scroll_bar_control",
-    "settings": ["overlay_scroll_bars"],
-    "attributes": ["horizontal"],
-    "layer0.inner_margin": [5, 0],
-    "blur": true
-  },
-
-
-  /* @ MINIMAP
-  * Minimap settings and behavioring
-  ========================================================================= */
-
-  {
-    "class": "minimap_control",
-    "settings": ["always_show_minimap_viewport"],
-    "viewport_color": [100, 100, 100]
-  },
-
-  {
-    "class": "minimap_control",
-    "settings": ["!always_show_minimap_viewport"],
-    "viewport_color": [100, 100, 100, 20]
-  },
-
-
-  /* @ STATUS BAR
-  * Status bar settings and behavioring
-  ========================================================================= */
-
-  // All labels
-
-  {
-    "class": "label_control",
-    "color": [81, 92, 102],
-    "shadow_color": [0, 0, 0, 0],
-    "shadow_offset": [0, 0],
-    "font.bold": false,
-    "font.face": "Roboto mono",
-    "font.size": 12
-  },
-  {
-    "class": "label_control",
-    "settings": ["ui_font_source_code_pro"],
-    "font.face": "Source Code Pro"
-  },
-  {
-    "class": "label_control",
-    "settings": ["ui_font_default"],
-    "font.face": ""
-  },
-
-  // Status bar labels
-
-  {
-    "class": "label_control",
-    "parents": [{"class": "status_bar"}],
-    "color": [81, 92, 102],
-    "font.bold": false
-  },
-
-  // Text field labels
-
-  {
-    "class": "status_bar",
-    "layer0.texture": "",
-    "layer0.tint": [15, 20, 25],
-    "layer0.opacity": 1,
-    "layer1.texture": "ayu/assets/separator-top.png",
-    "layer1.inner_margin": [1, 2, 1, 0],
-    "content_margin": [10, 5]
-  },
-  {
-    "class": "status_bar",
-    "settings": ["ui_separator"],
-    "layer0.tint": [20, 25, 31]
-    // "layer1.opacity": 0.3
-  },
-
-  {
-    "class": "status_container",
-    "content_margin": [0, 5]
-  },
-
-  {
-    "class": "status_button",
-    "min_size": [100, 0]
-  },
-
-
-  /* @ WIDGET PANEL
-  * Widget, input, buttons settings and behavioring
-  ========================================================================= */
-
-
-  // Status bar panel
-  {
-    "class": "panel_control",
-    "layer0.tint": [15, 20, 25],
-    "layer0.opacity": 1.0,
-    "content_margin": [0, 5]
-  },
-  {
-    "class": "panel_control",
-    "settings": ["ui_separator"],
-    "layer0.tint": [20, 25, 31],
-    "layer1.texture": "ayu/assets/separator-top.png",
-    "layer1.tint": [81, 92, 102],
-    "layer1.inner_margin": [1, 2, 1, 0],
-    "layer1.opacity": 0.3
-  },
-
-  // Status bar panel close icon
-
-  {
-    "class": "panel_close_button",
-    "layer0.texture": "ayu/assets/close.png",
-    "layer0.opacity": 1.0,
-    "layer0.tint": [81, 92, 102],
-    "content_margin": [0, 0] // 8,8 to show
-  },
-  // !!!
-  {
-    "class": "panel_close_button",
-    "attributes": ["hover"],
-    "layer0.tint": [242, 151, 24]
-  },
-
-  // Texline input
-
-  {
-    "class": "text_line_control",
-    "layer0.texture": "ayu/assets/input-bg.png",
-    "layer0.opacity": 1,
-    "layer0.inner_margin": [10, 8],
-    "layer0.tint": [20, 25, 31],
-
-    "layer1.texture": "ayu/assets/input-border.png",
-    "layer1.opacity": 0.3,
-    "layer1.inner_margin": [10, 8],
-    "layer1.tint": [81, 92, 102],
-    "content_margin": [10, 7, 10, 5]
-  },
-
-
-  // Textline input inside overlay panels
-
-  {
-    "class": "text_line_control",
-    "parents": [{"class": "overlay_control"}],
-    "layer0.texture": "",
-    "layer0.opacity": 0,
-    "layer1.texture": "ayu/assets/input-search.png",
-    "layer1.opacity": 1,
-    "layer1.tint": [242, 151, 24],
-    "layer1.inner_margin": [35, 0, 0, 0],
-    "content_margin": [43, 7, 10, 4]
-  },
-
-  // Textline input oveflow menu
-  {
-    "class": "dropdown_button_control",
-    "content_margin": [12, 12],
-    "layer0.texture": "ayu/assets/overflow-menu.png",
-    "layer0.tint": [62, 75, 89],
-    "layer0.opacity": 1.0
-  },
-  {
-    "class": "dropdown_button_control",
-    "attributes": ["hover"],
-    "layer0.tint": [242, 151, 24]
-  },
-
-
-  /* @ BUTTONS
-  * Buttons panels settings and behavioring
-  ========================================================================= */
-
-
-  // Button labels
-
-  {
-    "class": "button_control",
-    "content_margin": [15, 9, 15, 10],
-    "min_size": [60, 0],
-    "layer0.tint": [242, 151, 24, 10],
-    "layer0.texture": "ayu/assets/input-bg.png",
-    "layer0.inner_margin": [10, 8],
-    "layer0.opacity": 0
-  },
-  {
-    "class": "button_control",
-    "attributes": ["hover"],
-    "layer0.opacity": 1
-  },
-
-  {
-    "class": "label_control",
-    "parents": [{"class": "button_control"}],
-    "color":  [81, 92, 102]
-  },
-
-  {
-    "class": "label_control",
-    "parents": [{"class": "button_control", "attributes": ["hover"]}],
-    "color":  [242, 151, 24]
-  },
-
-  // !!!
-  // Small Icon Buttons
-  {
-    "class": "icon_button_control",
-    "layer0.tint": [0, 0, 0],
-    "layer0.opacity": 0,
-    "layer2.tint": [230, 225, 207],
-    "layer2.opacity": { "target": 0.0, "speed": 10.0, "interpolation": "smoothstep" },
-    "content_margin": [10, 5]
-  },
-
-
-  /* Buttons icons settings
-  ===================================================================== */
-
-  // Regex Icon
-  {
-    "class": "icon_regex",
-    "layer0.texture": "ayu/assets/regex.png",
-    "layer0.tint": [81, 92, 102],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-  {
-    "class": "icon_regex",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [242, 151, 24]
-  },
-
-  // Preserve case sensitive
-
-  {
-    "class": "icon_case",
-    "layer0.texture": "ayu/assets/matchcase.png",
-    "layer0.tint": [81, 92, 102],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-  {
-    "class": "icon_case",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [242, 151, 24]
-  },
-
-  // Wholeword
-
-  {
-    "class": "icon_whole_word",
-    "layer0.texture": "ayu/assets/word.png",
-    "layer0.tint": [81, 92, 102],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-
-  {
-    "class": "icon_whole_word",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [242, 151, 24]
-  },
-
-  // Wrap
-
-  {
-    "class": "icon_wrap",
-    "layer0.texture": "ayu/assets/wrap.png",
-    "layer0.tint": [81, 92, 102],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-  {
-    "class": "icon_wrap",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [242, 151, 24]
-  },
-
-  // In selection
-
-  {
-    "class": "icon_in_selection",
-    "layer0.texture": "ayu/assets/inselection.png",
-    "layer0.tint": [81, 92, 102],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-  {
-    "class": "icon_in_selection",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [242, 151, 24]
-  },
-
-  // Highlight Result
-
-  {
-    "class": "icon_highlight",
-    "layer0.texture": "ayu/assets/highlight.png",
-    "layer0.tint": [81, 92, 102],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-  {
-    "class": "icon_highlight",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [242, 151, 24]
-  },
-
-  // Preserve Case
-
-  {
-    "class": "icon_preserve_case",
-    "layer0.texture": "ayu/assets/replace-preserve-case.png",
-    "layer0.tint": [81, 92, 102],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-  {
-    "class": "icon_preserve_case",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [242, 151, 24]
-  },
-
-  // Show context
-
-  {
-    "class": "icon_context",
-    "layer0.texture": "ayu/assets/context.png",
-    "layer0.tint": [81, 92, 102],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-
-  {
-    "class": "icon_context",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [242, 151, 24]
-  },
-
-  // Use buffer
-
-  {
-    "class": "icon_use_buffer",
-    "layer0.texture": "ayu/assets/buffer.png",
-    "layer0.tint": [81, 92, 102],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-  {
-    "class": "icon_use_buffer",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [242, 151, 24]
-  },
-
-  // Reverse direction
-
-  {
-    "class": "icon_reverse",
-    "layer0.texture": "ayu/assets/reverse.png",
-    "layer0.tint": [81, 92, 102],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-  {
-    "class": "icon_reverse",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [242, 151, 24]
-  },
-
-
-  /* Visual settings
-  ===================================================================== */
-
-  // UI font sizees
-  // ==============
-  {
-    "class": "tab_label",
-    "settings": ["ui_font_size_small"],
-    "font.size": 11
-  },
-  {
-    "class": "sidebar_label",
-    "settings": ["ui_font_size_small"],
-    "font.size": 11
-  },
-  {
-    "class": "label_control",
-    "settings": ["ui_font_size_small"],
-    "font.size": 11
-  },
-  {
-    "class": "tool_tip_label_control",
-    "settings": ["ui_font_size_small"],
-    "font.size": 11
-  }
-]
diff --git a/ayu-light.sublime-theme b/ayu-light.sublime-theme
index 964bde2c..2342bc44 100644
--- a/ayu-light.sublime-theme
+++ b/ayu-light.sublime-theme
@@ -8,9 +8,9 @@
    */
 
   {
-    "class" : "sheet_container_control",
-    "layer0.tint" : [250, 250, 250],
-    "layer0.opacity" : 1
+    "class": "sheet_container_control",
+    "layer0.tint": [250, 250, 250],
+    "layer0.opacity": 1
   },
 
 
@@ -21,7 +21,7 @@
   {
     "class": "grid_layout_control",
     "border_size": 0,
-    "border_color": [226, 228, 231]
+    "border_color": [237, 237, 237]
   },
   {
     "class": "grid_layout_control",
@@ -34,7 +34,7 @@
    */
   {
     "class": "progress_gauge_control",
-    "layer0.tint": [255, 106, 0],
+    "layer0.tint": [255, 143, 64],
     "layer0.opacity": 1.0,
     "content_margin": [0, 6]
   },
@@ -60,14 +60,14 @@
     "layer0.texture": "ayu/assets/unfold.png",
     "layer0.opacity": 1.0,
     "layer0.inner_margin": 0,
-    "layer0.tint": [133, 136, 140],
+    "layer0.tint": [157, 162, 166],
     "content_margin": [8, 6, 8, 6]
   },
 
   {
     "class": "fold_button_control",
     "attributes": ["hover"],
-    "layer0.tint": [255, 106, 0],
+    "layer0.tint": [255, 143, 64],
   },
 
   {
@@ -96,10 +96,10 @@
 
   {
     "class": "auto_complete_label",
-    "fg": [133, 136, 140],
-    "match_fg": [255, 106, 0],
-    "selected_fg": [110, 117, 128],
-    "selected_match_fg": [255, 106, 0],
+    "fg": [157, 162, 166],
+    "match_fg": [255, 143, 64],
+    "selected_fg": [97, 103, 108],
+    "selected_match_fg": [255, 143, 64],
     "fg_blend": true
   },
 
@@ -129,8 +129,7 @@
 
   {
     "class": "tool_tip_label_control",
-    "color": [133, 136, 140],
-    "font.face": "Roboto mono",
+    "color": [157, 162, 166],
     "font.size": 13
   },
   {
@@ -140,8 +139,8 @@
   },
   {
     "class": "tool_tip_label_control",
-    "settings": ["ui_font_default"],
-    "font.face": ""
+    "settings": ["ui_font_roboto_mono"],
+    "font.face": "Roboto mono"
   },
 
   /* OVERLAY PANELS
@@ -152,21 +151,21 @@
   {
     "class": "overlay_control",
     "layer0.texture": "ayu/assets/overlay-shadow.png",
-    "layer0.inner_margin": [25, 45, 25, 35],
-    "layer0.opacity": 1.0,
-    "layer0.tint": [126, 132, 140],
+    "layer0.inner_margin": [15, 35, 15, 25],
+    "layer0.opacity": 0.6,
+    "layer0.tint": [200, 200, 200],
 
     "layer1.texture": "ayu/assets/overlay-border.png",
-    "layer1.inner_margin": [25, 45, 25, 35],
+    "layer1.inner_margin": [15, 35, 15, 25],
     "layer1.opacity": 1.0,
-    "layer1.tint": [110, 117, 128, 30],
+    "layer1.tint": [200, 200, 200],
 
     "layer2.texture": "ayu/assets/overlay-bg.png",
-    "layer2.inner_margin": [25, 45, 25, 35],
+    "layer2.inner_margin": [15, 35, 15, 25],
     "layer2.opacity": 1.0,
     "layer2.tint": [255, 255, 255],
 
-    "content_margin": [20, 45, 20, 35]
+    "content_margin": [10, 35, 10, 20]
   },
 
   // Command Panel list item style (cmd + shift + p)
@@ -215,17 +214,15 @@
   },
 
   // Quick panel (project) style inside overlay_control (cmd + shift + p)
-
   {
     "class": "quick_panel",
     "parents": [{"class": "overlay_control"}],
-    "row_padding": [20, 5],
+    "row_padding": [24, 8],
     "layer0.tint": [255, 255, 255],
     "layer0.opacity": 1.0
   },
 
   // Quick Panel selected list item style
-
   {
     "class": "quick_panel_row",
     "attributes": ["selected"],
@@ -233,61 +230,56 @@
   },
 
   // Panel labels
-
   {
     "class": "quick_panel_label",
-    "fg": [133, 136, 140],
-    "match_fg": [255, 106, 0],
-    "selected_fg": [110, 117, 128],
-    "selected_match_fg": [255, 106, 0]
+    "fg": [157, 162, 166],
+    "font.bold": false,
+    "match_fg": [255, 143, 64],
+    "selected_fg": [97, 103, 108],
+    "selected_match_fg": [255, 143, 64]
   },
 
   // Panel labels
-
   {
     "class": "quick_panel_label",
     "parents": [{"class": "overlay_control"}],
-    "fg": [133, 136, 140],
-    "match_fg": [255, 106, 0],
-    "selected_fg": [110, 117, 128],
-    "selected_match_fg": [255, 106, 0]
+    "fg": [157, 162, 166],
+    "match_fg": [255, 143, 64],
+    "selected_fg": [97, 103, 108],
+    "selected_match_fg": [255, 143, 64]
   },
 
   // Panels sublabels
-
   {
     "class": "quick_panel_path_label",
-    "fg": [149, 156, 166],
-    "match_fg": [110, 117, 128],
-    "selected_fg": [133, 136, 140],
-    "selected_match_fg": [110, 117, 128]
+    "fg": [185, 188, 191],
+    "match_fg": [128, 132, 136],
+    "selected_fg": [185, 188, 191],
+    "selected_match_fg": [128, 132, 136]
   },
 
   // Panels data / score
-
   {
     "class": "quick_panel_score_label",
-    "fg": [133, 136, 140],
-    "selected_fg": [133, 136, 140]
+    "fg": [157, 162, 166],
+    "selected_fg": [255, 143, 64]
   },
 
 
-
   /* TABS
    * Tabs settings and behavioring
    */
-
   {
     "class": "tabset_control",
     "mouse_wheel_switch": false,
     "tab_min_width": 50,
     "tab_overlap": 0,
-    "tab_height": 30,
+    "tab_height": 36,
     "tab_width": 50,
 
     "layer0.tint": [250, 250, 250],
     "layer0.opacity": 1.0,
-    "content_margin": [0, 0] // <<<<<<<<<<<<<
+    "content_margin": [10, 0]
   },
   {
     "class": "tabset_control",
@@ -298,114 +290,107 @@
     "class": "tabset_control",
     "settings": ["ui_separator"],
     "content_margin": [0, 0, 0, 0],
-    "layer1.opacity": 0.2,
+    "layer1.opacity": 1,
     "layer1.texture": "ayu/assets/separator-bottom.png",
-    "layer1.tint": [133, 136, 140],
+    "layer1.tint": [237, 237, 237],
     "layer1.inner_margin": [1, 0, 1, 2]
   },
   {
     "class": "tabset_control",
     "platforms": ["osx"],
     "settings": ["ui_separator", "!ui_native_titlebar"],
-    "layer2.opacity": 0.2,
+    "layer2.opacity": 1,
     "layer2.texture": "ayu/assets/separator-top.png",
-    "layer2.tint": [133, 136, 140],
+    "layer2.tint": [237, 237, 237],
     "layer2.inner_margin": [1, 2, 1, 0]
   },
 
-  {
-    "class": "tabset_control",
-    "settings": ["ui_big_tabs"],
-    "tab_height": 40
-  },
-
   // Tabs
   {
     "class": "tab_control",
-
-    "layer0.tint": [250, 250, 250, 0],
+    // Background
+    "layer0.tint": [250, 250, 250],
     "layer0.opacity": 1.0,
 
-    "layer1.texture": "",
+    // Top
+    "layer1.texture": "ayu/assets/separator-top.png",
+    "layer1.tint": [237, 237, 237],
+    "layer1.inner_margin": [0, 1, 0, 0],
+    "layer1.opacity": 0.0,
 
-    "layer2.texture": "ayu/assets/separator-bottom.png",
-    "layer2.tint": [255, 106, 0],
-    "layer2.inner_margin": [1, 0, 1, 2],
+    // Right
+    "layer2.texture": "ayu/assets/separator-right.png",
+    "layer2.tint": [237, 237, 237],
+    "layer2.inner_margin": [0, 0, 1, 0],
     "layer2.opacity": 0.0,
 
-    "layer3.texture": "",
+    // Bottom
+    "layer3.texture": "ayu/assets/separator-bottom.png",
+    "layer3.tint": [237, 237, 237],
+    "layer3.inner_margin": [0, 0, 0, 1],
+    "layer3.opacity": 0.0,
 
-    "content_margin": [10, -2, 10, 0],
+    "content_margin": [15, -2, 15, 0],
     "max_margin_trim": 12
   },
   {
     "class": "tab_control",
     "settings": ["ui_separator"],
 
-    "layer1.texture": "ayu/assets/separator-right.png",
-    "layer1.tint": [133, 136, 140],
-    "layer1.inner_margin": [0, 1, 2, 1],
-    "layer1.opacity": 0.2,
+    "layer1.opacity": 1.0,
 
-    "layer3.texture": "ayu/assets/separator-bottom.png",
-    "layer3.tint": [133, 136, 140],
-    "layer3.inner_margin": [1, 0, 1, 2],
-    "layer3.opacity": 0.2
-  },
-  {
-    "class": "tab_control",
-    "settings": ["ui_big_tabs"],
-    "content_margin": [15, -2, 15, 0]
+    "layer2.opacity": 1.0,
+
+    "layer3.opacity": 1.0
   },
 
   // Selected current tab
-
   {
     "class": "tab_control", "attributes": ["selected"],
-    "layer2.opacity": 1.0,
-    "layer3.opacity": 0.0
+    "settings": ["!ui_separator"],
+    "layer3.tint": [255, 143, 64],
+    "layer3.opacity": 1.0
   },
   {
     "class": "tab_control", "attributes": ["selected"],
     "settings": ["ui_separator"],
-    "layer0.tint": [133, 136, 140, 15]
+    "layer1.tint": [255, 143, 64],
+    "layer3.opacity": 0.0
   },
 
   // Hovered current tab
-
   {
     "class": "tab_control", "attributes": ["hover"],
-    "layer2.opacity": 0.3
+    "settings": ["!ui_separator"],
+    "layer3.tint": [255, 143, 64],
+    "layer3.opacity": 0.3
   },
   {
     "class": "tab_control", "attributes": ["hover"],
     "settings": ["ui_separator"],
-    "layer0.tint": [133, 136, 140, 6],
+    "layer0.tint": [237, 237, 237, 70],
   },
 
   // Selected current tab
-
   {
     "class": "tab_control", "attributes": ["selected", "hover"],
-    "layer2.opacity": 1.0
+    "settings": ["!ui_separator"],
+    "layer3.opacity": 1.0
   },
   {
     "class": "tab_control", "attributes": ["selected", "hover"],
     "settings": ["ui_separator"],
-    "layer0.tint": [133, 136, 140, 15]
+    "layer0.tint": [250, 250, 250]
   },
 
   // Tab Labels
 
   {
     "class": "tab_label",
-    "fg": [250, 250, 250, 0],
-    "shadow_color": [133, 136, 140],
-    "shadow_offset": [0, -1],
+    "fg": [157, 162, 166],
     "font.italic": false,
     "font.bold": false,
-    "font.size": 12,
-    "font.face": "Roboto mono"
+    "font.size": 12
   },
   {
     "class": "tab_label",
@@ -414,28 +399,15 @@
   },
   {
     "class": "tab_label",
-    "settings": ["ui_font_default"],
-    "font.face": ""
+    "settings": ["ui_font_roboto_mono"],
+    "font.face": "Roboto mono"
   },
   {
     "class": "tab_label",
     "settings": ["highlight_modified_tabs"],
     "font.italic": true,
     "attributes": ["dirty"],
-    "shadow_color": [255, 106, 0]
-  },
-  {
-    "class": "tab_label",
-    "fg": [133, 136, 140],
-    "settings": ["ui_fix_tab_labels"],
-    "shadow_color": [250, 250, 250, 0],
-    "shadow_offset": [0, 0]
-  },
-  {
-    "class": "tab_label",
-    "fg": [255, 106, 0],
-    "attributes": ["dirty"],
-    "settings": ["ui_fix_tab_labels", "highlight_modified_tabs"]
+    "fg": [255, 143, 64]
   },
 
   // Tab selected label color
@@ -443,17 +415,7 @@
   {
     "class": "tab_label",
     "parents": [{"class": "tab_control", "attributes": ["selected"]}],
-    "fg": [250, 250, 250, 0],
-    "shadow_color": [110, 117, 128],
-    "shadow_offset": [0, -1],
-  },
-  {
-    "class": "tab_label",
-    "settings": ["ui_fix_tab_labels"],
-    "parents": [{"class": "tab_control", "attributes": ["selected"]}],
-    "fg": [110, 117, 128],
-    "shadow_color": [250, 250, 250, 0],
-    "shadow_offset": [0, 0]
+    "fg": [97, 103, 108]
   },
 
   {
@@ -469,12 +431,12 @@
 
   // Close Icon
     "layer0.texture": "ayu/assets/close.png",
-    "layer0.tint": [133, 136, 140],
+    "layer0.tint": [157, 162, 166],
     "layer0.opacity": 1.0,
 
   // Dirty Icon
     "layer1.texture": "ayu/assets/dirty.png",
-    "layer1.tint": [133, 136, 140],
+    "layer1.tint": [157, 162, 166],
     "layer1.opacity": 0,
   },
 
@@ -482,7 +444,7 @@
   {
     "class": "tab_close_button",
     "settings": ["show_tab_close_buttons"],
-    "content_margin": [8, 8]
+    "content_margin": [6, 8]
   },
 
   // Default hover
@@ -490,7 +452,7 @@
     "class": "tab_close_button",
     "settings": ["show_tab_close_buttons", "highlight_modified_tabs"],
     "attributes": ["hover"],
-    "layer0.tint": [255, 106, 0]
+    "layer0.tint": [255, 143, 64]
   },
 
   // Dirty tab
@@ -499,7 +461,7 @@
     "parents": [{"class": "tab_control", "attributes": ["dirty"]}],
     "layer0.opacity": 0, // Close Icon
     "layer1.opacity": 1.0, // dirty Icon
-    "content_margin": [8, 8]
+    "content_margin": [6, 8]
   },
 
   // Dirty tab on hover
@@ -517,7 +479,7 @@
     "parents": [{"class": "tab_control", "attributes": ["selected", "dirty"]}],
     "layer0.opacity": 0, // Close Icon
     "layer1.opacity": 1.0, // Dirty Icon
-    "layer1.tint": [255, 106, 0]
+    "layer1.tint": [255, 143, 64]
   },
 
   // Selected dirty tab on hover
@@ -534,43 +496,43 @@
     "class": "scroll_tabs_left_button",
     "content_margin": [12, 15],
     "layer0.texture": "ayu/assets/arrow-left.png",
-    "layer0.tint": [135, 143, 153],
+    "layer0.tint": [194, 197, 200],
     "layer0.opacity": 1.0
   },
 
   {
     "class": "scroll_tabs_left_button",
     "attributes": ["hover"],
-    "layer0.tint": [255, 106, 0]
+    "layer0.tint": [255, 143, 64]
   },
 
   {
     "class": "scroll_tabs_right_button",
     "content_margin": [12, 15],
     "layer0.texture": "ayu/assets/arrow-right.png",
-    "layer0.tint": [135, 143, 153],
+    "layer0.tint": [194, 197, 200],
     "layer0.opacity": 1.0
   },
   {
     "class": "scroll_tabs_right_button",
     "settings": ["ui_separator"],
     "layer2.texture": "ayu/assets/separator-right.png",
-    "layer2.tint": [133, 136, 140],
-    "layer2.opacity": 0.2,
-    "layer2.inner_margin" : [0, 1, 2, 1]
+    "layer2.tint": [237, 237, 237],
+    "layer2.opacity": 1,
+    "layer2.inner_margin": [0, 1, 2, 1]
   },
 
   {
     "class": "scroll_tabs_right_button",
     "attributes": ["hover"],
-    "layer0.tint": [255, 106, 0]
+    "layer0.tint": [255, 143, 64]
   },
 
   {
     "class": "show_tabs_dropdown_button",
     "content_margin": [12, 12],
     "layer0.texture": "ayu/assets/overflow-menu.png",
-    "layer0.tint": [135, 143, 153],
+    "layer0.tint": [194, 197, 200],
     "layer0.opacity": 1.0,
     "layer0.inner_margin": [0, 0]
   },
@@ -578,7 +540,7 @@
   {
     "class": "show_tabs_dropdown_button",
     "attributes": ["hover"],
-    "layer0.tint": [255, 106, 0]
+    "layer0.tint": [255, 143, 64]
   },
 
 
@@ -588,7 +550,7 @@
 
   {
     "class": "sidebar_container",
-    "content_margin": [0, 4, 0, 0],
+    "content_margin": [0, 6, 0, 0],
     "layer0.opacity": 1,
     "layer0.tint": [250, 250, 250]
   },
@@ -597,32 +559,23 @@
     "settings": ["ui_separator"],
     "layer1.texture": "ayu/assets/separator-right.png",
     "layer1.inner_margin": [0, 1, 2, 1],
-    "layer1.opacity": 0.2,
-    "layer1.tint": [133, 136, 140]
-  },
-  {
-    "class": "sidebar_container",
-    "platforms": ["osx"],
-    "settings": ["ui_separator", "!ui_native_titlebar"],
-    "layer2.opacity": 0.2,
-    "layer2.texture": "ayu/assets/separator-top.png",
-    "layer2.tint": [133, 136, 140],
-    "layer2.inner_margin": [1, 2, 1, 0]
+    "layer1.opacity": 1,
+    "layer1.tint": [237, 237, 237],
   },
+
   {
     "class": "sidebar_tree",
     "indent_top_level": false,
     "row_padding": [20, 6],
     "dark_content": false,
     "spacer_rows": true,
-    "indent_offset": 0,
-    "indent": 12
+    "indent_offset": 2,
+    "indent": 10
   },
 
   {
     "class": "sidebar_heading",
-    "color": [133, 136, 140],
-    "font.face": "Roboto mono",
+    "color": [194, 197, 200],
     "font.bold": true,
     "font.size": 11
   },
@@ -633,34 +586,33 @@
   },
   {
     "class": "sidebar_heading",
-    "settings": ["ui_font_default"],
-    "font.face": ""
+    "settings": ["ui_font_roboto_mono"],
+    "font.face": "Roboto mono"
   },
 
   {
     "class": "tree_row",
-    "layer1.texture": "ayu/assets/tree-highlight.png",
-    "layer1.tint": [133, 136, 140, 50],
-    "layer1.inner_margin": [8, 4, 8, 4],
-    "layer1.opacity": 0
+    "layer0.texture": "ayu/assets/tree-highlight.png",
+    "layer0.tint": [237, 237, 237],
+    "layer0.inner_margin": [8, 4, 8, 4],
+    "layer0.opacity": 0
   },
 
   {
     "class": "tree_row",
-    "layer1.texture": "ayu/assets/tree-highlight-separators.png",
+    "layer0.texture": "ayu/assets/tree-highlight-separators.png",
     "settings": ["ui_separator"]
   },
 
   {
     "class": "tree_row",
     "attributes": ["selected"],
-    "layer1.opacity": 1
+    "layer0.opacity": 1
   },
 
   {
     "class": "sidebar_label",
-    "color": [133, 136, 140],
-    "font.face": "Roboto mono",
+    "color": [157, 162, 166],
     "font.size": 12
   },
   {
@@ -670,26 +622,26 @@
   },
   {
     "class": "sidebar_label",
-    "settings": ["ui_font_default"],
-    "font.face": ""
+    "settings": ["ui_font_roboto_mono"],
+    "font.face": "Roboto mono"
   },
 
   {
     "class": "sidebar_label",
     "parents": [{"class": "tree_row","attributes": ["hover"]}],
-    "color": [110, 117, 128]
+    "color": [97, 103, 108]
   },
 
   {
     "class": "sidebar_label",
     "parents": [{"class": "tree_row","attributes": ["selected"]}],
-    "color": [110, 117, 128]
+    "color": [97, 103, 108]
   },
 
   {
     "class": "sidebar_label",
     "parents": [{"class": "tree_row","attributes": ["expandable"]}],
-    "color": [133, 136, 140],
+    "color": [157, 162, 166],
     "font.bold": false
   },
 
@@ -703,13 +655,13 @@
   {
     "class": "sidebar_label",
     "parents": [{"class": "tree_row", "attributes": ["expandable", "hover"]}],
-    "color": [110, 117, 128]
+    "color": [97, 103, 108]
   },
 
   {
     "class": "sidebar_label",
     "parents": [{"class": "tree_row", "attributes": ["expanded"]}],
-    "color": [110, 117, 128]
+    "color": [97, 103, 108]
   },
 
   {
@@ -722,7 +674,7 @@
   // {
   //  "class": "sidebar_label",
   //  "parents": [{"class": "tree_row", "attributes": ["expanded", "selected"]}],
-  //  "color": [110, 117, 128]
+  //  "color": [97, 103, 108]
   // },
 
   {
@@ -745,11 +697,11 @@
     "layer0.opacity": 0,
 
     "layer1.texture": "ayu/assets/folder.png",
-    "layer1.tint": [135, 143, 153],
+    "layer1.tint": [194, 197, 200],
     "layer1.opacity": 1,
 
     "layer2.texture": "ayu/assets/folder-open.png",
-    "layer2.tint": [255, 106, 0],
+    "layer2.tint": [255, 143, 64],
     "layer2.opacity": 0.0
   },
 
@@ -763,7 +715,7 @@
   {
     "class": "icon_folder",
     "parents": [{ "class": "tree_row", "attributes": ["hover"] }],
-    "layer1.tint": [255, 106, 0]
+    "layer1.tint": [255, 143, 64]
   },
 
   {
@@ -795,7 +747,7 @@
   {
     "class": "icon_folder",
     "parents": [{ "class": "tree_row", "attributes": ["selected"] }],
-    "layer1.tint": [255, 106, 0]
+    "layer1.tint": [255, 143, 64]
   },
 
   {
@@ -818,7 +770,7 @@
       "loop": true,
       "frame_time": 0.075
     },
-    "layer1.tint": [255, 106, 0],
+    "layer1.tint": [255, 143, 64],
 
     "layer0.opacity": 0.0,
     "content_margin": [8, 8]
@@ -829,24 +781,24 @@
     "class": "icon_folder_dup",
     "content_margin": [9, 9],
     "layer0.texture": "ayu/assets/folder.png",
-    "layer0.tint": [135, 143, 153],
+    "layer0.tint": [194, 197, 200],
     "layer0.opacity": 1.0,
 
     "layer1.texture": "ayu/assets/folder-symlink.png",
-    "layer1.tint": [133, 136, 140],
+    "layer1.tint": [157, 162, 166],
     "layer1.opacity": 0.3
   },
 
   {
     "class": "icon_folder_dup",
     "parents": [{ "class": "tree_row", "attributes": ["hover"]}],
-    "layer0.tint": [255, 106, 0]
+    "layer0.tint": [255, 143, 64]
   },
 
   {
     "class": "icon_folder_dup",
     "parents": [{"class": "tree_row", "attributes": ["expanded"] }],
-    "layer0.tint": [255, 106, 0]
+    "layer0.tint": [255, 143, 64]
   },
 
   // Hidden arrow icon before folder
@@ -859,13 +811,13 @@
   // Opened files
   {
     "class": "close_button",
-    "content_margin": [8, 8],
+    "content_margin": [6, 8],
 
   // Default Close icon
     "layer0.texture": "ayu/assets/close.png",
     "layer0.opacity": 0,
     "layer0.inner_margin": [0, 0],
-    "layer0.tint": [133, 136, 140]
+    "layer0.tint": [157, 162, 166]
   },
 
 
@@ -874,15 +826,14 @@
   {
     "class": "close_button",
     "parents": [{ "class": "tree_row", "attributes": ["hover"] }],
-  // Default Close icon
-    "layer0.opacity": 0.6
+    "layer0.opacity": 1
   },
 
   {
     "class": "close_button",
     "attributes": ["dirty"],
     "layer0.texture": "ayu/assets/dirty.png",
-    "layer0.tint": [133, 136, 140],
+    "layer0.tint": [157, 162, 166],
     "layer0.opacity": 1.0
   },
 
@@ -890,7 +841,7 @@
     "class": "close_button",
     "attributes": ["hover"],
     "layer0.opacity": 1.0,
-    "layer0.tint": [255, 106, 0]
+    "layer0.tint": [255, 143, 64]
   },
 
 
@@ -903,7 +854,7 @@
     "layer0.opacity": 1.0,
 
     "layer1.texture": "ayu/assets/scrollbar-vertical-wide.png",
-    "layer1.tint": [133, 136, 140],
+    "layer1.tint": [157, 162, 166],
     "layer1.opacity": 0.1,
     "layer1.inner_margin": [0, 10],
     "blur": false
@@ -929,7 +880,7 @@
   {
     "class": "puck_control",
     "layer0.texture": "ayu/assets/scrollbar-vertical-wide.png",
-    "layer0.tint": [133, 136, 140],
+    "layer0.tint": [157, 162, 166],
     "layer0.opacity": 0.3,
     "layer0.inner_margin": [0, 10],
     "content_margin": [6, 12],
@@ -1017,14 +968,14 @@
   {
     "class": "minimap_control",
     "settings": ["always_show_minimap_viewport"],
-    "viewport_color": [130, 140, 153],
+    "viewport_color": [225, 225, 225],
     "viewport_opacity": 0.2
   },
 
   {
     "class": "minimap_control",
     "settings": ["!always_show_minimap_viewport"],
-    "viewport_color": [130, 140, 153],
+    "viewport_color": [225, 225, 225],
     "viewport_opacity": { "target": 0, "speed": 4.0, "interpolation": "smoothstep" }
   },
 
@@ -1044,11 +995,10 @@
 
   {
     "class": "label_control",
-    "color": [133, 136, 140],
+    "color": [157, 162, 166],
     "shadow_color": [0, 0, 0, 0],
     "shadow_offset": [0, 0],
     "font.bold": false,
-    "font.face": "Roboto mono",
     "font.size": 12
   },
   {
@@ -1058,8 +1008,8 @@
   },
   {
     "class": "label_control",
-    "settings": ["ui_font_default"],
-    "font.face": ""
+    "settings": ["ui_font_roboto_mono"],
+    "font.face": "Roboto mono"
   },
 
   // Status bar labels
@@ -1067,7 +1017,7 @@
   {
     "class": "label_control",
     "parents": [{"class": "status_bar"}],
-    "color": [133, 136, 140],
+    "color": [157, 162, 166],
     "font.bold": false
   },
 
@@ -1079,14 +1029,15 @@
     "layer0.tint": [250, 250, 250],
     "layer0.opacity": 1,
     "layer1.texture": "ayu/assets/separator-top.png",
+    "layer1.tint": [237, 237, 237],
     "layer1.inner_margin": [1, 2, 1, 0],
-    "content_margin": [10, 0]
+    "content_margin": [16, 3]
   },
   {
     "class": "status_bar",
     "settings": ["ui_separator"],
-    "layer0.tint": [255, 255, 255]
-    // "layer1.opacity": 0.2
+    // "layer0.tint": [255, 255, 255],
+    // "layer1.opacity": 1
   },
 
   {
@@ -1102,14 +1053,14 @@
   {
     "class": "panel_button_control",
     "layer0.texture": "ayu/assets/switch-panel.png",
-    "layer0.tint": [133, 136, 140],
+    "layer0.tint": [157, 162, 166],
     "layer0.opacity": 1.0
   },
 
   {
     "class": "panel_button_control",
     "attributes": ["hover"],
-    "layer0.tint": [255, 106, 0]
+    "layer0.tint": [255, 143, 64]
   },
 
   /* WIDGET PANEL
@@ -1127,11 +1078,11 @@
   {
     "class": "panel_control",
     "settings": ["ui_separator"],
-    "layer0.tint": [255, 255, 255],
+    // "layer0.tint": [255, 255, 255],
     "layer1.texture": "ayu/assets/separator-top.png",
-    "layer1.tint": [133, 136, 140],
+    "layer1.tint": [237, 237, 237],
     "layer1.inner_margin": [1, 2, 1, 0],
-    "layer1.opacity": 0.2
+    "layer1.opacity": 1
   },
 
   // Status bar panel close icon
@@ -1140,13 +1091,13 @@
     "class": "panel_close_button",
     "layer0.texture": "ayu/assets/close.png",
     "layer0.opacity": 1.0,
-    "layer0.tint": [133, 136, 140],
+    "layer0.tint": [157, 162, 166],
     "content_margin": [0, 0] // 8,8 to show
   },
   {
     "class": "panel_close_button",
     "attributes": ["hover"],
-    "layer0.tint": [255, 106, 0]
+    "layer0.tint": [255, 143, 64]
   },
 
   // Texline input
@@ -1159,9 +1110,9 @@
     "layer0.tint": [255, 255, 255],
 
     "layer1.texture": "ayu/assets/input-border.png",
-    "layer1.opacity": 0.2,
+    "layer1.opacity": 1,
     "layer1.inner_margin": [10, 8],
-    "layer1.tint": [133, 136, 140],
+    "layer1.tint": [237, 237, 237],
     "content_margin": [10, 7, 10, 5]
   },
 
@@ -1175,9 +1126,9 @@
     "layer0.opacity": 0,
     "layer1.texture": "ayu/assets/input-search.png",
     "layer1.opacity": 1,
-    "layer1.tint": [255, 106, 0],
-    "layer1.inner_margin": [35, 0, 0, 0],
-    "content_margin": [43, 7, 10, 4]
+    "layer1.tint": [157, 162, 166, 100],
+    "layer1.inner_margin": [60, 0, 0, 0],
+    "content_margin": [50, 7, 10, 4]
   },
 
   // Textline input oveflow menu
@@ -1185,13 +1136,13 @@
     "class": "dropdown_button_control",
     "content_margin": [12, 12],
     "layer0.texture": "ayu/assets/overflow-menu.png",
-    "layer0.tint": [135, 143, 153],
+    "layer0.tint": [194, 197, 200],
     "layer0.opacity": 1.0
   },
   {
     "class": "dropdown_button_control",
     "attributes": ["hover"],
-    "layer0.tint": [255, 106, 0]
+    "layer0.tint": [255, 143, 64]
   },
 
 
@@ -1206,7 +1157,7 @@
     "class": "button_control",
     "content_margin": [15, 9, 15, 10],
     "min_size": [60, 0],
-    "layer0.tint": [255, 106, 0, 10],
+    "layer0.tint": [255, 143, 64, 10],
     "layer0.texture": "ayu/assets/input-bg.png",
     "layer0.inner_margin": [10, 8],
     "layer0.opacity": 0
@@ -1220,13 +1171,13 @@
   {
     "class": "label_control",
     "parents": [{"class": "button_control"}],
-    "color":  [133, 136, 140]
+    "color":  [157, 162, 166]
   },
 
   {
     "class": "label_control",
     "parents": [{"class": "button_control", "attributes": ["hover"]}],
-    "color":  [255, 106, 0]
+    "color":  [255, 143, 64]
   },
 
   // Small Icon Buttons
@@ -1234,7 +1185,7 @@
     "class": "icon_button_control",
     "layer0.tint": [0, 0, 0],
     "layer0.opacity": 0,
-    "layer2.tint": [110, 117, 128],
+    "layer2.tint": [97, 103, 108],
     "layer2.opacity": { "target": 0.0, "speed": 10.0, "interpolation": "smoothstep" },
     "content_margin": [10, 5]
   },
@@ -1247,7 +1198,7 @@
   {
     "class": "icon_regex",
     "layer0.texture": "ayu/assets/regex.png",
-    "layer0.tint": [133, 136, 140],
+    "layer0.tint": [157, 162, 166],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1255,7 +1206,7 @@
   {
     "class": "icon_regex",
     "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [255, 106, 0]
+    "layer0.tint": [255, 143, 64]
   },
 
   // Preserve case sensitive
@@ -1263,7 +1214,7 @@
   {
     "class": "icon_case",
     "layer0.texture": "ayu/assets/matchcase.png",
-    "layer0.tint": [133, 136, 140],
+    "layer0.tint": [157, 162, 166],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1271,7 +1222,7 @@
   {
     "class": "icon_case",
     "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [255, 106, 0]
+    "layer0.tint": [255, 143, 64]
   },
 
   // Wholeword
@@ -1279,7 +1230,7 @@
   {
     "class": "icon_whole_word",
     "layer0.texture": "ayu/assets/word.png",
-    "layer0.tint": [133, 136, 140],
+    "layer0.tint": [157, 162, 166],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1287,7 +1238,7 @@
   {
     "class": "icon_whole_word",
     "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [255, 106, 0]
+    "layer0.tint": [255, 143, 64]
   },
 
   // Wrap
@@ -1295,7 +1246,7 @@
   {
     "class": "icon_wrap",
     "layer0.texture": "ayu/assets/wrap.png",
-    "layer0.tint": [133, 136, 140],
+    "layer0.tint": [157, 162, 166],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1303,7 +1254,7 @@
   {
     "class": "icon_wrap",
     "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [255, 106, 0]
+    "layer0.tint": [255, 143, 64]
   },
 
   // In selection
@@ -1311,7 +1262,7 @@
   {
     "class": "icon_in_selection",
     "layer0.texture": "ayu/assets/inselection.png",
-    "layer0.tint": [133, 136, 140],
+    "layer0.tint": [157, 162, 166],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1319,7 +1270,7 @@
   {
     "class": "icon_in_selection",
     "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [255, 106, 0]
+    "layer0.tint": [255, 143, 64]
   },
 
   // Highlight Result
@@ -1327,7 +1278,7 @@
   {
     "class": "icon_highlight",
     "layer0.texture": "ayu/assets/highlight.png",
-    "layer0.tint": [133, 136, 140],
+    "layer0.tint": [157, 162, 166],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1335,7 +1286,7 @@
   {
     "class": "icon_highlight",
     "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [255, 106, 0]
+    "layer0.tint": [255, 143, 64]
   },
 
   // Preserve Case
@@ -1343,7 +1294,7 @@
   {
     "class": "icon_preserve_case",
     "layer0.texture": "ayu/assets/replace-preserve-case.png",
-    "layer0.tint": [133, 136, 140],
+    "layer0.tint": [157, 162, 166],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1351,7 +1302,7 @@
   {
     "class": "icon_preserve_case",
     "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [255, 106, 0]
+    "layer0.tint": [255, 143, 64]
   },
 
   // Show context
@@ -1359,7 +1310,7 @@
   {
     "class": "icon_context",
     "layer0.texture": "ayu/assets/context.png",
-    "layer0.tint": [133, 136, 140],
+    "layer0.tint": [157, 162, 166],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1368,7 +1319,7 @@
   {
     "class": "icon_context",
     "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [255, 106, 0]
+    "layer0.tint": [255, 143, 64]
   },
 
   // Use buffer
@@ -1376,7 +1327,7 @@
   {
     "class": "icon_use_buffer",
     "layer0.texture": "ayu/assets/buffer.png",
-    "layer0.tint": [133, 136, 140],
+    "layer0.tint": [157, 162, 166],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1384,7 +1335,7 @@
   {
     "class": "icon_use_buffer",
     "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [255, 106, 0]
+    "layer0.tint": [255, 143, 64]
   },
 
   // Reverse direction
@@ -1392,7 +1343,7 @@
   {
     "class": "icon_reverse",
     "layer0.texture": "ayu/assets/reverse.png",
-    "layer0.tint": [133, 136, 140],
+    "layer0.tint": [157, 162, 166],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1400,7 +1351,7 @@
   {
     "class": "icon_reverse",
     "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [255, 106, 0]
+    "layer0.tint": [255, 143, 64]
   },
 
   /* Title bar
@@ -1408,7 +1359,7 @@
   {
     "class": "title_bar",
     "bg": [250, 250, 250],
-    "fg": [110, 117, 128]
+    "fg": [97, 103, 108]
   },
   {
     "class": "title_bar",
diff --git a/ayu-light.tmTheme b/ayu-light.tmTheme
index e864b2b7..e25216f8 100644
--- a/ayu-light.tmTheme
+++ b/ayu-light.tmTheme
@@ -16,37 +16,37 @@
 			<key>settings</key>
 			<dict>
 				<key>accent</key>
-				<string>#FF6A00</string>
+				<string>#FF8F40</string>
 				<key>activeGuide</key>
-				<string>#B3B2B1</string>
+				<string>#B9BCBF</string>
 				<key>background</key>
 				<string>#FAFAFA</string>
 				<key>caret</key>
-				<string>#FF6A00</string>
+				<string>#FF8F40</string>
 				<key>findHighlight</key>
-				<string>#A37ACC</string>
+				<string>#FF8F40</string>
 				<key>findHighlightForeground</key>
 				<string>#FAFAFA</string>
 				<key>foreground</key>
-				<string>#6E7580</string>
+				<string>#61676C</string>
 				<key>guide</key>
-				<string>#D9D8D7</string>
+				<string>#DEE0E1</string>
 				<key>gutter</key>
 				<string>#FAFAFA</string>
 				<key>gutterForeground</key>
-				<string>#D9D8D7</string>
+				<string>#D9DBDD</string>
 				<key>inactiveBackground</key>
 				<string>#FAFAFA</string>
 				<key>inactiveSelection</key>
-				<string>#F0EEE488</string>
+				<string>#ECF4F9</string>
 				<key>invisibles</key>
-				<string>#D9D8D7</string>
+				<string>#D9DBDD</string>
 				<key>lineHighlight</key>
-				<string>#F2F2F2</string>
+				<string>#F3F3F3</string>
 				<key>popupCss</key>
 				<string>html, body {
   background-color: #FFFFFF;
-  color: #6E7580;
+  color: #61676C;
 }
 body {
   padding: 1px 3px;
@@ -56,13 +56,13 @@ a {
 }
 </string>
 				<key>selection</key>
-				<string>#F0EEE4</string>
+				<string>#E9F2F8</string>
 				<key>selectionBorder</key>
-				<string>#F0EEE4</string>
+				<string>#E3EFF8</string>
 				<key>shadow</key>
 				<string>#00000010</string>
 				<key>stackGuide</key>
-				<string>#DEDDDC</string>
+				<string>#DEE0E1</string>
 			</dict>
 		</dict>
 		<dict>
@@ -86,7 +86,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#6E7580</string>
+				<string>#61676C</string>
 			</dict>
 		</dict>
 		<dict>
@@ -108,7 +108,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#A37ACC</string>
+				<string>#FF8F40</string>
 			</dict>
 		</dict>
 		<dict>
@@ -130,7 +130,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#A37ACC</string>
+				<string>#FF8F40</string>
 			</dict>
 		</dict>
 		<dict>
@@ -141,7 +141,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#A37ACC</string>
+				<string>#FF8F40</string>
 			</dict>
 		</dict>
 		<dict>
@@ -185,7 +185,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#6E7580CC</string>
+				<string>#61676CCC</string>
 			</dict>
 		</dict>
 		<dict>
@@ -196,7 +196,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#6E7580</string>
+				<string>#61676C</string>
 			</dict>
 		</dict>
 		<dict>
@@ -218,7 +218,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#6E7580CC</string>
+				<string>#61676CCC</string>
 			</dict>
 		</dict>
 		<dict>
@@ -297,7 +297,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#A37ACC</string>
+				<string>#FF8F40</string>
 			</dict>
 		</dict>
 		<dict>
@@ -698,7 +698,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#6E758007</string>
+				<string>#61676C07</string>
 			</dict>
 		</dict>
 		<dict>
@@ -709,7 +709,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#6E758010</string>
+				<string>#61676C10</string>
 			</dict>
 		</dict>
 		<dict>
@@ -720,7 +720,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#6E758010</string>
+				<string>#61676C10</string>
 				<key>fontStyle</key>
 				<string>bold</string>
 				<key>foreground</key>
@@ -737,7 +737,7 @@ a {
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
-				<string>#A37ACC</string>
+				<string>#FF8F40</string>
 			</dict>
 		</dict>
 		<dict>
@@ -781,7 +781,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#F51818</string>
+				<string>#F07171</string>
 			</dict>
 		</dict>
 		<dict>
@@ -803,7 +803,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#6E758010</string>
+				<string>#61676C10</string>
 				<key>foreground</key>
 				<string>#55B4D4</string>
 			</dict>
@@ -838,9 +838,9 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#6E758010</string>
+				<string>#61676C10</string>
 				<key>foreground</key>
-				<string>#6E7580</string>
+				<string>#61676C</string>
 			</dict>
 		</dict>
 		<dict>
@@ -851,7 +851,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#6E758010</string>
+				<string>#61676C10</string>
 				<key>foreground</key>
 				<string>#ABB0B6</string>
 			</dict>
@@ -908,7 +908,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#ABB0B6</string>
+				<string>#DEE0E1</string>
 			</dict>
 		</dict>
 		<dict>
@@ -919,7 +919,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#ABB0B6</string>
+				<string>#DEE0E1</string>
 			</dict>
 		</dict>
 		<dict>
diff --git a/ayu-light2.sublime-theme b/ayu-light2.sublime-theme
deleted file mode 100644
index b92cee31..00000000
--- a/ayu-light2.sublime-theme
+++ /dev/null
@@ -1,1280 +0,0 @@
-// prefix=""
-// sublime="2"
-// ext="sublime-theme"
-[
-
-  /* @ EMPTY WINDOW
-  * Style for empty (no tabs) window
-  ========================================================================= */
-
-  {
-    "class" : "sheet_container_control",
-    "layer0.tint" : [250, 250, 250],
-    "layer0.opacity" : 1.0
-  },
-
-
-  /* @ GRID LAYOUT
-  * Grid style
-  ========================================================================= */
-
-  {
-    "class": "grid_layout_control",
-    "border_size": 0,
-    "border_color": [226, 228, 231]
-  },
-  {
-    "class": "grid_layout_control",
-    "settings": ["ui_separator"],
-    "border_size": 1
-  },
-
-  /* @ DIALOG POPUP
-  * Dialog popup style and progressbar
-  ========================================================================= */
-  // !!!
-  {
-    "class": "progress_gauge_control",
-    "layer0.tint": [255, 106, 0],
-    "layer0.opacity": 1.0,
-    "content_margin": [0, 6]
-  },
-
-  {
-    "class": "dialog",
-    "layer0.tint": [250, 250, 250],
-    "layer0.opacity": 1.0
-  },
-
-  {
-    "class": "progress_bar_control",
-    "layer0.tint": [250, 250, 250],
-    "layer0.opacity": 1.0
-  },
-
-
-  /* @ CODE FOLDING
-  * Folding arrow setting and behavioring
-  ========================================================================= */
-  {
-    "class": "fold_button_control",
-    "layer0.texture": "ayu/assets/unfold.png",
-    "layer0.opacity": 1.0,
-    "layer0.inner_margin": 0,
-    "layer0.tint": [133, 136, 140],
-    "content_margin": [8, 6, 8, 6]
-  },
-
-  {
-    "class": "fold_button_control",
-    "attributes": ["hover"],
-    "layer0.tint": [255, 106, 0]
-  },
-
-  {
-    "class": "fold_button_control",
-    "attributes": ["expanded"],
-    "layer0.texture": "ayu/assets/fold.png"
-  },
-
-
-  /* @ AUTOCOMPLETE
-  * Autocomplete popup setting and behavioring
-  ========================================================================= */
-
-  {
-    "class": "popup_control",
-    "layer0.tint": [255, 255, 255],
-    "layer0.opacity": 1.0,
-    "content_margin": [0, 0]
-  },
-
-  {
-    "class": "auto_complete",
-    "row_padding": [12, 6],
-    "layer0.tint": [255, 255, 255],
-    "layer0.opacity": 1.0
-  },
-
-  {
-    "class": "auto_complete_label",
-    "fg": [133, 136, 140],
-    "match_fg": [255, 106, 0],
-    "selected_fg": [110, 117, 128],
-    "selected_match_fg": [255, 106, 0]
-  },
-
-  {
-    "class": "table_row",
-    "layer0.tint": [245, 245, 245],
-    "layer0.opacity": 0.0
-  },
-
-  {
-    "class": "table_row",
-    "attributes": ["selected"],
-    "layer0.opacity": 1.0
-  },
-
-
-  /* @ TOOLTIP
-  * Tooltip setting and behavioring
-  ========================================================================= */
-
-  {
-    "class": "tool_tip_control",
-    "layer0.tint": [250, 250, 250],
-    "layer0.inner_margin": [0, 0],
-    "layer0.opacity": 1.0,
-    "content_margin": [10, 6]
-  },
-
-  {
-    "class": "tool_tip_label_control",
-    "color": [133, 136, 140],
-    "font.face": "Roboto mono",
-    "font.size": 12
-  },
-  {
-    "class": "tool_tip_label_control",
-    "settings": ["ui_font_source_code_pro"],
-    "font.face": "Source Code Pro"
-  },
-  {
-    "class": "tool_tip_label_control",
-    "settings": ["ui_font_default"],
-    "font.face": ""
-  },
-
-  /* @OVERLAY PANELS
-  * Overlay panels setting and behavioring
-  ========================================================================= */
-
-  // Command Panel
-  {
-    "class": "overlay_control",
-    "layer0.texture": "ayu/assets/overlay-shadow.png",
-    "layer0.inner_margin": [25, 45, 25, 35],
-    "layer0.opacity": 1.0,
-    "layer0.tint": [126, 132, 140],
-
-    "layer1.texture": "ayu/assets/overlay-bg.png",
-    "layer1.inner_margin": [25, 45, 25, 35],
-    "layer1.opacity": 1.0,
-    "layer1.tint": [255, 255, 255],
-
-    "content_margin": [20, 45, 20, 35]
-  },
-
-  // Command Panel list item style (cmd + shift + p)
-
-  {
-    "class": "mini_quick_panel_row",
-    "layer0.tint": [250, 250, 250, 0],
-    "layer0.inner_margin": [2, 2, 2, 2],
-    "layer0.opacity": 1.0
-  },
-
-  // Command Panel selected list item style (cmd + p)
-
-  {
-    "class": "mini_quick_panel_row",
-    "attributes": ["selected"],
-    "layer0.tint": [245, 245, 245]
-  },
-
-  // Quick panel project setting (project manager) (cmd + ctrl + p)
-
-  {
-    "class": "quick_panel",
-    "row_padding": [32, 12],
-    "layer0.tint": [255, 255, 255],
-    "layer0.opacity": 1.0
-  },
-
-  // Quick Panel row default style (project manager)
-
-  {
-    "class": "quick_panel_row",
-    "layer0.texture": "",
-    "layer0.tint": [255, 255, 255],
-    "layer0.inner_margin": 0,
-    "layer0.opacity": 1.0
-  },
-
-  // Row panel style inside comman panel (cmd + shift + p)
-
-  {
-    "class": "quick_panel_row",
-    "parents": [{"class": "overlay_control"}],
-    "layer0.tint": [255, 255, 255],
-    "layer0.opacity": 1.0
-  },
-
-  // Quick panel (project) style inside overlay_control (cmd + shift + p)
-
-  {
-    "class": "quick_panel",
-    "parents": [{"class": "overlay_control"}],
-    "row_padding": [10, 7],
-    "layer0.tint": [255, 255, 255],
-    "layer0.opacity": 1.0
-  },
-
-  // Quick Panel selected list item style
-
-  {
-    "class": "quick_panel_row",
-    "attributes": ["selected"],
-    "layer0.tint": [245, 245, 245]
-  },
-
-  // Panel labels
-
-  {
-    "class": "quick_panel_label",
-    "fg": [133, 136, 140],
-    "match_fg": [255, 106, 0],
-    "selected_fg": [110, 117, 128],
-    "selected_match_fg": [255, 106, 0]
-  },
-
-  // Panel labels
-
-  {
-    "class": "quick_panel_label",
-    "parents": [{"class": "overlay_control"}],
-    "fg": [133, 136, 140],
-    "match_fg": [255, 106, 0],
-    "selected_fg": [110, 117, 128],
-    "selected_match_fg": [255, 106, 0]
-  },
-
-  // Panels sublabels
-
-  {
-    "class": "quick_panel_path_label",
-    "fg": [149, 156, 166],
-    "match_fg": [110, 117, 128],
-    "selected_fg": [133, 136, 140],
-    "selected_match_fg": [110, 117, 128]
-  },
-
-  // Panels data / score
-
-  {
-    "class": "quick_panel_score_label",
-    "fg": [133, 136, 140],
-    "selected_fg": [133, 136, 140]
-  },
-
-
-
-  /* @ TABS
-  * Tabs settings and behavioring
-  ========================================================================= */
-
-  {
-    "class": "tabset_control",
-    "tab_overlap": 0,
-    "tab_width": 50,
-    "tab_min_width": 50,
-    "tab_height": 30,
-    "mouse_wheel_switch": false,
-
-    "layer0.opacity": 1.0,
-    "layer0.tint": [250, 250, 250],
-    "content_margin": [10, 0]
-  },
-  {
-    "class": "tabset_control",
-    "settings": ["mouse_wheel_switches_tabs", "!enable_tab_scrolling"],
-    "mouse_wheel_switch": true
-  },
-  {
-    "class": "tabset_control",
-    "settings": ["ui_separator"],
-    "content_margin": [0, 0, 0, 0],
-    "layer1.opacity": 0.2,
-    "layer1.texture": "ayu/assets/separator-bottom.png",
-    "layer1.tint": [133, 136, 140],
-    "layer1.inner_margin": [1, 0, 1, 2]
-  },
-  {
-    "class": "tabset_control",
-    "settings": ["ui_big_tabs"],
-    "tab_height": 44
-  },
-
-  // Tabs
-  {
-    "class": "tab_control",
-
-    "layer0.tint": [250, 250, 250],
-    "layer0.opacity": 1.0,
-
-    "layer1.texture": "",
-
-    "layer2.texture": "ayu/assets/separator-bottom.png",
-    "layer2.tint": [255, 106, 0],
-    "layer2.inner_margin": [1, 0, 1, 2],
-    "layer2.opacity": 0.0,
-
-    "layer3.texture": "",
-
-    "content_margin": [10, -2, 10, 0],
-    "max_margin_trim": 12
-  },
-  {
-    "class": "tab_control",
-    "settings": ["ui_separator"],
-
-    "layer1.texture": "ayu/assets/separator-right.png",
-    "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": [133, 136, 140],
-    "layer3.inner_margin": [1, 0, 1, 2],
-    "layer3.opacity": 0.2
-  },
-  {
-    "class": "tab_control",
-    "settings": ["ui_big_tabs"],
-    "content_margin": [15, -2, 15, 0]
-  },
-
-  // Selected current tab
-
-  {
-    "class": "tab_control", "attributes": ["selected"],
-    "layer2.opacity": 1.0,
-    "layer3.opacity": 0.0
-  },
-
-  // Hovered current tab
-
-  {
-    "class": "tab_control", "attributes": ["hover"],
-    "layer2.opacity": 0.3
-  },
-
-  // Selected current tab
-
-  {
-    "class": "tab_control", "attributes": ["selected","hover"],
-    "layer2.opacity": 1.0
-  },
-
-  // Tab Labels
-
-  {
-    "class": "tab_label",
-    "fg": [250, 250, 250, 0],
-    "shadow_color": [133, 136, 140],
-    "shadow_offset": [0, -1],
-    "font.size": 12,
-    "font.italic": false,
-    "font.bold": false,
-    "font.face": "Roboto mono"
-  },
-  {
-    "class": "tab_label",
-    "settings": ["ui_font_source_code_pro"],
-    "font.face": "Source Code Pro"
-  },
-  {
-    "class": "tab_label",
-    "settings": ["ui_font_default"],
-    "font.face": ""
-  },
-  {
-    "class": "tab_label",
-    "fg": [133, 136, 140],
-    "settings": ["ui_fix_tab_labels"],
-    "shadow_color": [250, 250, 250, 0],
-    "shadow_offset": [0, 0]
-  },
-
-  // Tab selected label color
-
-  {
-    "class": "tab_label",
-    "parents": [{"class": "tab_control", "attributes": ["selected"]}],
-    "fg": [250, 250, 250, 0],
-    "shadow_color": [110, 117, 128],
-    "shadow_offset": [0, -1]
-  },
-  {
-    "class": "tab_label",
-    "settings": ["ui_fix_tab_labels"],
-    "parents": [{"class": "tab_control", "attributes": ["selected"]}],
-    "fg": [110, 117, 128],
-    "shadow_color": [250, 250, 250, 0],
-    "shadow_offset": [0, 0]
-  },
-
-  {
-    "class": "tab_label",
-    "attributes": ["transient"],
-    "font.italic": true
-  },
-
-  // Tab Close Buttons
-  {
-    "class": "tab_close_button",
-    "content_margin": [0, 0],
-
-  // Close Icon
-    "layer0.texture": "ayu/assets/close.png",
-    "layer0.tint": [133, 136, 140],
-    "layer0.opacity": 1.0,
-
-  // Dirty Icon
-    "layer1.texture": "ayu/assets/dirty.png",
-    "layer1.tint": [133, 136, 140],
-    "layer1.opacity": 0
-  },
-
-  // Default
-  {
-    "class": "tab_close_button",
-    "settings": ["show_tab_close_buttons"],
-    "content_margin": [8, 8]
-  },
-
-  // Default hover
-  {
-    "class": "tab_close_button",
-    "settings": ["show_tab_close_buttons"],
-    "attributes": ["hover"],
-    "layer0.tint": [255, 106, 0]
-  },
-
-  // Dirty tab
-  {
-    "class": "tab_close_button",
-    "parents": [{"class": "tab_control", "attributes": ["dirty"]}],
-    "layer0.opacity": 0, // Close Icon
-    "layer1.opacity": 1.0, // dirty Icon
-    "content_margin": [8, 8]
-  },
-
-  // Dirty tab on hover
-  {
-    "class": "tab_close_button",
-    "parents": [{"class": "tab_control", "attributes": ["dirty"]}],
-    "attributes": ["hover"],
-    "layer0.opacity": 1.0, // Close Icon
-    "layer1.opacity": 0 // Close Icon
-  },
-
-  // Selected dirty tab
-  {
-    "class": "tab_close_button",
-    "parents": [{"class": "tab_control", "attributes": ["selected", "dirty"]}],
-    "layer0.opacity": 0, // Close Icon
-    "layer1.opacity": 1.0, // Dirty Icon
-    "layer1.tint": [255, 106, 0]
-  },
-
-  // Selected dirty tab on hover
-  {
-    "class": "tab_close_button",
-    "parents": [{"class": "tab_control", "attributes": ["selected", "dirty"]}],
-    "attributes": ["hover"],
-    "layer0.opacity": 1.0,
-    "layer1.opacity": 0
-  },
-  // tab set scroll left | scroll right
-  {
-    "class": "scroll_tabs_left_button",
-    "content_margin": [12, 15],
-    "layer0.texture": "ayu/assets/arrow-left.png",
-    "layer0.tint": [135, 143, 153],
-    "layer0.opacity": 1.0
-  },
-
-  {
-    "class": "scroll_tabs_left_button",
-    "attributes": ["hover"],
-    "layer0.tint": [255, 106, 0]
-  },
-
-  {
-    "class": "scroll_tabs_right_button",
-    "content_margin": [12, 15],
-    "layer0.texture": "ayu/assets/arrow-right.png",
-    "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": [133, 136, 140],
-    "layer2.opacity": 0.2,
-    "layer2.inner_margin" : [0, 1, 2, 1]
-  },
-
-  {
-    "class": "scroll_tabs_right_button",
-    "attributes": ["hover"],
-    "layer0.tint": [255, 106, 0]
-  },
-
-  {
-    "class": "show_tabs_dropdown_button",
-    "content_margin": [12, 12],
-    "layer0.texture": "ayu/assets/overflow-menu.png",
-    "layer0.tint": [135, 143, 153],
-    "layer0.opacity": 1.0,
-    "layer0.inner_margin": [0, 0]
-  },
-
-  {
-    "class": "show_tabs_dropdown_button",
-    "attributes": ["hover"],
-    "layer0.tint": [255, 106, 0]
-  },
-
-
-  /* @ SIDEBAR
-  * Sidebar panel settings and behavioring
-  ========================================================================= */
-
-  {
-    "class": "sidebar_container",
-    "content_margin": [0, -20, 0, 0],
-    "layer0.opacity": 1,
-    "layer0.tint": [250, 250, 250]
-  },
-  {
-    "class": "sidebar_container",
-    "settings": ["ui_separator"],
-    "layer1.texture": "ayu/assets/separator-right.png",
-    "layer1.tint": [133, 136, 140],
-    "layer1.inner_margin": [0, 1, 2, 1],
-    "layer1.opacity": 0.2
-  },
-
-  {
-    "class": "sidebar_tree",
-    "row_padding": [30, 6],
-    "indent": 12,
-    "indent_offset": 0,
-    "indent_top_level": false,
-    "dark_content": true
-  },
-
-  {
-    "class": "sidebar_heading",
-    "color": [250, 250, 250],
-    "font.face": "Roboto mono",
-    "font.bold": true,
-    "font.size": 11
-  },
-  {
-    "class": "sidebar_heading",
-    "settings": ["ui_font_source_code_pro"],
-    "font.face": "Source Code Pro"
-  },
-  {
-    "class": "sidebar_heading",
-    "settings": ["ui_font_default"],
-    "font.face": ""
-  },
-
-  {
-    "class": "tree_row",
-    "layer1.texture": "ayu/assets/tree-highlight.png",
-    "layer1.opacity": { "target": 0.0, "speed": 5.0, "interpolation": "smoothstep" },
-    "layer1.tint": [255, 106, 0],
-    "layer1.inner_margin": [5, 0, 0, 3],
-    "layer0.tint": [245, 245, 245],
-    "layer0.opacity": 0
-  },
-
-  {
-    "class": "tree_row",
-    "attributes": ["selected"],
-    "layer1.opacity": { "target": 1.0, "speed": 5.0, "interpolation": "smoothstep" }
-  },
-
-  {
-    "class": "sidebar_label",
-    "color": [133, 136, 140],
-    "shadow_color": [0, 0, 0],
-    "shadow_offset": [0, 0],
-    "font.face": "Roboto mono",
-    "font.size": 12
-  },
-  {
-    "class": "sidebar_label",
-    "settings": ["ui_font_source_code_pro"],
-    "font.face": "Source Code Pro"
-  },
-  {
-    "class": "sidebar_label",
-    "settings": ["ui_font_default"],
-    "font.face": ""
-  },
-
-  {
-    "class": "sidebar_label",
-    "parents": [{"class": "tree_row","attributes": ["hover"]}],
-    "color": [110, 117, 128]
-  },
-
-  {
-    "class": "sidebar_label",
-    "parents": [{"class": "tree_row","attributes": ["selected"]}],
-    "color": [110, 117, 128],
-    "shadow_color": [0, 0, 0],
-    "shadow_offset": [0, 0]
-  },
-
-  {
-    "class": "sidebar_label",
-    "parents": [{"class": "tree_row","attributes": ["expandable"]}],
-    "color": [133, 136, 140],
-    "font.bold": false
-  },
-
-  {
-    "class": "sidebar_label",
-    "parents": [{"class": "tree_row", "attributes": ["expandable"]}],
-    "settings": ["bold_folder_labels"],
-    "font.bold": true
-  },
-
-  {
-    "class": "sidebar_label",
-    "parents": [{"class": "tree_row", "attributes": ["expandable", "hover"]}],
-    "color": [110, 117, 128]
-  },
-
-  {
-    "class": "sidebar_label",
-    "parents": [{"class": "tree_row", "attributes": ["expanded"]}],
-    "color": [110, 117, 128]
-  },
-
-  {
-    "class": "sidebar_label",
-    "parents": [{"class": "tree_row", "attributes": ["expanded"]}],
-    "settings": ["bold_folder_labels"],
-    "font.bold": true
-  },
-
-  // {
-  //  "class": "sidebar_label",
-  //  "parents": [{"class": "tree_row", "attributes": ["expanded", "selected"]}],
-  //  "color": [110, 117, 128]
-  // },
-
-  {
-    "class": "sidebar_label",
-    "attributes": ["transient"],
-    "font.italic": false
-  },
-
-  // Hidden arrow icon before folder
-
-  {
-    "class": "disclosure_button_control",
-    "layer0.texture": "ayu/assets/arrow-right.png",
-    "layer0.tint": [135, 143, 153],
-    "layer0.opacity": 1,
-    "layer0.inner_margin": 0,
-    "content_margin": [12, 15]
-  },
-
-  {
-    "class": "disclosure_button_control",
-    "parents": [{ "class": "tree_row", "attributes": ["hover"]}],
-    "layer0.tint": [255, 106, 0]
-  },
-
-  {
-    "class": "disclosure_button_control",
-    "attributes": ["expanded"],
-    "layer0.texture": "ayu/assets/overflow-menu.png",
-    "content_margin": [12, 12]
-  },
-
-  {
-    "class": "disclosure_button_control",
-    "attributes": ["expanded"],
-    "parents": [{ "class": "tree_row", "attributes": ["hover"]}],
-    "layer0.tint": [255, 106, 0]
-  },
-
-  // Opened files
-  {
-    "class": "close_button",
-    "content_margin": [8, 8],
-
-  // Default Close icon
-    "layer0.texture": "ayu/assets/close.png",
-    "layer0.opacity": 0,
-    "layer0.inner_margin": [0, 0],
-    "layer0.tint": [133, 136, 140]
-  },
-
-
-  // Opened file hover
-
-  {
-    "class": "close_button",
-    "parents": [{ "class": "tree_row", "attributes": ["hover"] }],
-  // Default Close icon
-    "layer0.opacity": 0.6
-  },
-
-  {
-    "class": "close_button",
-    "attributes": ["dirty"],
-    "layer0.texture": "ayu/assets/dirty.png",
-    "layer0.tint": [133, 136, 140],
-    "layer0.opacity": 1.0
-  },
-
-  {
-    "class": "close_button",
-    "attributes": ["hover"],
-    "layer0.opacity": 1.0,
-    "layer0.tint": [255, 106, 0]
-  },
-
-
-  /* @ SCROLLBARS
-  * Scrollbars settings and behavioring
-  ========================================================================= */
-
-  // Normal Vertical scrollbar track
-  // !!!
-  {
-    "class": "scroll_bar_control",
-    "layer0.tint" : [250, 250, 250],
-    "layer0.opacity": 1,
-    "layer0.inner_margin": [0, 0],
-    "blur": false
-  },
-
-  // Normal Vertical scrollbar track inside overlay panel
-
-  {
-    "class": "scroll_bar_control",
-    "parents": [{"class": "overlay_control"}],
-    "layer0.tint": [250, 250, 250, 0],
-    "layer0.opacity": 1.0,
-    "layer0.inner_margin": [0, 2],
-    "blur": false
-  },
-
-  // Normal horizontal scrollbar track
-
-  {
-    "class": "scroll_bar_control",
-    "attributes": ["horizontal"],
-    "layer0.texture": "",
-    "layer0.tint" : [250, 250, 250],
-    "layer0.inner_margin": [0, 0],
-    "blur": false
-  },
-
-  // Normal horizontal scrollbar track inside overlay panel
-  // !!!
-  // {
-  //  "class": "scroll_bar_control",
-  //  "attributes": ["horizontal"],
-  //  "parents": [{"class": "overlay_control"}],
-  //  "layer0.tint": [250, 250, 250, 0],
-  //  "layer0.opacity": 0.0,
-  //  "layer0.inner_margin": [0, 2],
-  //  "blur": false
-  //  },
-
-  // Scrollbars corner
-
-  {
-    "class": "scroll_corner_control",
-    "layer0.texture": "",
-    "layer0.tint":[250, 250, 250],
-    "layer0.inner_margin": [0, 0],
-    "layer0.opacity": 1,
-    "blur": false
-  },
-
-  // Vertical puck controller
-
-  {
-    "class": "puck_control",
-    "layer0.texture": "",
-    "layer0.tint": [0, 0, 0, 50],
-    "layer0.opacity": 1,
-    "layer0.inner_margin": [0, 0],
-    "content_margin": [1, 12],
-    "blur": false
-  },
-
-  // Horizontal puck controller
-
-  {
-    "class": "puck_control",
-    "attributes": ["horizontal"],
-    "layer0.texture": "",
-    "layer0.tint": [0, 0, 0, 50],
-    "layer0.inner_margin": [0, 0],
-    "content_margin": [12, 1],
-    "blur": false
-  },
-
-  {
-    "class": "scroll_area_control",
-    "settings": ["overlay_scroll_bars"],
-    "overlay": true
-  },
-
-  {
-    "class": "scroll_area_control",
-    "settings": ["!overlay_scroll_bars"],
-    "overlay": false // set to false for the original behavior
-  },
-
-
-  {
-    "class": "scroll_area_control",
-    "parents": [{"class": "overlay_control"}],
-    "settings": ["overlay_scroll_bars"],
-    "overlay": true // set to false for the original behavior
-  },
-
-  {
-    "class": "scroll_area_control",
-    "parents": [{"class": "sidebar_container"}],
-    "settings": ["!overlay_scroll_bars"],
-    "overlay": false // set to false for the original behavior
-  },
-
-  {
-    "class": "scroll_bar_control",
-    "settings": ["overlay_scroll_bars"],
-    "layer0.tint": [28, 31, 38],
-    "layer0.inner_margin": [0, 5],
-    "blur": false
-  },
-
-  {
-    "class": "scroll_bar_control",
-    "settings": ["overlay_scroll_bars"],
-    "attributes": ["horizontal"],
-    "layer0.inner_margin": [5, 0],
-    "blur": true
-  },
-
-
-  /* @ MINIMAP
-  * Minimap settings and behavioring
-  ========================================================================= */
-
-  {
-    "class": "minimap_control",
-    "settings": ["always_show_minimap_viewport"],
-    "viewport_color": [130, 140, 153]
-  },
-
-  {
-    "class": "minimap_control",
-    "settings": ["!always_show_minimap_viewport"],
-    "viewport_color": [130, 140, 153, 20]
-  },
-
-
-  /* @ STATUS BAR
-  * Status bar settings and behavioring
-  ========================================================================= */
-
-  // All labels
-
-  {
-    "class": "label_control",
-    "color": [133, 136, 140],
-    "shadow_color": [0, 0, 0, 0],
-    "shadow_offset": [0, 0],
-    "font.bold": false,
-    "font.face": "Roboto mono",
-    "font.size": 12
-  },
-  {
-    "class": "label_control",
-    "settings": ["ui_font_source_code_pro"],
-    "font.face": "Source Code Pro"
-  },
-  {
-    "class": "label_control",
-    "settings": ["ui_font_default"],
-    "font.face": ""
-  },
-
-  // Status bar labels
-
-  {
-    "class": "label_control",
-    "parents": [{"class": "status_bar"}],
-    "color": [133, 136, 140],
-    "font.bold": false
-  },
-
-  // Text field labels
-
-  {
-    "class": "status_bar",
-    "layer0.texture": "",
-    "layer0.tint": [250, 250, 250],
-    "layer0.opacity": 1,
-    "layer1.texture": "ayu/assets/separator-top.png",
-    "layer1.inner_margin": [1, 2, 1, 0],
-    "content_margin": [10, 5]
-  },
-  {
-    "class": "status_bar",
-    "settings": ["ui_separator"],
-    "layer0.tint": [255, 255, 255]
-    // "layer1.opacity": 0.2
-  },
-
-  {
-    "class": "status_container",
-    "content_margin": [0, 5]
-  },
-
-  {
-    "class": "status_button",
-    "min_size": [100, 0]
-  },
-
-
-  /* @ WIDGET PANEL
-  * Widget, input, buttons settings and behavioring
-  ========================================================================= */
-
-
-  // Status bar panel
-  {
-    "class": "panel_control",
-    "layer0.tint": [250, 250, 250],
-    "layer0.opacity": 1.0,
-    "content_margin": [0, 5]
-  },
-  {
-    "class": "panel_control",
-    "settings": ["ui_separator"],
-    "layer0.tint": [255, 255, 255],
-    "layer1.texture": "ayu/assets/separator-top.png",
-    "layer1.tint": [133, 136, 140],
-    "layer1.inner_margin": [1, 2, 1, 0],
-    "layer1.opacity": 0.2
-  },
-
-  // Status bar panel close icon
-
-  {
-    "class": "panel_close_button",
-    "layer0.texture": "ayu/assets/close.png",
-    "layer0.opacity": 1.0,
-    "layer0.tint": [133, 136, 140],
-    "content_margin": [0, 0] // 8,8 to show
-  },
-  // !!!
-  {
-    "class": "panel_close_button",
-    "attributes": ["hover"],
-    "layer0.tint": [255, 106, 0]
-  },
-
-  // Texline input
-
-  {
-    "class": "text_line_control",
-    "layer0.texture": "ayu/assets/input-bg.png",
-    "layer0.opacity": 1,
-    "layer0.inner_margin": [10, 8],
-    "layer0.tint": [255, 255, 255],
-
-    "layer1.texture": "ayu/assets/input-border.png",
-    "layer1.opacity": 0.2,
-    "layer1.inner_margin": [10, 8],
-    "layer1.tint": [133, 136, 140],
-    "content_margin": [10, 7, 10, 5]
-  },
-
-
-  // Textline input inside overlay panels
-
-  {
-    "class": "text_line_control",
-    "parents": [{"class": "overlay_control"}],
-    "layer0.texture": "",
-    "layer0.opacity": 0,
-    "layer1.texture": "ayu/assets/input-search.png",
-    "layer1.opacity": 1,
-    "layer1.tint": [255, 106, 0],
-    "layer1.inner_margin": [35, 0, 0, 0],
-    "content_margin": [43, 7, 10, 4]
-  },
-
-  // Textline input oveflow menu
-  {
-    "class": "dropdown_button_control",
-    "content_margin": [12, 12],
-    "layer0.texture": "ayu/assets/overflow-menu.png",
-    "layer0.tint": [135, 143, 153],
-    "layer0.opacity": 1.0
-  },
-  {
-    "class": "dropdown_button_control",
-    "attributes": ["hover"],
-    "layer0.tint": [255, 106, 0]
-  },
-
-
-  /* @ BUTTONS
-  * Buttons panels settings and behavioring
-  ========================================================================= */
-
-
-  // Button labels
-
-  {
-    "class": "button_control",
-    "content_margin": [15, 9, 15, 10],
-    "min_size": [60, 0],
-    "layer0.tint": [255, 106, 0, 10],
-    "layer0.texture": "ayu/assets/input-bg.png",
-    "layer0.inner_margin": [10, 8],
-    "layer0.opacity": 0
-  },
-  {
-    "class": "button_control",
-    "attributes": ["hover"],
-    "layer0.opacity": 1
-  },
-
-  {
-    "class": "label_control",
-    "parents": [{"class": "button_control"}],
-    "color":  [133, 136, 140]
-  },
-
-  {
-    "class": "label_control",
-    "parents": [{"class": "button_control", "attributes": ["hover"]}],
-    "color":  [255, 106, 0]
-  },
-
-  // !!!
-  // Small Icon Buttons
-  {
-    "class": "icon_button_control",
-    "layer0.tint": [0, 0, 0],
-    "layer0.opacity": 0,
-    "layer2.tint": [110, 117, 128],
-    "layer2.opacity": { "target": 0.0, "speed": 10.0, "interpolation": "smoothstep" },
-    "content_margin": [10, 5]
-  },
-
-
-  /* Buttons icons settings
-  ===================================================================== */
-
-  // Regex Icon
-  {
-    "class": "icon_regex",
-    "layer0.texture": "ayu/assets/regex.png",
-    "layer0.tint": [133, 136, 140],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-  {
-    "class": "icon_regex",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [255, 106, 0]
-  },
-
-  // Preserve case sensitive
-
-  {
-    "class": "icon_case",
-    "layer0.texture": "ayu/assets/matchcase.png",
-    "layer0.tint": [133, 136, 140],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-  {
-    "class": "icon_case",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [255, 106, 0]
-  },
-
-  // Wholeword
-
-  {
-    "class": "icon_whole_word",
-    "layer0.texture": "ayu/assets/word.png",
-    "layer0.tint": [133, 136, 140],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-
-  {
-    "class": "icon_whole_word",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [255, 106, 0]
-  },
-
-  // Wrap
-
-  {
-    "class": "icon_wrap",
-    "layer0.texture": "ayu/assets/wrap.png",
-    "layer0.tint": [133, 136, 140],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-  {
-    "class": "icon_wrap",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [255, 106, 0]
-  },
-
-  // In selection
-
-  {
-    "class": "icon_in_selection",
-    "layer0.texture": "ayu/assets/inselection.png",
-    "layer0.tint": [133, 136, 140],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-  {
-    "class": "icon_in_selection",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [255, 106, 0]
-  },
-
-  // Highlight Result
-
-  {
-    "class": "icon_highlight",
-    "layer0.texture": "ayu/assets/highlight.png",
-    "layer0.tint": [133, 136, 140],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-  {
-    "class": "icon_highlight",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [255, 106, 0]
-  },
-
-  // Preserve Case
-
-  {
-    "class": "icon_preserve_case",
-    "layer0.texture": "ayu/assets/replace-preserve-case.png",
-    "layer0.tint": [133, 136, 140],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-  {
-    "class": "icon_preserve_case",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [255, 106, 0]
-  },
-
-  // Show context
-
-  {
-    "class": "icon_context",
-    "layer0.texture": "ayu/assets/context.png",
-    "layer0.tint": [133, 136, 140],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-
-  {
-    "class": "icon_context",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [255, 106, 0]
-  },
-
-  // Use buffer
-
-  {
-    "class": "icon_use_buffer",
-    "layer0.texture": "ayu/assets/buffer.png",
-    "layer0.tint": [133, 136, 140],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-  {
-    "class": "icon_use_buffer",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [255, 106, 0]
-  },
-
-  // Reverse direction
-
-  {
-    "class": "icon_reverse",
-    "layer0.texture": "ayu/assets/reverse.png",
-    "layer0.tint": [133, 136, 140],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-  {
-    "class": "icon_reverse",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [255, 106, 0]
-  },
-
-
-  /* Visual settings
-  ===================================================================== */
-
-  // UI font sizees
-  // ==============
-  {
-    "class": "tab_label",
-    "settings": ["ui_font_size_small"],
-    "font.size": 11
-  },
-  {
-    "class": "sidebar_label",
-    "settings": ["ui_font_size_small"],
-    "font.size": 11
-  },
-  {
-    "class": "label_control",
-    "settings": ["ui_font_size_small"],
-    "font.size": 11
-  },
-  {
-    "class": "tool_tip_label_control",
-    "settings": ["ui_font_size_small"],
-    "font.size": 11
-  }
-]
diff --git a/ayu-mirage.sublime-theme b/ayu-mirage.sublime-theme
index 832cb4e6..801533ac 100644
--- a/ayu-mirage.sublime-theme
+++ b/ayu-mirage.sublime-theme
@@ -8,9 +8,9 @@
    */
 
   {
-    "class" : "sheet_container_control",
-    "layer0.tint" : [33, 39, 51],
-    "layer0.opacity" : 1
+    "class": "sheet_container_control",
+    "layer0.tint": [33, 39, 51],
+    "layer0.opacity": 1
   },
 
 
@@ -21,7 +21,7 @@
   {
     "class": "grid_layout_control",
     "border_size": 0,
-    "border_color": [52, 61, 74]
+    "border_color": [26, 31, 41]
   },
   {
     "class": "grid_layout_control",
@@ -60,7 +60,7 @@
     "layer0.texture": "ayu/assets/unfold.png",
     "layer0.opacity": 1.0,
     "layer0.inner_margin": 0,
-    "layer0.tint": [115, 134, 153],
+    "layer0.tint": [102, 115, 128],
     "content_margin": [8, 6, 8, 6]
   },
 
@@ -82,7 +82,7 @@
    */
   {
     "class": "popup_control",
-    "layer0.tint": [39, 45, 56],
+    "layer0.tint": [38, 44, 56],
     "layer0.opacity": 1.0,
     "content_margin": [0, 0]
   },
@@ -90,22 +90,22 @@
   {
     "class": "auto_complete",
     "row_padding": [12, 6],
-    "layer0.tint": [39, 45, 56],
+    "layer0.tint": [38, 44, 56],
     "layer0.opacity": 1.0
   },
 
   {
     "class": "auto_complete_label",
-    "fg": [115, 134, 153],
+    "fg": [102, 115, 128],
     "match_fg": [255, 204, 102],
-    "selected_fg": [217, 215, 206],
+    "selected_fg": [204, 201, 194],
     "selected_match_fg": [255, 204, 102],
     "fg_blend": true
   },
 
   {
     "class": "table_row",
-    "layer0.tint": [48, 53, 64],
+    "layer0.tint": [31, 37, 48],
     "layer0.opacity": 0.0
   },
 
@@ -129,8 +129,7 @@
 
   {
     "class": "tool_tip_label_control",
-    "color": [115, 134, 153],
-    "font.face": "Roboto mono",
+    "color": [102, 115, 128],
     "font.size": 13
   },
   {
@@ -140,8 +139,8 @@
   },
   {
     "class": "tool_tip_label_control",
-    "settings": ["ui_font_default"],
-    "font.face": ""
+    "settings": ["ui_font_roboto_mono"],
+    "font.face": "Roboto mono"
   },
 
   /* OVERLAY PANELS
@@ -152,21 +151,21 @@
   {
     "class": "overlay_control",
     "layer0.texture": "ayu/assets/overlay-shadow.png",
-    "layer0.inner_margin": [25, 45, 25, 35],
-    "layer0.opacity": 1.0,
-    "layer0.tint": [17, 20, 26],
+    "layer0.inner_margin": [15, 35, 15, 25],
+    "layer0.opacity": 0.6,
+    "layer0.tint": [23, 27, 36],
 
     "layer1.texture": "ayu/assets/overlay-border.png",
-    "layer1.inner_margin": [25, 45, 25, 35],
+    "layer1.inner_margin": [15, 35, 15, 25],
     "layer1.opacity": 1.0,
-    "layer1.tint": [217, 215, 206, 30],
+    "layer1.tint": [20, 23, 31],
 
     "layer2.texture": "ayu/assets/overlay-bg.png",
-    "layer2.inner_margin": [25, 45, 25, 35],
+    "layer2.inner_margin": [15, 35, 15, 25],
     "layer2.opacity": 1.0,
-    "layer2.tint": [39, 45, 56],
+    "layer2.tint": [38, 44, 56],
 
-    "content_margin": [20, 45, 20, 35]
+    "content_margin": [10, 35, 10, 20]
   },
 
   // Command Panel list item style (cmd + shift + p)
@@ -183,7 +182,7 @@
   {
     "class": "mini_quick_panel_row",
     "attributes": ["selected"],
-    "layer0.tint": [48, 53, 64]
+    "layer0.tint": [31, 37, 48]
   },
 
   // Quick panel project setting (project manager) (cmd + ctrl + p)
@@ -191,7 +190,7 @@
   {
     "class": "quick_panel",
     "row_padding": [32, 12],
-    "layer0.tint": [39, 45, 56],
+    "layer0.tint": [38, 44, 56],
     "layer0.opacity": 1.0
   },
 
@@ -200,7 +199,7 @@
   {
     "class": "quick_panel_row",
     "layer0.texture": "",
-    "layer0.tint": [39, 45, 56],
+    "layer0.tint": [38, 44, 56],
     "layer0.inner_margin": 0,
     "layer0.opacity": 1.0
   },
@@ -210,84 +209,77 @@
   {
     "class": "quick_panel_row",
     "parents": [{"class": "overlay_control"}],
-    "layer0.tint": [39, 45, 56],
+    "layer0.tint": [38, 44, 56],
     "layer0.opacity": 1.0
   },
 
   // Quick panel (project) style inside overlay_control (cmd + shift + p)
-
   {
     "class": "quick_panel",
     "parents": [{"class": "overlay_control"}],
-    "row_padding": [20, 5],
-    "layer0.tint": [39, 45, 56],
+    "row_padding": [24, 8],
+    "layer0.tint": [38, 44, 56],
     "layer0.opacity": 1.0
   },
 
   // Quick Panel selected list item style
-
   {
     "class": "quick_panel_row",
     "attributes": ["selected"],
-    "layer0.tint": [48, 53, 64]
+    "layer0.tint": [31, 37, 48]
   },
 
   // Panel labels
-
   {
     "class": "quick_panel_label",
-    "fg": [115, 134, 153],
+    "fg": [102, 115, 128],
+    "font.bold": false,
     "match_fg": [255, 204, 102],
-    "selected_fg": [217, 215, 206],
+    "selected_fg": [204, 201, 194],
     "selected_match_fg": [255, 204, 102]
   },
 
   // Panel labels
-
   {
     "class": "quick_panel_label",
     "parents": [{"class": "overlay_control"}],
-    "fg": [115, 134, 153],
+    "fg": [102, 115, 128],
     "match_fg": [255, 204, 102],
-    "selected_fg": [217, 215, 206],
+    "selected_fg": [204, 201, 194],
     "selected_match_fg": [255, 204, 102]
   },
 
   // Panels sublabels
-
   {
     "class": "quick_panel_path_label",
-    "fg": [102, 115, 127],
-    "match_fg": [217, 215, 206],
-    "selected_fg": [115, 134, 153],
-    "selected_match_fg": [217, 215, 206]
+    "fg": [81, 92, 105],
+    "match_fg": [170, 169, 165],
+    "selected_fg": [81, 92, 105],
+    "selected_match_fg": [170, 169, 165]
   },
 
   // Panels data / score
-
   {
     "class": "quick_panel_score_label",
-    "fg": [115, 134, 153],
-    "selected_fg": [115, 134, 153]
+    "fg": [102, 115, 128],
+    "selected_fg": [255, 204, 102]
   },
 
 
-
   /* TABS
    * Tabs settings and behavioring
    */
-
   {
     "class": "tabset_control",
     "mouse_wheel_switch": false,
     "tab_min_width": 50,
     "tab_overlap": 0,
-    "tab_height": 30,
+    "tab_height": 36,
     "tab_width": 50,
 
     "layer0.tint": [33, 39, 51],
     "layer0.opacity": 1.0,
-    "content_margin": [0, 0] // <<<<<<<<<<<<<
+    "content_margin": [10, 0]
   },
   {
     "class": "tabset_control",
@@ -298,114 +290,107 @@
     "class": "tabset_control",
     "settings": ["ui_separator"],
     "content_margin": [0, 0, 0, 0],
-    "layer1.opacity": 0.3,
+    "layer1.opacity": 1,
     "layer1.texture": "ayu/assets/separator-bottom.png",
-    "layer1.tint": [115, 134, 153],
+    "layer1.tint": [26, 31, 41],
     "layer1.inner_margin": [1, 0, 1, 2]
   },
   {
     "class": "tabset_control",
     "platforms": ["osx"],
     "settings": ["ui_separator", "!ui_native_titlebar"],
-    "layer2.opacity": 0.3,
+    "layer2.opacity": 1,
     "layer2.texture": "ayu/assets/separator-top.png",
-    "layer2.tint": [115, 134, 153],
+    "layer2.tint": [26, 31, 41],
     "layer2.inner_margin": [1, 2, 1, 0]
   },
 
-  {
-    "class": "tabset_control",
-    "settings": ["ui_big_tabs"],
-    "tab_height": 40
-  },
-
   // Tabs
   {
     "class": "tab_control",
-
-    "layer0.tint": [33, 39, 51, 0],
+    // Background
+    "layer0.tint": [33, 39, 51],
     "layer0.opacity": 1.0,
 
-    "layer1.texture": "",
+    // Top
+    "layer1.texture": "ayu/assets/separator-top.png",
+    "layer1.tint": [26, 31, 41],
+    "layer1.inner_margin": [0, 1, 0, 0],
+    "layer1.opacity": 0.0,
 
-    "layer2.texture": "ayu/assets/separator-bottom.png",
-    "layer2.tint": [255, 204, 102],
-    "layer2.inner_margin": [1, 0, 1, 2],
+    // Right
+    "layer2.texture": "ayu/assets/separator-right.png",
+    "layer2.tint": [26, 31, 41],
+    "layer2.inner_margin": [0, 0, 1, 0],
     "layer2.opacity": 0.0,
 
-    "layer3.texture": "",
+    // Bottom
+    "layer3.texture": "ayu/assets/separator-bottom.png",
+    "layer3.tint": [26, 31, 41],
+    "layer3.inner_margin": [0, 0, 0, 1],
+    "layer3.opacity": 0.0,
 
-    "content_margin": [10, -2, 10, 0],
+    "content_margin": [15, -2, 15, 0],
     "max_margin_trim": 12
   },
   {
     "class": "tab_control",
     "settings": ["ui_separator"],
 
-    "layer1.texture": "ayu/assets/separator-right.png",
-    "layer1.tint": [115, 134, 153],
-    "layer1.inner_margin": [0, 1, 2, 1],
-    "layer1.opacity": 0.3,
+    "layer1.opacity": 1.0,
 
-    "layer3.texture": "ayu/assets/separator-bottom.png",
-    "layer3.tint": [115, 134, 153],
-    "layer3.inner_margin": [1, 0, 1, 2],
-    "layer3.opacity": 0.3
-  },
-  {
-    "class": "tab_control",
-    "settings": ["ui_big_tabs"],
-    "content_margin": [15, -2, 15, 0]
+    "layer2.opacity": 1.0,
+
+    "layer3.opacity": 1.0
   },
 
   // Selected current tab
-
   {
     "class": "tab_control", "attributes": ["selected"],
-    "layer2.opacity": 1.0,
-    "layer3.opacity": 0.0
+    "settings": ["!ui_separator"],
+    "layer3.tint": [255, 204, 102],
+    "layer3.opacity": 1.0
   },
   {
     "class": "tab_control", "attributes": ["selected"],
     "settings": ["ui_separator"],
-    "layer0.tint": [115, 134, 153, 15]
+    "layer1.tint": [255, 204, 102],
+    "layer3.opacity": 0.0
   },
 
   // Hovered current tab
-
   {
     "class": "tab_control", "attributes": ["hover"],
-    "layer2.opacity": 0.3
+    "settings": ["!ui_separator"],
+    "layer3.tint": [255, 204, 102],
+    "layer3.opacity": 0.3
   },
   {
     "class": "tab_control", "attributes": ["hover"],
     "settings": ["ui_separator"],
-    "layer0.tint": [115, 134, 153, 6],
+    "layer0.tint": [26, 31, 41, 70],
   },
 
   // Selected current tab
-
   {
     "class": "tab_control", "attributes": ["selected", "hover"],
-    "layer2.opacity": 1.0
+    "settings": ["!ui_separator"],
+    "layer3.opacity": 1.0
   },
   {
     "class": "tab_control", "attributes": ["selected", "hover"],
     "settings": ["ui_separator"],
-    "layer0.tint": [115, 134, 153, 15]
+    "layer0.tint": [33, 39, 51]
   },
 
   // Tab Labels
 
   {
     "class": "tab_label",
-    "fg": [33, 39, 51, 0],
-    "shadow_color": [115, 134, 153],
-    "shadow_offset": [0, -1],
+    "fg": [102, 115, 128],
     "font.italic": false,
     "font.bold": false,
-    "font.size": 12,
-    "font.face": "Roboto mono"
+    "font.size": 12
   },
   {
     "class": "tab_label",
@@ -414,28 +399,15 @@
   },
   {
     "class": "tab_label",
-    "settings": ["ui_font_default"],
-    "font.face": ""
+    "settings": ["ui_font_roboto_mono"],
+    "font.face": "Roboto mono"
   },
   {
     "class": "tab_label",
     "settings": ["highlight_modified_tabs"],
     "font.italic": true,
     "attributes": ["dirty"],
-    "shadow_color": [255, 204, 102]
-  },
-  {
-    "class": "tab_label",
-    "fg": [115, 134, 153],
-    "settings": ["ui_fix_tab_labels"],
-    "shadow_color": [33, 39, 51, 0],
-    "shadow_offset": [0, 0]
-  },
-  {
-    "class": "tab_label",
-    "fg": [255, 204, 102],
-    "attributes": ["dirty"],
-    "settings": ["ui_fix_tab_labels", "highlight_modified_tabs"]
+    "fg": [255, 204, 102]
   },
 
   // Tab selected label color
@@ -443,17 +415,7 @@
   {
     "class": "tab_label",
     "parents": [{"class": "tab_control", "attributes": ["selected"]}],
-    "fg": [33, 39, 51, 0],
-    "shadow_color": [217, 215, 206],
-    "shadow_offset": [0, -1],
-  },
-  {
-    "class": "tab_label",
-    "settings": ["ui_fix_tab_labels"],
-    "parents": [{"class": "tab_control", "attributes": ["selected"]}],
-    "fg": [217, 215, 206],
-    "shadow_color": [33, 39, 51, 0],
-    "shadow_offset": [0, 0]
+    "fg": [204, 201, 194]
   },
 
   {
@@ -469,12 +431,12 @@
 
   // Close Icon
     "layer0.texture": "ayu/assets/close.png",
-    "layer0.tint": [115, 134, 153],
+    "layer0.tint": [102, 115, 128],
     "layer0.opacity": 1.0,
 
   // Dirty Icon
     "layer1.texture": "ayu/assets/dirty.png",
-    "layer1.tint": [115, 134, 153],
+    "layer1.tint": [102, 115, 128],
     "layer1.opacity": 0,
   },
 
@@ -482,7 +444,7 @@
   {
     "class": "tab_close_button",
     "settings": ["show_tab_close_buttons"],
-    "content_margin": [8, 8]
+    "content_margin": [6, 8]
   },
 
   // Default hover
@@ -499,7 +461,7 @@
     "parents": [{"class": "tab_control", "attributes": ["dirty"]}],
     "layer0.opacity": 0, // Close Icon
     "layer1.opacity": 1.0, // dirty Icon
-    "content_margin": [8, 8]
+    "content_margin": [6, 8]
   },
 
   // Dirty tab on hover
@@ -534,7 +496,7 @@
     "class": "scroll_tabs_left_button",
     "content_margin": [12, 15],
     "layer0.texture": "ayu/assets/arrow-left.png",
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [71, 81, 93],
     "layer0.opacity": 1.0
   },
 
@@ -548,16 +510,16 @@
     "class": "scroll_tabs_right_button",
     "content_margin": [12, 15],
     "layer0.texture": "ayu/assets/arrow-right.png",
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [71, 81, 93],
     "layer0.opacity": 1.0
   },
   {
     "class": "scroll_tabs_right_button",
     "settings": ["ui_separator"],
     "layer2.texture": "ayu/assets/separator-right.png",
-    "layer2.tint": [115, 134, 153],
-    "layer2.opacity": 0.3,
-    "layer2.inner_margin" : [0, 1, 2, 1]
+    "layer2.tint": [26, 31, 41],
+    "layer2.opacity": 1,
+    "layer2.inner_margin": [0, 1, 2, 1]
   },
 
   {
@@ -570,7 +532,7 @@
     "class": "show_tabs_dropdown_button",
     "content_margin": [12, 12],
     "layer0.texture": "ayu/assets/overflow-menu.png",
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [71, 81, 93],
     "layer0.opacity": 1.0,
     "layer0.inner_margin": [0, 0]
   },
@@ -588,7 +550,7 @@
 
   {
     "class": "sidebar_container",
-    "content_margin": [0, 4, 0, 0],
+    "content_margin": [0, 6, 0, 0],
     "layer0.opacity": 1,
     "layer0.tint": [33, 39, 51]
   },
@@ -597,32 +559,23 @@
     "settings": ["ui_separator"],
     "layer1.texture": "ayu/assets/separator-right.png",
     "layer1.inner_margin": [0, 1, 2, 1],
-    "layer1.opacity": 0.3,
-    "layer1.tint": [115, 134, 153]
-  },
-  {
-    "class": "sidebar_container",
-    "platforms": ["osx"],
-    "settings": ["ui_separator", "!ui_native_titlebar"],
-    "layer2.opacity": 0.3,
-    "layer2.texture": "ayu/assets/separator-top.png",
-    "layer2.tint": [115, 134, 153],
-    "layer2.inner_margin": [1, 2, 1, 0]
+    "layer1.opacity": 1,
+    "layer1.tint": [26, 31, 41],
   },
+
   {
     "class": "sidebar_tree",
     "indent_top_level": false,
     "row_padding": [20, 6],
     "dark_content": false,
     "spacer_rows": true,
-    "indent_offset": 0,
-    "indent": 12
+    "indent_offset": 2,
+    "indent": 10
   },
 
   {
     "class": "sidebar_heading",
-    "color": [115, 134, 153],
-    "font.face": "Roboto mono",
+    "color": [74, 85, 97],
     "font.bold": true,
     "font.size": 11
   },
@@ -633,34 +586,33 @@
   },
   {
     "class": "sidebar_heading",
-    "settings": ["ui_font_default"],
-    "font.face": ""
+    "settings": ["ui_font_roboto_mono"],
+    "font.face": "Roboto mono"
   },
 
   {
     "class": "tree_row",
-    "layer1.texture": "ayu/assets/tree-highlight.png",
-    "layer1.tint": [115, 134, 153, 50],
-    "layer1.inner_margin": [8, 4, 8, 4],
-    "layer1.opacity": 0
+    "layer0.texture": "ayu/assets/tree-highlight.png",
+    "layer0.tint": [26, 31, 41],
+    "layer0.inner_margin": [8, 4, 8, 4],
+    "layer0.opacity": 0
   },
 
   {
     "class": "tree_row",
-    "layer1.texture": "ayu/assets/tree-highlight-separators.png",
+    "layer0.texture": "ayu/assets/tree-highlight-separators.png",
     "settings": ["ui_separator"]
   },
 
   {
     "class": "tree_row",
     "attributes": ["selected"],
-    "layer1.opacity": 1
+    "layer0.opacity": 1
   },
 
   {
     "class": "sidebar_label",
-    "color": [115, 134, 153],
-    "font.face": "Roboto mono",
+    "color": [102, 115, 128],
     "font.size": 12
   },
   {
@@ -670,26 +622,26 @@
   },
   {
     "class": "sidebar_label",
-    "settings": ["ui_font_default"],
-    "font.face": ""
+    "settings": ["ui_font_roboto_mono"],
+    "font.face": "Roboto mono"
   },
 
   {
     "class": "sidebar_label",
     "parents": [{"class": "tree_row","attributes": ["hover"]}],
-    "color": [217, 215, 206]
+    "color": [204, 201, 194]
   },
 
   {
     "class": "sidebar_label",
     "parents": [{"class": "tree_row","attributes": ["selected"]}],
-    "color": [217, 215, 206]
+    "color": [204, 201, 194]
   },
 
   {
     "class": "sidebar_label",
     "parents": [{"class": "tree_row","attributes": ["expandable"]}],
-    "color": [115, 134, 153],
+    "color": [102, 115, 128],
     "font.bold": false
   },
 
@@ -703,13 +655,13 @@
   {
     "class": "sidebar_label",
     "parents": [{"class": "tree_row", "attributes": ["expandable", "hover"]}],
-    "color": [217, 215, 206]
+    "color": [204, 201, 194]
   },
 
   {
     "class": "sidebar_label",
     "parents": [{"class": "tree_row", "attributes": ["expanded"]}],
-    "color": [217, 215, 206]
+    "color": [204, 201, 194]
   },
 
   {
@@ -722,7 +674,7 @@
   // {
   //  "class": "sidebar_label",
   //  "parents": [{"class": "tree_row", "attributes": ["expanded", "selected"]}],
-  //  "color": [217, 215, 206]
+  //  "color": [204, 201, 194]
   // },
 
   {
@@ -745,7 +697,7 @@
     "layer0.opacity": 0,
 
     "layer1.texture": "ayu/assets/folder.png",
-    "layer1.tint": [62, 75, 89],
+    "layer1.tint": [71, 81, 93],
     "layer1.opacity": 1,
 
     "layer2.texture": "ayu/assets/folder-open.png",
@@ -829,11 +781,11 @@
     "class": "icon_folder_dup",
     "content_margin": [9, 9],
     "layer0.texture": "ayu/assets/folder.png",
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [71, 81, 93],
     "layer0.opacity": 1.0,
 
     "layer1.texture": "ayu/assets/folder-symlink.png",
-    "layer1.tint": [115, 134, 153],
+    "layer1.tint": [102, 115, 128],
     "layer1.opacity": 0.3
   },
 
@@ -859,13 +811,13 @@
   // Opened files
   {
     "class": "close_button",
-    "content_margin": [8, 8],
+    "content_margin": [6, 8],
 
   // Default Close icon
     "layer0.texture": "ayu/assets/close.png",
     "layer0.opacity": 0,
     "layer0.inner_margin": [0, 0],
-    "layer0.tint": [115, 134, 153]
+    "layer0.tint": [102, 115, 128]
   },
 
 
@@ -874,15 +826,14 @@
   {
     "class": "close_button",
     "parents": [{ "class": "tree_row", "attributes": ["hover"] }],
-  // Default Close icon
-    "layer0.opacity": 0.6
+    "layer0.opacity": 1
   },
 
   {
     "class": "close_button",
     "attributes": ["dirty"],
     "layer0.texture": "ayu/assets/dirty.png",
-    "layer0.tint": [115, 134, 153],
+    "layer0.tint": [102, 115, 128],
     "layer0.opacity": 1.0
   },
 
@@ -903,7 +854,7 @@
     "layer0.opacity": 1.0,
 
     "layer1.texture": "ayu/assets/scrollbar-vertical-wide.png",
-    "layer1.tint": [115, 134, 153],
+    "layer1.tint": [102, 115, 128],
     "layer1.opacity": 0.1,
     "layer1.inner_margin": [0, 10],
     "blur": false
@@ -911,7 +862,7 @@
   {
     "class": "scroll_bar_control",
     "parents": [{"class": "overlay_control"}],
-    "layer0.tint": [39, 45, 56],
+    "layer0.tint": [38, 44, 56],
     "blur": false
   },
   {
@@ -929,7 +880,7 @@
   {
     "class": "puck_control",
     "layer0.texture": "ayu/assets/scrollbar-vertical-wide.png",
-    "layer0.tint": [115, 134, 153],
+    "layer0.tint": [102, 115, 128],
     "layer0.opacity": 0.3,
     "layer0.inner_margin": [0, 10],
     "content_margin": [6, 12],
@@ -1017,14 +968,14 @@
   {
     "class": "minimap_control",
     "settings": ["always_show_minimap_viewport"],
-    "viewport_color": [100, 100, 100],
-    "viewport_opacity": 0.3
+    "viewport_color": [20, 23, 31],
+    "viewport_opacity": 0.2
   },
 
   {
     "class": "minimap_control",
     "settings": ["!always_show_minimap_viewport"],
-    "viewport_color": [100, 100, 100],
+    "viewport_color": [20, 23, 31],
     "viewport_opacity": { "target": 0, "speed": 4.0, "interpolation": "smoothstep" }
   },
 
@@ -1044,11 +995,10 @@
 
   {
     "class": "label_control",
-    "color": [115, 134, 153],
+    "color": [102, 115, 128],
     "shadow_color": [0, 0, 0, 0],
     "shadow_offset": [0, 0],
     "font.bold": false,
-    "font.face": "Roboto mono",
     "font.size": 12
   },
   {
@@ -1058,8 +1008,8 @@
   },
   {
     "class": "label_control",
-    "settings": ["ui_font_default"],
-    "font.face": ""
+    "settings": ["ui_font_roboto_mono"],
+    "font.face": "Roboto mono"
   },
 
   // Status bar labels
@@ -1067,7 +1017,7 @@
   {
     "class": "label_control",
     "parents": [{"class": "status_bar"}],
-    "color": [115, 134, 153],
+    "color": [102, 115, 128],
     "font.bold": false
   },
 
@@ -1079,14 +1029,15 @@
     "layer0.tint": [33, 39, 51],
     "layer0.opacity": 1,
     "layer1.texture": "ayu/assets/separator-top.png",
+    "layer1.tint": [26, 31, 41],
     "layer1.inner_margin": [1, 2, 1, 0],
-    "content_margin": [10, 0]
+    "content_margin": [16, 3]
   },
   {
     "class": "status_bar",
     "settings": ["ui_separator"],
-    "layer0.tint": [39, 45, 56]
-    // "layer1.opacity": 0.3
+    // "layer0.tint": [38, 44, 56],
+    // "layer1.opacity": 1
   },
 
   {
@@ -1102,7 +1053,7 @@
   {
     "class": "panel_button_control",
     "layer0.texture": "ayu/assets/switch-panel.png",
-    "layer0.tint": [115, 134, 153],
+    "layer0.tint": [102, 115, 128],
     "layer0.opacity": 1.0
   },
 
@@ -1127,11 +1078,11 @@
   {
     "class": "panel_control",
     "settings": ["ui_separator"],
-    "layer0.tint": [39, 45, 56],
+    // "layer0.tint": [38, 44, 56],
     "layer1.texture": "ayu/assets/separator-top.png",
-    "layer1.tint": [115, 134, 153],
+    "layer1.tint": [26, 31, 41],
     "layer1.inner_margin": [1, 2, 1, 0],
-    "layer1.opacity": 0.3
+    "layer1.opacity": 1
   },
 
   // Status bar panel close icon
@@ -1140,7 +1091,7 @@
     "class": "panel_close_button",
     "layer0.texture": "ayu/assets/close.png",
     "layer0.opacity": 1.0,
-    "layer0.tint": [115, 134, 153],
+    "layer0.tint": [102, 115, 128],
     "content_margin": [0, 0] // 8,8 to show
   },
   {
@@ -1156,12 +1107,12 @@
     "layer0.texture": "ayu/assets/input-bg.png",
     "layer0.opacity": 1,
     "layer0.inner_margin": [10, 8],
-    "layer0.tint": [39, 45, 56],
+    "layer0.tint": [38, 44, 56],
 
     "layer1.texture": "ayu/assets/input-border.png",
-    "layer1.opacity": 0.3,
+    "layer1.opacity": 1,
     "layer1.inner_margin": [10, 8],
-    "layer1.tint": [115, 134, 153],
+    "layer1.tint": [26, 31, 41],
     "content_margin": [10, 7, 10, 5]
   },
 
@@ -1175,9 +1126,9 @@
     "layer0.opacity": 0,
     "layer1.texture": "ayu/assets/input-search.png",
     "layer1.opacity": 1,
-    "layer1.tint": [255, 204, 102],
-    "layer1.inner_margin": [35, 0, 0, 0],
-    "content_margin": [43, 7, 10, 4]
+    "layer1.tint": [102, 115, 128, 100],
+    "layer1.inner_margin": [60, 0, 0, 0],
+    "content_margin": [50, 7, 10, 4]
   },
 
   // Textline input oveflow menu
@@ -1185,7 +1136,7 @@
     "class": "dropdown_button_control",
     "content_margin": [12, 12],
     "layer0.texture": "ayu/assets/overflow-menu.png",
-    "layer0.tint": [62, 75, 89],
+    "layer0.tint": [71, 81, 93],
     "layer0.opacity": 1.0
   },
   {
@@ -1220,7 +1171,7 @@
   {
     "class": "label_control",
     "parents": [{"class": "button_control"}],
-    "color":  [115, 134, 153]
+    "color":  [102, 115, 128]
   },
 
   {
@@ -1234,7 +1185,7 @@
     "class": "icon_button_control",
     "layer0.tint": [0, 0, 0],
     "layer0.opacity": 0,
-    "layer2.tint": [217, 215, 206],
+    "layer2.tint": [204, 201, 194],
     "layer2.opacity": { "target": 0.0, "speed": 10.0, "interpolation": "smoothstep" },
     "content_margin": [10, 5]
   },
@@ -1247,7 +1198,7 @@
   {
     "class": "icon_regex",
     "layer0.texture": "ayu/assets/regex.png",
-    "layer0.tint": [115, 134, 153],
+    "layer0.tint": [102, 115, 128],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1263,7 +1214,7 @@
   {
     "class": "icon_case",
     "layer0.texture": "ayu/assets/matchcase.png",
-    "layer0.tint": [115, 134, 153],
+    "layer0.tint": [102, 115, 128],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1279,7 +1230,7 @@
   {
     "class": "icon_whole_word",
     "layer0.texture": "ayu/assets/word.png",
-    "layer0.tint": [115, 134, 153],
+    "layer0.tint": [102, 115, 128],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1295,7 +1246,7 @@
   {
     "class": "icon_wrap",
     "layer0.texture": "ayu/assets/wrap.png",
-    "layer0.tint": [115, 134, 153],
+    "layer0.tint": [102, 115, 128],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1311,7 +1262,7 @@
   {
     "class": "icon_in_selection",
     "layer0.texture": "ayu/assets/inselection.png",
-    "layer0.tint": [115, 134, 153],
+    "layer0.tint": [102, 115, 128],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1327,7 +1278,7 @@
   {
     "class": "icon_highlight",
     "layer0.texture": "ayu/assets/highlight.png",
-    "layer0.tint": [115, 134, 153],
+    "layer0.tint": [102, 115, 128],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1343,7 +1294,7 @@
   {
     "class": "icon_preserve_case",
     "layer0.texture": "ayu/assets/replace-preserve-case.png",
-    "layer0.tint": [115, 134, 153],
+    "layer0.tint": [102, 115, 128],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1359,7 +1310,7 @@
   {
     "class": "icon_context",
     "layer0.texture": "ayu/assets/context.png",
-    "layer0.tint": [115, 134, 153],
+    "layer0.tint": [102, 115, 128],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1376,7 +1327,7 @@
   {
     "class": "icon_use_buffer",
     "layer0.texture": "ayu/assets/buffer.png",
-    "layer0.tint": [115, 134, 153],
+    "layer0.tint": [102, 115, 128],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1392,7 +1343,7 @@
   {
     "class": "icon_reverse",
     "layer0.texture": "ayu/assets/reverse.png",
-    "layer0.tint": [115, 134, 153],
+    "layer0.tint": [102, 115, 128],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1408,7 +1359,7 @@
   {
     "class": "title_bar",
     "bg": [33, 39, 51],
-    "fg": [217, 215, 206]
+    "fg": [204, 201, 194]
   },
   {
     "class": "title_bar",
diff --git a/ayu-mirage.tmTheme b/ayu-mirage.tmTheme
index 9ab803c2..c6a060f8 100644
--- a/ayu-mirage.tmTheme
+++ b/ayu-mirage.tmTheme
@@ -18,35 +18,35 @@
 				<key>accent</key>
 				<string>#FFCC66</string>
 				<key>activeGuide</key>
-				<string>#737D87</string>
+				<string>#515C69</string>
 				<key>background</key>
 				<string>#212733</string>
 				<key>caret</key>
 				<string>#FFCC66</string>
 				<key>findHighlight</key>
-				<string>#D4BFFF</string>
+				<string>#FFCC66</string>
 				<key>findHighlightForeground</key>
 				<string>#212733</string>
 				<key>foreground</key>
-				<string>#D9D7CE</string>
+				<string>#CCC9C2</string>
 				<key>guide</key>
-				<string>#434E59</string>
+				<string>#363E4A</string>
 				<key>gutter</key>
 				<string>#212733</string>
 				<key>gutterForeground</key>
-				<string>#434E59</string>
+				<string>#39424E</string>
 				<key>inactiveBackground</key>
 				<string>#212733</string>
 				<key>inactiveSelection</key>
-				<string>#343F4C88</string>
+				<string>#283543</string>
 				<key>invisibles</key>
-				<string>#434E59</string>
+				<string>#39424E</string>
 				<key>lineHighlight</key>
-				<string>#242B38</string>
+				<string>#1C222C</string>
 				<key>popupCss</key>
 				<string>html, body {
-  background-color: #272D38;
-  color: #D9D7CE;
+  background-color: #262C38;
+  color: #CCC9C2;
 }
 body {
   padding: 1px 3px;
@@ -56,13 +56,13 @@ a {
 }
 </string>
 				<key>selection</key>
-				<string>#343F4C</string>
+				<string>#293847</string>
 				<key>selectionBorder</key>
-				<string>#343F4C</string>
+				<string>#2C3D4E</string>
 				<key>shadow</key>
 				<string>#00000010</string>
 				<key>stackGuide</key>
-				<string>#39434D</string>
+				<string>#363E4A</string>
 			</dict>
 		</dict>
 		<dict>
@@ -86,7 +86,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#D9D7CE</string>
+				<string>#CCC9C2</string>
 			</dict>
 		</dict>
 		<dict>
@@ -108,7 +108,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#D4BFFF</string>
+				<string>#FFCC66</string>
 			</dict>
 		</dict>
 		<dict>
@@ -130,7 +130,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#D4BFFF</string>
+				<string>#FFCC66</string>
 			</dict>
 		</dict>
 		<dict>
@@ -141,7 +141,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#D4BFFF</string>
+				<string>#FFCC66</string>
 			</dict>
 		</dict>
 		<dict>
@@ -185,7 +185,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#D9D7CECC</string>
+				<string>#CCC9C2CC</string>
 			</dict>
 		</dict>
 		<dict>
@@ -196,7 +196,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#D9D7CE</string>
+				<string>#CCC9C2</string>
 			</dict>
 		</dict>
 		<dict>
@@ -218,7 +218,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#D9D7CECC</string>
+				<string>#CCC9C2CC</string>
 			</dict>
 		</dict>
 		<dict>
@@ -297,7 +297,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#D4BFFF</string>
+				<string>#FFCC66</string>
 			</dict>
 		</dict>
 		<dict>
@@ -698,7 +698,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#D9D7CE07</string>
+				<string>#CCC9C207</string>
 			</dict>
 		</dict>
 		<dict>
@@ -709,7 +709,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#D9D7CE10</string>
+				<string>#CCC9C210</string>
 			</dict>
 		</dict>
 		<dict>
@@ -720,7 +720,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#D9D7CE10</string>
+				<string>#CCC9C210</string>
 				<key>fontStyle</key>
 				<string>bold</string>
 				<key>foreground</key>
@@ -737,7 +737,7 @@ a {
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
-				<string>#D4BFFF</string>
+				<string>#FFCC66</string>
 			</dict>
 		</dict>
 		<dict>
@@ -781,7 +781,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#FF3333</string>
+				<string>#F28779</string>
 			</dict>
 		</dict>
 		<dict>
@@ -803,7 +803,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#D9D7CE10</string>
+				<string>#CCC9C210</string>
 				<key>foreground</key>
 				<string>#5CCFE6</string>
 			</dict>
@@ -838,9 +838,9 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#D9D7CE10</string>
+				<string>#CCC9C210</string>
 				<key>foreground</key>
-				<string>#D9D7CE</string>
+				<string>#CCC9C2</string>
 			</dict>
 		</dict>
 		<dict>
@@ -851,7 +851,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#D9D7CE10</string>
+				<string>#CCC9C210</string>
 				<key>foreground</key>
 				<string>#5C6773</string>
 			</dict>
@@ -908,7 +908,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#5C6773</string>
+				<string>#363E4A</string>
 			</dict>
 		</dict>
 		<dict>
@@ -919,7 +919,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#5C6773</string>
+				<string>#363E4A</string>
 			</dict>
 		</dict>
 		<dict>
diff --git a/ayu-mirage2.sublime-theme b/ayu-mirage2.sublime-theme
deleted file mode 100644
index 544c1dcc..00000000
--- a/ayu-mirage2.sublime-theme
+++ /dev/null
@@ -1,1280 +0,0 @@
-// prefix=""
-// sublime="2"
-// ext="sublime-theme"
-[
-
-  /* @ EMPTY WINDOW
-  * Style for empty (no tabs) window
-  ========================================================================= */
-
-  {
-    "class" : "sheet_container_control",
-    "layer0.tint" : [33, 39, 51],
-    "layer0.opacity" : 1.0
-  },
-
-
-  /* @ GRID LAYOUT
-  * Grid style
-  ========================================================================= */
-
-  {
-    "class": "grid_layout_control",
-    "border_size": 0,
-    "border_color": [52, 61, 74]
-  },
-  {
-    "class": "grid_layout_control",
-    "settings": ["ui_separator"],
-    "border_size": 1
-  },
-
-  /* @ DIALOG POPUP
-  * Dialog popup style and progressbar
-  ========================================================================= */
-  // !!!
-  {
-    "class": "progress_gauge_control",
-    "layer0.tint": [255, 204, 102],
-    "layer0.opacity": 1.0,
-    "content_margin": [0, 6]
-  },
-
-  {
-    "class": "dialog",
-    "layer0.tint": [33, 39, 51],
-    "layer0.opacity": 1.0
-  },
-
-  {
-    "class": "progress_bar_control",
-    "layer0.tint": [33, 39, 51],
-    "layer0.opacity": 1.0
-  },
-
-
-  /* @ CODE FOLDING
-  * Folding arrow setting and behavioring
-  ========================================================================= */
-  {
-    "class": "fold_button_control",
-    "layer0.texture": "ayu/assets/unfold.png",
-    "layer0.opacity": 1.0,
-    "layer0.inner_margin": 0,
-    "layer0.tint": [115, 134, 153],
-    "content_margin": [8, 6, 8, 6]
-  },
-
-  {
-    "class": "fold_button_control",
-    "attributes": ["hover"],
-    "layer0.tint": [255, 204, 102]
-  },
-
-  {
-    "class": "fold_button_control",
-    "attributes": ["expanded"],
-    "layer0.texture": "ayu/assets/fold.png"
-  },
-
-
-  /* @ AUTOCOMPLETE
-  * Autocomplete popup setting and behavioring
-  ========================================================================= */
-
-  {
-    "class": "popup_control",
-    "layer0.tint": [39, 45, 56],
-    "layer0.opacity": 1.0,
-    "content_margin": [0, 0]
-  },
-
-  {
-    "class": "auto_complete",
-    "row_padding": [12, 6],
-    "layer0.tint": [39, 45, 56],
-    "layer0.opacity": 1.0
-  },
-
-  {
-    "class": "auto_complete_label",
-    "fg": [115, 134, 153],
-    "match_fg": [255, 204, 102],
-    "selected_fg": [217, 215, 206],
-    "selected_match_fg": [255, 204, 102]
-  },
-
-  {
-    "class": "table_row",
-    "layer0.tint": [48, 53, 64],
-    "layer0.opacity": 0.0
-  },
-
-  {
-    "class": "table_row",
-    "attributes": ["selected"],
-    "layer0.opacity": 1.0
-  },
-
-
-  /* @ TOOLTIP
-  * Tooltip setting and behavioring
-  ========================================================================= */
-
-  {
-    "class": "tool_tip_control",
-    "layer0.tint": [33, 39, 51],
-    "layer0.inner_margin": [0, 0],
-    "layer0.opacity": 1.0,
-    "content_margin": [10, 6]
-  },
-
-  {
-    "class": "tool_tip_label_control",
-    "color": [115, 134, 153],
-    "font.face": "Roboto mono",
-    "font.size": 12
-  },
-  {
-    "class": "tool_tip_label_control",
-    "settings": ["ui_font_source_code_pro"],
-    "font.face": "Source Code Pro"
-  },
-  {
-    "class": "tool_tip_label_control",
-    "settings": ["ui_font_default"],
-    "font.face": ""
-  },
-
-  /* @OVERLAY PANELS
-  * Overlay panels setting and behavioring
-  ========================================================================= */
-
-  // Command Panel
-  {
-    "class": "overlay_control",
-    "layer0.texture": "ayu/assets/overlay-shadow.png",
-    "layer0.inner_margin": [25, 45, 25, 35],
-    "layer0.opacity": 1.0,
-    "layer0.tint": [17, 20, 26],
-
-    "layer1.texture": "ayu/assets/overlay-bg.png",
-    "layer1.inner_margin": [25, 45, 25, 35],
-    "layer1.opacity": 1.0,
-    "layer1.tint": [39, 45, 56],
-
-    "content_margin": [20, 45, 20, 35]
-  },
-
-  // Command Panel list item style (cmd + shift + p)
-
-  {
-    "class": "mini_quick_panel_row",
-    "layer0.tint": [33, 39, 51, 0],
-    "layer0.inner_margin": [2, 2, 2, 2],
-    "layer0.opacity": 1.0
-  },
-
-  // Command Panel selected list item style (cmd + p)
-
-  {
-    "class": "mini_quick_panel_row",
-    "attributes": ["selected"],
-    "layer0.tint": [48, 53, 64]
-  },
-
-  // Quick panel project setting (project manager) (cmd + ctrl + p)
-
-  {
-    "class": "quick_panel",
-    "row_padding": [32, 12],
-    "layer0.tint": [39, 45, 56],
-    "layer0.opacity": 1.0
-  },
-
-  // Quick Panel row default style (project manager)
-
-  {
-    "class": "quick_panel_row",
-    "layer0.texture": "",
-    "layer0.tint": [39, 45, 56],
-    "layer0.inner_margin": 0,
-    "layer0.opacity": 1.0
-  },
-
-  // Row panel style inside comman panel (cmd + shift + p)
-
-  {
-    "class": "quick_panel_row",
-    "parents": [{"class": "overlay_control"}],
-    "layer0.tint": [39, 45, 56],
-    "layer0.opacity": 1.0
-  },
-
-  // Quick panel (project) style inside overlay_control (cmd + shift + p)
-
-  {
-    "class": "quick_panel",
-    "parents": [{"class": "overlay_control"}],
-    "row_padding": [10, 7],
-    "layer0.tint": [39, 45, 56],
-    "layer0.opacity": 1.0
-  },
-
-  // Quick Panel selected list item style
-
-  {
-    "class": "quick_panel_row",
-    "attributes": ["selected"],
-    "layer0.tint": [48, 53, 64]
-  },
-
-  // Panel labels
-
-  {
-    "class": "quick_panel_label",
-    "fg": [115, 134, 153],
-    "match_fg": [255, 204, 102],
-    "selected_fg": [217, 215, 206],
-    "selected_match_fg": [255, 204, 102]
-  },
-
-  // Panel labels
-
-  {
-    "class": "quick_panel_label",
-    "parents": [{"class": "overlay_control"}],
-    "fg": [115, 134, 153],
-    "match_fg": [255, 204, 102],
-    "selected_fg": [217, 215, 206],
-    "selected_match_fg": [255, 204, 102]
-  },
-
-  // Panels sublabels
-
-  {
-    "class": "quick_panel_path_label",
-    "fg": [102, 115, 127],
-    "match_fg": [217, 215, 206],
-    "selected_fg": [115, 134, 153],
-    "selected_match_fg": [217, 215, 206]
-  },
-
-  // Panels data / score
-
-  {
-    "class": "quick_panel_score_label",
-    "fg": [115, 134, 153],
-    "selected_fg": [115, 134, 153]
-  },
-
-
-
-  /* @ TABS
-  * Tabs settings and behavioring
-  ========================================================================= */
-
-  {
-    "class": "tabset_control",
-    "tab_overlap": 0,
-    "tab_width": 50,
-    "tab_min_width": 50,
-    "tab_height": 30,
-    "mouse_wheel_switch": false,
-
-    "layer0.opacity": 1.0,
-    "layer0.tint": [33, 39, 51],
-    "content_margin": [10, 0]
-  },
-  {
-    "class": "tabset_control",
-    "settings": ["mouse_wheel_switches_tabs", "!enable_tab_scrolling"],
-    "mouse_wheel_switch": true
-  },
-  {
-    "class": "tabset_control",
-    "settings": ["ui_separator"],
-    "content_margin": [0, 0, 0, 0],
-    "layer1.opacity": 0.3,
-    "layer1.texture": "ayu/assets/separator-bottom.png",
-    "layer1.tint": [115, 134, 153],
-    "layer1.inner_margin": [1, 0, 1, 2]
-  },
-  {
-    "class": "tabset_control",
-    "settings": ["ui_big_tabs"],
-    "tab_height": 44
-  },
-
-  // Tabs
-  {
-    "class": "tab_control",
-
-    "layer0.tint": [33, 39, 51],
-    "layer0.opacity": 1.0,
-
-    "layer1.texture": "",
-
-    "layer2.texture": "ayu/assets/separator-bottom.png",
-    "layer2.tint": [255, 204, 102],
-    "layer2.inner_margin": [1, 0, 1, 2],
-    "layer2.opacity": 0.0,
-
-    "layer3.texture": "",
-
-    "content_margin": [10, -2, 10, 0],
-    "max_margin_trim": 12
-  },
-  {
-    "class": "tab_control",
-    "settings": ["ui_separator"],
-
-    "layer1.texture": "ayu/assets/separator-right.png",
-    "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": [115, 134, 153],
-    "layer3.inner_margin": [1, 0, 1, 2],
-    "layer3.opacity": 0.3
-  },
-  {
-    "class": "tab_control",
-    "settings": ["ui_big_tabs"],
-    "content_margin": [15, -2, 15, 0]
-  },
-
-  // Selected current tab
-
-  {
-    "class": "tab_control", "attributes": ["selected"],
-    "layer2.opacity": 1.0,
-    "layer3.opacity": 0.0
-  },
-
-  // Hovered current tab
-
-  {
-    "class": "tab_control", "attributes": ["hover"],
-    "layer2.opacity": 0.3
-  },
-
-  // Selected current tab
-
-  {
-    "class": "tab_control", "attributes": ["selected","hover"],
-    "layer2.opacity": 1.0
-  },
-
-  // Tab Labels
-
-  {
-    "class": "tab_label",
-    "fg": [33, 39, 51, 0],
-    "shadow_color": [115, 134, 153],
-    "shadow_offset": [0, -1],
-    "font.size": 12,
-    "font.italic": false,
-    "font.bold": false,
-    "font.face": "Roboto mono"
-  },
-  {
-    "class": "tab_label",
-    "settings": ["ui_font_source_code_pro"],
-    "font.face": "Source Code Pro"
-  },
-  {
-    "class": "tab_label",
-    "settings": ["ui_font_default"],
-    "font.face": ""
-  },
-  {
-    "class": "tab_label",
-    "fg": [115, 134, 153],
-    "settings": ["ui_fix_tab_labels"],
-    "shadow_color": [33, 39, 51, 0],
-    "shadow_offset": [0, 0]
-  },
-
-  // Tab selected label color
-
-  {
-    "class": "tab_label",
-    "parents": [{"class": "tab_control", "attributes": ["selected"]}],
-    "fg": [33, 39, 51, 0],
-    "shadow_color": [217, 215, 206],
-    "shadow_offset": [0, -1]
-  },
-  {
-    "class": "tab_label",
-    "settings": ["ui_fix_tab_labels"],
-    "parents": [{"class": "tab_control", "attributes": ["selected"]}],
-    "fg": [217, 215, 206],
-    "shadow_color": [33, 39, 51, 0],
-    "shadow_offset": [0, 0]
-  },
-
-  {
-    "class": "tab_label",
-    "attributes": ["transient"],
-    "font.italic": true
-  },
-
-  // Tab Close Buttons
-  {
-    "class": "tab_close_button",
-    "content_margin": [0, 0],
-
-  // Close Icon
-    "layer0.texture": "ayu/assets/close.png",
-    "layer0.tint": [115, 134, 153],
-    "layer0.opacity": 1.0,
-
-  // Dirty Icon
-    "layer1.texture": "ayu/assets/dirty.png",
-    "layer1.tint": [115, 134, 153],
-    "layer1.opacity": 0
-  },
-
-  // Default
-  {
-    "class": "tab_close_button",
-    "settings": ["show_tab_close_buttons"],
-    "content_margin": [8, 8]
-  },
-
-  // Default hover
-  {
-    "class": "tab_close_button",
-    "settings": ["show_tab_close_buttons"],
-    "attributes": ["hover"],
-    "layer0.tint": [255, 204, 102]
-  },
-
-  // Dirty tab
-  {
-    "class": "tab_close_button",
-    "parents": [{"class": "tab_control", "attributes": ["dirty"]}],
-    "layer0.opacity": 0, // Close Icon
-    "layer1.opacity": 1.0, // dirty Icon
-    "content_margin": [8, 8]
-  },
-
-  // Dirty tab on hover
-  {
-    "class": "tab_close_button",
-    "parents": [{"class": "tab_control", "attributes": ["dirty"]}],
-    "attributes": ["hover"],
-    "layer0.opacity": 1.0, // Close Icon
-    "layer1.opacity": 0 // Close Icon
-  },
-
-  // Selected dirty tab
-  {
-    "class": "tab_close_button",
-    "parents": [{"class": "tab_control", "attributes": ["selected", "dirty"]}],
-    "layer0.opacity": 0, // Close Icon
-    "layer1.opacity": 1.0, // Dirty Icon
-    "layer1.tint": [255, 204, 102]
-  },
-
-  // Selected dirty tab on hover
-  {
-    "class": "tab_close_button",
-    "parents": [{"class": "tab_control", "attributes": ["selected", "dirty"]}],
-    "attributes": ["hover"],
-    "layer0.opacity": 1.0,
-    "layer1.opacity": 0
-  },
-  // tab set scroll left | scroll right
-  {
-    "class": "scroll_tabs_left_button",
-    "content_margin": [12, 15],
-    "layer0.texture": "ayu/assets/arrow-left.png",
-    "layer0.tint": [62, 75, 89],
-    "layer0.opacity": 1.0
-  },
-
-  {
-    "class": "scroll_tabs_left_button",
-    "attributes": ["hover"],
-    "layer0.tint": [255, 204, 102]
-  },
-
-  {
-    "class": "scroll_tabs_right_button",
-    "content_margin": [12, 15],
-    "layer0.texture": "ayu/assets/arrow-right.png",
-    "layer0.tint": [62, 75, 89],
-    "layer0.opacity": 1.0
-  },
-  {
-    "class": "scroll_tabs_right_button",
-    "settings": ["ui_separator"],
-    "layer2.texture": "ayu/assets/separator-right.png",
-    "layer2.tint": [115, 134, 153],
-    "layer2.opacity": 0.3,
-    "layer2.inner_margin" : [0, 1, 2, 1]
-  },
-
-  {
-    "class": "scroll_tabs_right_button",
-    "attributes": ["hover"],
-    "layer0.tint": [255, 204, 102]
-  },
-
-  {
-    "class": "show_tabs_dropdown_button",
-    "content_margin": [12, 12],
-    "layer0.texture": "ayu/assets/overflow-menu.png",
-    "layer0.tint": [62, 75, 89],
-    "layer0.opacity": 1.0,
-    "layer0.inner_margin": [0, 0]
-  },
-
-  {
-    "class": "show_tabs_dropdown_button",
-    "attributes": ["hover"],
-    "layer0.tint": [255, 204, 102]
-  },
-
-
-  /* @ SIDEBAR
-  * Sidebar panel settings and behavioring
-  ========================================================================= */
-
-  {
-    "class": "sidebar_container",
-    "content_margin": [0, -20, 0, 0],
-    "layer0.opacity": 1,
-    "layer0.tint": [33, 39, 51]
-  },
-  {
-    "class": "sidebar_container",
-    "settings": ["ui_separator"],
-    "layer1.texture": "ayu/assets/separator-right.png",
-    "layer1.tint": [115, 134, 153],
-    "layer1.inner_margin": [0, 1, 2, 1],
-    "layer1.opacity": 0.3
-  },
-
-  {
-    "class": "sidebar_tree",
-    "row_padding": [30, 6],
-    "indent": 12,
-    "indent_offset": 0,
-    "indent_top_level": false,
-    "dark_content": true
-  },
-
-  {
-    "class": "sidebar_heading",
-    "color": [33, 39, 51],
-    "font.face": "Roboto mono",
-    "font.bold": true,
-    "font.size": 11
-  },
-  {
-    "class": "sidebar_heading",
-    "settings": ["ui_font_source_code_pro"],
-    "font.face": "Source Code Pro"
-  },
-  {
-    "class": "sidebar_heading",
-    "settings": ["ui_font_default"],
-    "font.face": ""
-  },
-
-  {
-    "class": "tree_row",
-    "layer1.texture": "ayu/assets/tree-highlight.png",
-    "layer1.opacity": { "target": 0.0, "speed": 5.0, "interpolation": "smoothstep" },
-    "layer1.tint": [255, 204, 102],
-    "layer1.inner_margin": [5, 0, 0, 3],
-    "layer0.tint": [48, 53, 64],
-    "layer0.opacity": 0
-  },
-
-  {
-    "class": "tree_row",
-    "attributes": ["selected"],
-    "layer1.opacity": { "target": 1.0, "speed": 5.0, "interpolation": "smoothstep" }
-  },
-
-  {
-    "class": "sidebar_label",
-    "color": [115, 134, 153],
-    "shadow_color": [0, 0, 0],
-    "shadow_offset": [0, 0],
-    "font.face": "Roboto mono",
-    "font.size": 12
-  },
-  {
-    "class": "sidebar_label",
-    "settings": ["ui_font_source_code_pro"],
-    "font.face": "Source Code Pro"
-  },
-  {
-    "class": "sidebar_label",
-    "settings": ["ui_font_default"],
-    "font.face": ""
-  },
-
-  {
-    "class": "sidebar_label",
-    "parents": [{"class": "tree_row","attributes": ["hover"]}],
-    "color": [217, 215, 206]
-  },
-
-  {
-    "class": "sidebar_label",
-    "parents": [{"class": "tree_row","attributes": ["selected"]}],
-    "color": [217, 215, 206],
-    "shadow_color": [0, 0, 0],
-    "shadow_offset": [0, 0]
-  },
-
-  {
-    "class": "sidebar_label",
-    "parents": [{"class": "tree_row","attributes": ["expandable"]}],
-    "color": [115, 134, 153],
-    "font.bold": false
-  },
-
-  {
-    "class": "sidebar_label",
-    "parents": [{"class": "tree_row", "attributes": ["expandable"]}],
-    "settings": ["bold_folder_labels"],
-    "font.bold": true
-  },
-
-  {
-    "class": "sidebar_label",
-    "parents": [{"class": "tree_row", "attributes": ["expandable", "hover"]}],
-    "color": [217, 215, 206]
-  },
-
-  {
-    "class": "sidebar_label",
-    "parents": [{"class": "tree_row", "attributes": ["expanded"]}],
-    "color": [217, 215, 206]
-  },
-
-  {
-    "class": "sidebar_label",
-    "parents": [{"class": "tree_row", "attributes": ["expanded"]}],
-    "settings": ["bold_folder_labels"],
-    "font.bold": true
-  },
-
-  // {
-  //  "class": "sidebar_label",
-  //  "parents": [{"class": "tree_row", "attributes": ["expanded", "selected"]}],
-  //  "color": [217, 215, 206]
-  // },
-
-  {
-    "class": "sidebar_label",
-    "attributes": ["transient"],
-    "font.italic": false
-  },
-
-  // Hidden arrow icon before folder
-
-  {
-    "class": "disclosure_button_control",
-    "layer0.texture": "ayu/assets/arrow-right.png",
-    "layer0.tint": [62, 75, 89],
-    "layer0.opacity": 1,
-    "layer0.inner_margin": 0,
-    "content_margin": [12, 15]
-  },
-
-  {
-    "class": "disclosure_button_control",
-    "parents": [{ "class": "tree_row", "attributes": ["hover"]}],
-    "layer0.tint": [255, 204, 102]
-  },
-
-  {
-    "class": "disclosure_button_control",
-    "attributes": ["expanded"],
-    "layer0.texture": "ayu/assets/overflow-menu.png",
-    "content_margin": [12, 12]
-  },
-
-  {
-    "class": "disclosure_button_control",
-    "attributes": ["expanded"],
-    "parents": [{ "class": "tree_row", "attributes": ["hover"]}],
-    "layer0.tint": [255, 204, 102]
-  },
-
-  // Opened files
-  {
-    "class": "close_button",
-    "content_margin": [8, 8],
-
-  // Default Close icon
-    "layer0.texture": "ayu/assets/close.png",
-    "layer0.opacity": 0,
-    "layer0.inner_margin": [0, 0],
-    "layer0.tint": [115, 134, 153]
-  },
-
-
-  // Opened file hover
-
-  {
-    "class": "close_button",
-    "parents": [{ "class": "tree_row", "attributes": ["hover"] }],
-  // Default Close icon
-    "layer0.opacity": 0.6
-  },
-
-  {
-    "class": "close_button",
-    "attributes": ["dirty"],
-    "layer0.texture": "ayu/assets/dirty.png",
-    "layer0.tint": [115, 134, 153],
-    "layer0.opacity": 1.0
-  },
-
-  {
-    "class": "close_button",
-    "attributes": ["hover"],
-    "layer0.opacity": 1.0,
-    "layer0.tint": [255, 204, 102]
-  },
-
-
-  /* @ SCROLLBARS
-  * Scrollbars settings and behavioring
-  ========================================================================= */
-
-  // Normal Vertical scrollbar track
-  // !!!
-  {
-    "class": "scroll_bar_control",
-    "layer0.tint" : [33, 39, 51],
-    "layer0.opacity": 1,
-    "layer0.inner_margin": [0, 0],
-    "blur": false
-  },
-
-  // Normal Vertical scrollbar track inside overlay panel
-
-  {
-    "class": "scroll_bar_control",
-    "parents": [{"class": "overlay_control"}],
-    "layer0.tint": [33, 39, 51, 0],
-    "layer0.opacity": 1.0,
-    "layer0.inner_margin": [0, 2],
-    "blur": false
-  },
-
-  // Normal horizontal scrollbar track
-
-  {
-    "class": "scroll_bar_control",
-    "attributes": ["horizontal"],
-    "layer0.texture": "",
-    "layer0.tint" : [33, 39, 51],
-    "layer0.inner_margin": [0, 0],
-    "blur": false
-  },
-
-  // Normal horizontal scrollbar track inside overlay panel
-  // !!!
-  // {
-  //  "class": "scroll_bar_control",
-  //  "attributes": ["horizontal"],
-  //  "parents": [{"class": "overlay_control"}],
-  //  "layer0.tint": [33, 39, 51, 0],
-  //  "layer0.opacity": 0.0,
-  //  "layer0.inner_margin": [0, 2],
-  //  "blur": false
-  //  },
-
-  // Scrollbars corner
-
-  {
-    "class": "scroll_corner_control",
-    "layer0.texture": "",
-    "layer0.tint":[33, 39, 51],
-    "layer0.inner_margin": [0, 0],
-    "layer0.opacity": 1,
-    "blur": false
-  },
-
-  // Vertical puck controller
-
-  {
-    "class": "puck_control",
-    "layer0.texture": "",
-    "layer0.tint": [255, 255, 255, 50],
-    "layer0.opacity": 1,
-    "layer0.inner_margin": [0, 0],
-    "content_margin": [1, 12],
-    "blur": false
-  },
-
-  // Horizontal puck controller
-
-  {
-    "class": "puck_control",
-    "attributes": ["horizontal"],
-    "layer0.texture": "",
-    "layer0.tint": [255, 255, 255, 50],
-    "layer0.inner_margin": [0, 0],
-    "content_margin": [12, 1],
-    "blur": false
-  },
-
-  {
-    "class": "scroll_area_control",
-    "settings": ["overlay_scroll_bars"],
-    "overlay": true
-  },
-
-  {
-    "class": "scroll_area_control",
-    "settings": ["!overlay_scroll_bars"],
-    "overlay": false // set to false for the original behavior
-  },
-
-
-  {
-    "class": "scroll_area_control",
-    "parents": [{"class": "overlay_control"}],
-    "settings": ["overlay_scroll_bars"],
-    "overlay": true // set to false for the original behavior
-  },
-
-  {
-    "class": "scroll_area_control",
-    "parents": [{"class": "sidebar_container"}],
-    "settings": ["!overlay_scroll_bars"],
-    "overlay": false // set to false for the original behavior
-  },
-
-  {
-    "class": "scroll_bar_control",
-    "settings": ["overlay_scroll_bars"],
-    "layer0.tint": [28, 31, 38],
-    "layer0.inner_margin": [0, 5],
-    "blur": false
-  },
-
-  {
-    "class": "scroll_bar_control",
-    "settings": ["overlay_scroll_bars"],
-    "attributes": ["horizontal"],
-    "layer0.inner_margin": [5, 0],
-    "blur": true
-  },
-
-
-  /* @ MINIMAP
-  * Minimap settings and behavioring
-  ========================================================================= */
-
-  {
-    "class": "minimap_control",
-    "settings": ["always_show_minimap_viewport"],
-    "viewport_color": [100, 100, 100]
-  },
-
-  {
-    "class": "minimap_control",
-    "settings": ["!always_show_minimap_viewport"],
-    "viewport_color": [100, 100, 100, 20]
-  },
-
-
-  /* @ STATUS BAR
-  * Status bar settings and behavioring
-  ========================================================================= */
-
-  // All labels
-
-  {
-    "class": "label_control",
-    "color": [115, 134, 153],
-    "shadow_color": [0, 0, 0, 0],
-    "shadow_offset": [0, 0],
-    "font.bold": false,
-    "font.face": "Roboto mono",
-    "font.size": 12
-  },
-  {
-    "class": "label_control",
-    "settings": ["ui_font_source_code_pro"],
-    "font.face": "Source Code Pro"
-  },
-  {
-    "class": "label_control",
-    "settings": ["ui_font_default"],
-    "font.face": ""
-  },
-
-  // Status bar labels
-
-  {
-    "class": "label_control",
-    "parents": [{"class": "status_bar"}],
-    "color": [115, 134, 153],
-    "font.bold": false
-  },
-
-  // Text field labels
-
-  {
-    "class": "status_bar",
-    "layer0.texture": "",
-    "layer0.tint": [33, 39, 51],
-    "layer0.opacity": 1,
-    "layer1.texture": "ayu/assets/separator-top.png",
-    "layer1.inner_margin": [1, 2, 1, 0],
-    "content_margin": [10, 5]
-  },
-  {
-    "class": "status_bar",
-    "settings": ["ui_separator"],
-    "layer0.tint": [39, 45, 56]
-    // "layer1.opacity": 0.3
-  },
-
-  {
-    "class": "status_container",
-    "content_margin": [0, 5]
-  },
-
-  {
-    "class": "status_button",
-    "min_size": [100, 0]
-  },
-
-
-  /* @ WIDGET PANEL
-  * Widget, input, buttons settings and behavioring
-  ========================================================================= */
-
-
-  // Status bar panel
-  {
-    "class": "panel_control",
-    "layer0.tint": [33, 39, 51],
-    "layer0.opacity": 1.0,
-    "content_margin": [0, 5]
-  },
-  {
-    "class": "panel_control",
-    "settings": ["ui_separator"],
-    "layer0.tint": [39, 45, 56],
-    "layer1.texture": "ayu/assets/separator-top.png",
-    "layer1.tint": [115, 134, 153],
-    "layer1.inner_margin": [1, 2, 1, 0],
-    "layer1.opacity": 0.3
-  },
-
-  // Status bar panel close icon
-
-  {
-    "class": "panel_close_button",
-    "layer0.texture": "ayu/assets/close.png",
-    "layer0.opacity": 1.0,
-    "layer0.tint": [115, 134, 153],
-    "content_margin": [0, 0] // 8,8 to show
-  },
-  // !!!
-  {
-    "class": "panel_close_button",
-    "attributes": ["hover"],
-    "layer0.tint": [255, 204, 102]
-  },
-
-  // Texline input
-
-  {
-    "class": "text_line_control",
-    "layer0.texture": "ayu/assets/input-bg.png",
-    "layer0.opacity": 1,
-    "layer0.inner_margin": [10, 8],
-    "layer0.tint": [39, 45, 56],
-
-    "layer1.texture": "ayu/assets/input-border.png",
-    "layer1.opacity": 0.3,
-    "layer1.inner_margin": [10, 8],
-    "layer1.tint": [115, 134, 153],
-    "content_margin": [10, 7, 10, 5]
-  },
-
-
-  // Textline input inside overlay panels
-
-  {
-    "class": "text_line_control",
-    "parents": [{"class": "overlay_control"}],
-    "layer0.texture": "",
-    "layer0.opacity": 0,
-    "layer1.texture": "ayu/assets/input-search.png",
-    "layer1.opacity": 1,
-    "layer1.tint": [255, 204, 102],
-    "layer1.inner_margin": [35, 0, 0, 0],
-    "content_margin": [43, 7, 10, 4]
-  },
-
-  // Textline input oveflow menu
-  {
-    "class": "dropdown_button_control",
-    "content_margin": [12, 12],
-    "layer0.texture": "ayu/assets/overflow-menu.png",
-    "layer0.tint": [62, 75, 89],
-    "layer0.opacity": 1.0
-  },
-  {
-    "class": "dropdown_button_control",
-    "attributes": ["hover"],
-    "layer0.tint": [255, 204, 102]
-  },
-
-
-  /* @ BUTTONS
-  * Buttons panels settings and behavioring
-  ========================================================================= */
-
-
-  // Button labels
-
-  {
-    "class": "button_control",
-    "content_margin": [15, 9, 15, 10],
-    "min_size": [60, 0],
-    "layer0.tint": [255, 204, 102, 10],
-    "layer0.texture": "ayu/assets/input-bg.png",
-    "layer0.inner_margin": [10, 8],
-    "layer0.opacity": 0
-  },
-  {
-    "class": "button_control",
-    "attributes": ["hover"],
-    "layer0.opacity": 1
-  },
-
-  {
-    "class": "label_control",
-    "parents": [{"class": "button_control"}],
-    "color":  [115, 134, 153]
-  },
-
-  {
-    "class": "label_control",
-    "parents": [{"class": "button_control", "attributes": ["hover"]}],
-    "color":  [255, 204, 102]
-  },
-
-  // !!!
-  // Small Icon Buttons
-  {
-    "class": "icon_button_control",
-    "layer0.tint": [0, 0, 0],
-    "layer0.opacity": 0,
-    "layer2.tint": [217, 215, 206],
-    "layer2.opacity": { "target": 0.0, "speed": 10.0, "interpolation": "smoothstep" },
-    "content_margin": [10, 5]
-  },
-
-
-  /* Buttons icons settings
-  ===================================================================== */
-
-  // Regex Icon
-  {
-    "class": "icon_regex",
-    "layer0.texture": "ayu/assets/regex.png",
-    "layer0.tint": [115, 134, 153],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-  {
-    "class": "icon_regex",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [255, 204, 102]
-  },
-
-  // Preserve case sensitive
-
-  {
-    "class": "icon_case",
-    "layer0.texture": "ayu/assets/matchcase.png",
-    "layer0.tint": [115, 134, 153],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-  {
-    "class": "icon_case",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [255, 204, 102]
-  },
-
-  // Wholeword
-
-  {
-    "class": "icon_whole_word",
-    "layer0.texture": "ayu/assets/word.png",
-    "layer0.tint": [115, 134, 153],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-
-  {
-    "class": "icon_whole_word",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [255, 204, 102]
-  },
-
-  // Wrap
-
-  {
-    "class": "icon_wrap",
-    "layer0.texture": "ayu/assets/wrap.png",
-    "layer0.tint": [115, 134, 153],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-  {
-    "class": "icon_wrap",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [255, 204, 102]
-  },
-
-  // In selection
-
-  {
-    "class": "icon_in_selection",
-    "layer0.texture": "ayu/assets/inselection.png",
-    "layer0.tint": [115, 134, 153],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-  {
-    "class": "icon_in_selection",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [255, 204, 102]
-  },
-
-  // Highlight Result
-
-  {
-    "class": "icon_highlight",
-    "layer0.texture": "ayu/assets/highlight.png",
-    "layer0.tint": [115, 134, 153],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-  {
-    "class": "icon_highlight",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [255, 204, 102]
-  },
-
-  // Preserve Case
-
-  {
-    "class": "icon_preserve_case",
-    "layer0.texture": "ayu/assets/replace-preserve-case.png",
-    "layer0.tint": [115, 134, 153],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-  {
-    "class": "icon_preserve_case",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [255, 204, 102]
-  },
-
-  // Show context
-
-  {
-    "class": "icon_context",
-    "layer0.texture": "ayu/assets/context.png",
-    "layer0.tint": [115, 134, 153],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-
-  {
-    "class": "icon_context",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [255, 204, 102]
-  },
-
-  // Use buffer
-
-  {
-    "class": "icon_use_buffer",
-    "layer0.texture": "ayu/assets/buffer.png",
-    "layer0.tint": [115, 134, 153],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-  {
-    "class": "icon_use_buffer",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [255, 204, 102]
-  },
-
-  // Reverse direction
-
-  {
-    "class": "icon_reverse",
-    "layer0.texture": "ayu/assets/reverse.png",
-    "layer0.tint": [115, 134, 153],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-  {
-    "class": "icon_reverse",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": [255, 204, 102]
-  },
-
-
-  /* Visual settings
-  ===================================================================== */
-
-  // UI font sizees
-  // ==============
-  {
-    "class": "tab_label",
-    "settings": ["ui_font_size_small"],
-    "font.size": 11
-  },
-  {
-    "class": "sidebar_label",
-    "settings": ["ui_font_size_small"],
-    "font.size": 11
-  },
-  {
-    "class": "label_control",
-    "settings": ["ui_font_size_small"],
-    "font.size": 11
-  },
-  {
-    "class": "tool_tip_label_control",
-    "settings": ["ui_font_size_small"],
-    "font.size": 11
-  }
-]
diff --git a/gulpfile.js b/gulpfile.js
index 35eb84b1..a7e3cb19 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -6,10 +6,16 @@ const yaml = require('yamljs')
 const fs = require('fs-jetpack')
 const exec = require('gulp-exec')
 const through = require('through2')
+const clearRequire = require('clear-require')
 
 const hexRx = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i
 
-_.templateSettings.interpolate = /"{([\s\S]+?)}"/g;
+_.templateSettings.interpolate = /"{([\s\S]+?)}"/g
+
+function colors(path) {
+  clearRequire(`./src/themes/${path}`)
+  return require(`./src/themes/${path}`)
+}
 
 function templates (type) {
   return fs.find('./src/templates', { matching: '*' + type })
@@ -30,26 +36,6 @@ function fileNmae (str, theme) {
   return path.join(process.cwd(), name)
 }
 
-function tryRbg (hex) {
-  const n16 = (c) => parseInt(c, 16)
-  const isRgb = hexRx.test(hex)
-  const cs = isRgb ? hexRx.exec(hex) : []
-  const rgb = `${n16(cs[1])}, ${n16(cs[2])}, ${n16(cs[3])}`
-  return isRgb ? { hex, rgb } : hex
-}
-
-function convertColors (obj) {
-  return _.mapValues(obj, col => {
-    return _.isString(col) ? tryRbg(col) : convertColors(col)
-  })
-}
-
-function colors (file) {
-  const content = file.contents.toString('ascii')
-  const defs = yaml.parse(content)
-  return convertColors(defs)
-}
-
 function build (types, defs) {
   const base = process.cwd()
   const themes = _.concat([], types).map(templates)
@@ -61,15 +47,13 @@ function build (types, defs) {
 }
 
 function widgets (file, enc, next) {
-  const defs = colors(file)
-  build(['widget.xml', 'widget.json'],  defs)
+  build(['widget.xml', 'widget.json'], colors(file.relative))
     .map(this.push.bind(this))
   next()
 }
 
 function themes (file, enc, next) {
-  const defs = colors(file)
-  build(['syntax.xml', 'ui.json'], defs)
+  build(['syntax.xml', 'ui.json'], colors(file.relative))
     .map(this.push.bind(this))
   next()
 }
@@ -80,17 +64,19 @@ gulp.task('clean', () => {
 })
 
 gulp.task('widgets', () =>
-  gulp.src('./src/themes/*.yml')
+  gulp.src('./src/themes/!(color).js')
     .pipe(through.obj(widgets))
     .pipe(gulp.dest('./widgets'))
 )
 
 gulp.task('themes', () =>
-  gulp.src('./src/themes/*.yml')
+  gulp.src('./src/themes/!(color).js')
     .pipe(through.obj(themes))
     .pipe(gulp.dest('./'))
 )
 
-gulp.task('default', ['themes', 'widgets'])
+gulp.task('watch', () =>
+  gulp.watch('./src/**/*', ['themes', 'widgets'])
+)
 
-gulp.task('watch', () => gulp.watch('./src/**/*', ['themes', 'widgets']))
+gulp.task('default', ['themes', 'widgets'])
diff --git a/messages.json b/messages.json
index f4370548..ad1561c6 100644
--- a/messages.json
+++ b/messages.json
@@ -24,5 +24,6 @@
   "3.1.6": "messages/3.1.6.md",
   "3.1.8": "messages/3.1.8.md",
   "3.2.0": "messages/3.2.0.md",
-  "3.2.1": "messages/3.2.1.md"
+  "3.2.1": "messages/3.2.1.md",
+  "4.0.0": "messages/4.0.0.md"
 }
diff --git a/messages/4.0.0.md b/messages/4.0.0.md
new file mode 100644
index 00000000..6fa798f3
--- /dev/null
+++ b/messages/4.0.0.md
@@ -0,0 +1,22 @@
+**ayu theme for Sublime Text**
+https://github.com/dempfi/ayu/releases
+
+********************************************************************************
+ayu from version 3.0.0 supports customization via A File Icon package
+(https://github.com/ihodev/a-file-icon). Please install it for better expereince.
+********************************************************************************
+
+# Version 4.0.0
+
+🎉 Comepletely updated UI themes
+🎉 Redrawn icons
+...and a lot of minor changes
+
+Breaking changes:
+*******************************************************
+- Default UI font is no longer Roboto Mono but the system font. To have
+  Roboto Mono again use `ui_font_roboto_mono: true` setting.
+
+- Ayu no longer supports Sublime Text version 2 since version 3
+  is officially released.
+
diff --git a/package.json b/package.json
index 33d8e00e..84b864e5 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
   },
   "scripts": {
     "watch": "gulp watch",
-    "b": "gulp",
+    "build": "gulp",
     "c": "gulp clean"
   },
   "homepage": "https://github.com/dempfi/ayu#readme",
@@ -24,6 +24,10 @@
     "lodash": "^4.16.4",
     "through2": "^2.0.1",
     "vinyl": "^2.0.0",
-    "yamljs": "^0.2.8"
+    "yamljs": "^0.2.8",
+    "clear-require": "^2.0.0",
+    "color": "^2.0.0"
+  },
+  "dependencies": {
   }
 }
diff --git a/src/templates/sublime.syntax.xml b/src/templates/sublime.syntax.xml
index 0a9e07f3..abff4aa9 100644
--- a/src/templates/sublime.syntax.xml
+++ b/src/templates/sublime.syntax.xml
@@ -16,37 +16,37 @@
 			<key>settings</key>
 			<dict>
 				<key>accent</key>
-				<string>#"{common.accent.hex}"</string>
+				<string>"{common.accent.hex}"</string>
 				<key>activeGuide</key>
-				<string>#"{syntax.active_guide.hex}"</string>
+				<string>"{editor.guide.active.hex}"</string>
 				<key>background</key>
-				<string>#"{common.bg.hex}"</string>
+				<string>"{common.bg.hex}"</string>
 				<key>caret</key>
-				<string>#"{common.accent.hex}"</string>
+				<string>"{common.accent.hex}"</string>
 				<key>findHighlight</key>
-				<string>#"{syntax.constant.hex}"</string>
+				<string>"{common.accent.hex}"</string>
 				<key>findHighlightForeground</key>
-				<string>#"{common.bg.hex}"</string>
+				<string>"{common.bg.hex}"</string>
 				<key>foreground</key>
-				<string>#"{common.fg.hex}"</string>
+				<string>"{common.fg.hex}"</string>
 				<key>guide</key>
-				<string>#"{syntax.gutter.hex}"</string>
+				<string>"{editor.guide.normal.hex}"</string>
 				<key>gutter</key>
-				<string>#"{common.bg.hex}"</string>
+				<string>"{common.bg.hex}"</string>
 				<key>gutterForeground</key>
-				<string>#"{syntax.gutter.hex}"</string>
+				<string>"{editor.gutter.hex}"</string>
 				<key>inactiveBackground</key>
-				<string>#"{common.bg.hex}"</string>
+				<string>"{common.bg.hex}"</string>
 				<key>inactiveSelection</key>
-				<string>#"{syntax.selection.hex}"88</string>
+				<string>"{editor.selection.inactive.hex}"</string>
 				<key>invisibles</key>
-				<string>#"{syntax.gutter.hex}"</string>
+				<string>"{editor.gutter.hex}"</string>
 				<key>lineHighlight</key>
-				<string>#"{syntax.line.hex}"</string>
+				<string>"{editor.line.hex}"</string>
 				<key>popupCss</key>
 				<string>html, body {
-  background-color: #"{ui.panel.bg.hex}";
-  color: #"{common.fg.hex}";
+  background-color: "{ui.panel.bg.hex}";
+  color: "{common.fg.hex}";
 }
 body {
   padding: 1px 3px;
@@ -56,13 +56,13 @@ a {
 }
 </string>
 				<key>selection</key>
-				<string>#"{syntax.selection.hex}"</string>
+				<string>"{editor.selection.bg.hex}"</string>
 				<key>selectionBorder</key>
-				<string>#"{syntax.selection.hex}"</string>
+				<string>"{editor.selection.border.hex}"</string>
 				<key>shadow</key>
 				<string>#00000010</string>
 				<key>stackGuide</key>
-				<string>#"{syntax.stack_guide.hex}"</string>
+				<string>"{editor.guide.stack.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -75,7 +75,7 @@ a {
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
-				<string>#"{syntax.comment.hex}"</string>
+				<string>"{syntax.comment.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -86,7 +86,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{common.fg.hex}"</string>
+				<string>"{common.fg.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -97,7 +97,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.string.hex}"</string>
+				<string>"{syntax.string.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -108,7 +108,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.constant.hex}"</string>
+				<string>"{common.accent.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -119,7 +119,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.regexp.hex}"</string>
+				<string>"{syntax.regexp.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -130,7 +130,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.constant.hex}"</string>
+				<string>"{common.accent.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -141,7 +141,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.constant.hex}"</string>
+				<string>"{common.accent.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -163,7 +163,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.keyword.hex}"</string>
+				<string>"{syntax.keyword.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -174,7 +174,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.operator.hex}"</string>
+				<string>"{syntax.operator.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -185,7 +185,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{common.fg.hex}"CC</string>
+				<string>"{common.fg.hex}"CC</string>
 			</dict>
 		</dict>
 		<dict>
@@ -196,7 +196,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{common.fg.hex}"</string>
+				<string>"{common.fg.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -207,7 +207,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.operator.hex}"</string>
+				<string>"{syntax.operator.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -218,7 +218,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{common.fg.hex}"CC</string>
+				<string>"{common.fg.hex}"CC</string>
 			</dict>
 		</dict>
 		<dict>
@@ -229,7 +229,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.special.hex}"</string>
+				<string>"{syntax.special.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -240,7 +240,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.keyword.hex}"</string>
+				<string>"{syntax.keyword.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -251,7 +251,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.keyword.hex}"</string>
+				<string>"{syntax.keyword.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -262,7 +262,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.func.hex}"</string>
+				<string>"{syntax.func.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -273,7 +273,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.entity.hex}"</string>
+				<string>"{syntax.entity.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -286,7 +286,7 @@ a {
 				<key>fontStyle</key>
 				<string>underline</string>
 				<key>foreground</key>
-				<string>#"{syntax.entity.hex}"</string>
+				<string>"{syntax.entity.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -297,7 +297,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.constant.hex}"</string>
+				<string>"{common.accent.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -310,7 +310,7 @@ a {
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
-				<string>#"{syntax.tag.hex}"</string>
+				<string>"{syntax.tag.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -321,7 +321,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.tag.hex}"</string>
+				<string>"{syntax.tag.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -332,7 +332,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.tag.hex}"90</string>
+				<string>"{syntax.tag.hex}"90</string>
 			</dict>
 		</dict>
 		<dict>
@@ -343,7 +343,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.func.hex}"</string>
+				<string>"{syntax.func.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -354,7 +354,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.func.hex}"</string>
+				<string>"{syntax.func.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -365,7 +365,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.markup.hex}"</string>
+				<string>"{syntax.markup.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -378,7 +378,7 @@ a {
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
-				<string>#"{syntax.operator.hex}"</string>
+				<string>"{syntax.operator.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -391,7 +391,7 @@ a {
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
-				<string>#"{syntax.tag.hex}"</string>
+				<string>"{syntax.tag.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -402,7 +402,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.error.hex}"</string>
+				<string>"{syntax.error.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -413,7 +413,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#"{syntax.keyword.hex}"</string>
+				<string>"{syntax.keyword.hex}"</string>
 				<key>foreground</key>
 				<string>#FFFFFF</string>
 			</dict>
@@ -437,7 +437,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.func.hex}"</string>
+				<string>"{syntax.func.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -448,7 +448,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.entity.hex}"</string>
+				<string>"{syntax.entity.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -459,7 +459,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.comment.hex}"</string>
+				<string>"{syntax.comment.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -472,7 +472,7 @@ a {
 				<key>fontStyle</key>
 				<string>normal</string>
 				<key>foreground</key>
-				<string>#"{syntax.tag.hex}"</string>
+				<string>"{syntax.tag.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -483,7 +483,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.comment.hex}"</string>
+				<string>"{syntax.comment.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -494,7 +494,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.keyword.hex}"</string>
+				<string>"{syntax.keyword.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -505,7 +505,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.string.hex}"</string>
+				<string>"{syntax.string.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -514,7 +514,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.error.hex}"</string>
+				<string>"{syntax.error.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -525,7 +525,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.tag.hex}"</string>
+				<string>"{syntax.tag.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -536,7 +536,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.tag.hex}"</string>
+				<string>"{syntax.tag.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -547,7 +547,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.tag.hex}"</string>
+				<string>"{syntax.tag.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -558,7 +558,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.tag.hex}"</string>
+				<string>"{syntax.tag.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -569,7 +569,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.tag.hex}"</string>
+				<string>"{syntax.tag.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -580,7 +580,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.tag.hex}"</string>
+				<string>"{syntax.tag.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -591,7 +591,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.tag.hex}"</string>
+				<string>"{syntax.tag.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -602,7 +602,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.tag.hex}"</string>
+				<string>"{syntax.tag.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -613,7 +613,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.tag.hex}"</string>
+				<string>"{syntax.tag.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -626,7 +626,7 @@ a {
 				<key>fontStyle</key>
 				<string>bold</string>
 				<key>foreground</key>
-				<string>#"{syntax.keyword.hex}"</string>
+				<string>"{syntax.keyword.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -639,7 +639,7 @@ a {
 				<key>fontStyle</key>
 				<string>italic underline</string>
 				<key>foreground</key>
-				<string>#"{syntax.regexp.hex}"</string>
+				<string>"{syntax.regexp.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -650,7 +650,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.func.hex}"</string>
+				<string>"{syntax.func.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -663,7 +663,7 @@ a {
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
-				<string>#"{syntax.markup.hex}"</string>
+				<string>"{syntax.markup.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -676,7 +676,7 @@ a {
 				<key>fontStyle</key>
 				<string>bold</string>
 				<key>foreground</key>
-				<string>#"{syntax.markup.hex}"</string>
+				<string>"{syntax.markup.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -698,7 +698,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#"{common.fg.hex}"07</string>
+				<string>"{common.fg.hex}"07</string>
 			</dict>
 		</dict>
 		<dict>
@@ -709,7 +709,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#"{common.fg.hex}"10</string>
+				<string>"{common.fg.hex}"10</string>
 			</dict>
 		</dict>
 		<dict>
@@ -720,11 +720,11 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#"{common.fg.hex}"10</string>
+				<string>"{common.fg.hex}"10</string>
 				<key>fontStyle</key>
 				<string>bold</string>
 				<key>foreground</key>
-				<string>#"{syntax.comment.hex}"</string>
+				<string>"{syntax.comment.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -737,7 +737,7 @@ a {
 				<key>fontStyle</key>
 				<string>italic</string>
 				<key>foreground</key>
-				<string>#"{syntax.constant.hex}"</string>
+				<string>"{common.accent.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -748,7 +748,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.regexp.hex}"</string>
+				<string>"{syntax.regexp.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -759,7 +759,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.string.hex}"</string>
+				<string>"{syntax.string.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -770,7 +770,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.tag.hex}"</string>
+				<string>"{syntax.tag.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -781,7 +781,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.error.hex}"</string>
+				<string>"{syntax.markup.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -792,7 +792,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.special.hex}"</string>
+				<string>"{syntax.special.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -803,9 +803,9 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#"{common.fg.hex}"10</string>
+				<string>"{common.fg.hex}"10</string>
 				<key>foreground</key>
-				<string>#"{syntax.tag.hex}"</string>
+				<string>"{syntax.tag.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -816,7 +816,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.operator.hex}"</string>
+				<string>"{syntax.operator.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -827,7 +827,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.comment.hex}"</string>
+				<string>"{syntax.comment.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -838,9 +838,9 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#"{common.fg.hex}"10</string>
+				<string>"{common.fg.hex}"10</string>
 				<key>foreground</key>
-				<string>#"{common.fg.hex}"</string>
+				<string>"{common.fg.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -851,9 +851,9 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#"{common.fg.hex}"10</string>
+				<string>"{common.fg.hex}"10</string>
 				<key>foreground</key>
-				<string>#"{syntax.comment.hex}"</string>
+				<string>"{syntax.comment.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -864,7 +864,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.comment.hex}"</string>
+				<string>"{syntax.comment.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -875,7 +875,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.string.hex}"</string>
+				<string>"{syntax.string.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -886,7 +886,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.tag.hex}"</string>
+				<string>"{syntax.tag.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -897,7 +897,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.error.hex}"</string>
+				<string>"{syntax.error.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -908,7 +908,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.comment.hex}"</string>
+				<string>"{common.ui.fade30.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -919,7 +919,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.comment.hex}"</string>
+				<string>"{common.ui.fade30.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -941,7 +941,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#"{syntax.tag.hex}"</string>
+				<string>"{syntax.tag.hex}"</string>
 				<key>foreground</key>
 				<string>#FFFFFF</string>
 			</dict>
@@ -954,7 +954,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#"{syntax.string.hex}"</string>
+				<string>"{syntax.string.hex}"</string>
 				<key>foreground</key>
 				<string>#FFFFFF</string>
 			</dict>
@@ -967,7 +967,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#"{syntax.keyword.hex}"</string>
+				<string>"{syntax.keyword.hex}"</string>
 				<key>foreground</key>
 				<string>#FFFFFF</string>
 			</dict>
@@ -980,7 +980,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#"{syntax.markup.hex}"</string>
+				<string>"{syntax.markup.hex}"</string>
 				<key>foreground</key>
 				<string>#FFFFFF</string>
 			</dict>
@@ -993,7 +993,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.tag.hex}"</string>
+				<string>"{syntax.tag.hex}"</string>
 			</dict>
 		</dict>
 		<dict>
@@ -1015,7 +1015,7 @@ a {
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#"{syntax.error.hex}"</string>
+				<string>"{syntax.error.hex}"</string>
 			</dict>
 		</dict>
 	</array>
diff --git a/src/templates/sublime.syntax.yml b/src/templates/sublime.syntax.yml
index c4423c0a..6ef96ee8 100644
--- a/src/templates/sublime.syntax.yml
+++ b/src/templates/sublime.syntax.yml
@@ -13,28 +13,28 @@ semanticClass: ayu."{theme}"
 settings:
 
 - settings:
-    activeGuide: '#"{syntax.active_guide.hex}"'
-    background: &bg '#"{common.bg.hex}"'
+    background: &bg '"{common.bg.hex}"'
     inactiveBackground: *bg
-    caret: &accent '#"{common.accent.hex}"'
-    findHighlight: &constant '#"{syntax.constant.hex}"'
+    caret: &accent '"{common.accent.hex}"'
+    findHighlight: &constant '"{common.accent.hex}"'
     findHighlightForeground: *bg
-    foreground: &fg '#"{common.fg.hex}"'
-    guide: &gutter '#"{syntax.gutter.hex}"'
+    foreground: &fg '"{common.fg.hex}"'
     accent: *accent
     gutter: *bg
-    gutterForeground: *gutter
+    gutterForeground: &gutter '"{editor.gutter.hex}"'
     invisibles: *gutter
-    lineHighlight: '#"{syntax.line.hex}"'
-    selection: &selection '#"{syntax.selection.hex}"'
-    selectionBorder: *selection
-    inactiveSelection: '#"{syntax.selection.hex}"88'
+    lineHighlight: '"{editor.line.hex}"'
     shadow: '#00000010'
-    stackGuide: '#"{syntax.stack_guide.hex}"'
+    selection: '"{editor.selection.bg.hex}"'
+    selectionBorder: '"{editor.selection.border.hex}"'
+    inactiveSelection: '"{editor.selection.inactive.hex}"'
+    guide: '"{editor.guide.normal.hex}"'
+    activeGuide: '"{editor.guide.active.hex}"'
+    stackGuide: '"{editor.guide.stack.hex}"'
     popupCss: |
         html, body {
-          background-color: #"{ui.panel.bg.hex}";
-          color: #"{common.fg.hex}";
+          background-color: "{ui.panel.bg.hex}";
+          color: "{common.fg.hex}";
         }
         body {
           padding: 1px 3px;
@@ -47,7 +47,7 @@ settings:
   scope: comment, punctuation.definition.comment
   settings:
     fontStyle: italic
-    foreground: &comment '#"{syntax.comment.hex}"'
+    foreground: &comment '"{syntax.comment.hex}"'
 
 - name: Variable
   scope: variable
@@ -57,7 +57,7 @@ settings:
 - name: String
   scope: string, constant.other.symbol
   settings:
-    foreground: &string '#"{syntax.string.hex}"'
+    foreground: &string '"{syntax.string.hex}"'
 
 - name: Number
   scope: constant.numeric
@@ -67,7 +67,7 @@ settings:
 - name: Regular Expressions and Escape Characters
   scope: string.regexp, constant.character.escape
   settings:
-    foreground: &regexp '#"{syntax.regexp.hex}"'
+    foreground: &regexp '"{syntax.regexp.hex}"'
 
 - name: Built-in constant
   scope: constant.language
@@ -87,17 +87,17 @@ settings:
 - name: Keyword
   scope: keyword - keyword.operator, keyword.operator.word
   settings:
-    foreground: &keyword '#"{syntax.keyword.hex}"'
+    foreground: &keyword '"{syntax.keyword.hex}"'
 
 - name: Operators
   scope: keyword.operator
   settings:
-    foreground: &operator '#"{syntax.operator.hex}"'
+    foreground: &operator '"{syntax.operator.hex}"'
 
 - name: Punctuation
   scope: punctuation.separator, punctuation.terminator
   settings:
-    foreground: '#"{common.fg.hex}"CC'
+    foreground: '"{common.fg.hex}"CC'
 
 - name: Punctuation
   scope: punctuation.section
@@ -112,13 +112,13 @@ settings:
 - name: Annotation Punctuation
   scope: punctuation.definition.annotation
   settings:
-    foreground: '#"{common.fg.hex}"CC'
+    foreground: '"{common.fg.hex}"CC'
 
 - name: JavaScript Dollar
   scope: variable.other.dollar.only.js, variable.other.object.dollar.only.js, variable.type.dollar.only.js,
     support.class.dollar.only.js
   settings:
-    foreground: &special '#"{syntax.special.hex}"'
+    foreground: &special '"{syntax.special.hex}"'
 
 - name: Storage
   scope: storage
@@ -133,12 +133,12 @@ settings:
 - name: Function name
   scope: entity.name.function
   settings:
-    foreground: &function '#"{syntax.func.hex}"'
+    foreground: &function '"{syntax.func.hex}"'
 
 - name: Entity name
   scope: entity.name - (entity.name.section | entity.name.tag | entity.name.label)
   settings:
-    foreground: &entity '#"{syntax.entity.hex}"'
+    foreground: &entity '"{syntax.entity.hex}"'
 
 - name: Inherited class
   scope: entity.other.inherited-class
@@ -155,7 +155,7 @@ settings:
   scope: variable.language
   settings:
     fontStyle: italic
-    foreground: &tag '#"{syntax.tag.hex}"'
+    foreground: &tag '"{syntax.tag.hex}"'
 
 - name: Tag
   scope: entity.name.tag, meta.tag.sgml
@@ -165,7 +165,7 @@ settings:
 - name: Tag start/end
   scope: punctuation.definition.tag.end, punctuation.definition.tag.begin, punctuation.definition.tag
   settings:
-    foreground: '#"{syntax.tag.hex}"90' # opacity of tag verson of &tag_punctag
+    foreground: '"{syntax.tag.hex}"90' # opacity of tag verson of &tag_punctag
 
 - name: Tag attribute
   scope: entity.other.attribute-name
@@ -180,7 +180,7 @@ settings:
 - name: Library function
   scope: support.function, support.macro
   settings:
-    foreground: &markup '#"{syntax.markup.hex}"'
+    foreground: &markup '"{syntax.markup.hex}"'
 
 - name: Library constant
   scope: support.constant
@@ -197,7 +197,7 @@ settings:
 - name: Invalid
   scope: invalid
   settings:
-    foreground: &error '#"{syntax.error.hex}"'
+    foreground: &error '"{syntax.error.hex}"'
 
 - name: Invalid deprecated
   scope: invalid.deprecated
@@ -337,17 +337,17 @@ settings:
 - name: Markup Code
   scope: markup.raw
   settings:
-    background: '#"{common.fg.hex}"07'
+    background: '"{common.fg.hex}"07'
 
 - name: Markup Code Inline
   scope: markup.raw.inline
   settings:
-    background: '#"{common.fg.hex}"10'
+    background: '"{common.fg.hex}"10'
 
 - name: Markdown Separator
   scope: meta.separator
   settings:
-    background: '#"{common.fg.hex}"10'
+    background: '"{common.fg.hex}"10'
     fontStyle: bold
     foreground: *comment
 
@@ -375,7 +375,7 @@ settings:
 - name: Markup Deleted
   scope: markup.deleted
   settings:
-    foreground: *error
+    foreground: *markup
 
 - name: Markup Strike
   scope: markup.strike
@@ -385,7 +385,7 @@ settings:
 - name: Markup Table
   scope: markup.table
   settings:
-    background: '#"{common.fg.hex}"10'
+    background: '"{common.fg.hex}"10'
     foreground: *tag
 
 - name: Markup Raw Inline
@@ -401,13 +401,13 @@ settings:
 - name: Markdown - Raw Block Fenced
   scope: markup.raw.block.fenced.markdown
   settings:
-    background: '#"{common.fg.hex}"10'
+    background: '"{common.fg.hex}"10'
     foreground: *fg
 
 - name: Markdown - Fenced Bode Block
   scope: punctuation.definition.fenced.markdown, variable.language.fenced.markdown
   settings:
-    background: '#"{common.fg.hex}"10'
+    background: '"{common.fg.hex}"10'
     foreground: *comment
 
 - name: Markdown - Fenced Language
@@ -434,12 +434,12 @@ settings:
 - name: GitGutter Ignored
   scope: markup.ignored.git_gutter
   settings:
-    foreground: *comment
+    foreground: '"{common.ui.fade30.hex}"'
 
 - name: GitGutter Untracked
   scope: markup.untracked.git_gutter
   settings:
-    foreground: *comment
+    foreground: '"{common.ui.fade30.hex}"'
 
 - name: GutterColor
   scope: gutter_color
diff --git a/src/templates/sublime.ui.json b/src/templates/sublime.ui.json
index 61f81395..45170fed 100644
--- a/src/templates/sublime.ui.json
+++ b/src/templates/sublime.ui.json
@@ -8,9 +8,9 @@
    */
 
   {
-    "class" : "sheet_container_control",
-    "layer0.tint" : ["{common.bg.rgb}"],
-    "layer0.opacity" : 1
+    "class": "sheet_container_control",
+    "layer0.tint": ["{common.bg.rgb}"],
+    "layer0.opacity": 1
   },
 
 
@@ -21,7 +21,7 @@
   {
     "class": "grid_layout_control",
     "border_size": 0,
-    "border_color": ["{ui.grid_divider.rgb}"]
+    "border_color": ["{ui.separator.rgb}"]
   },
   {
     "class": "grid_layout_control",
@@ -60,7 +60,7 @@
     "layer0.texture": "ayu/assets/unfold.png",
     "layer0.opacity": 1.0,
     "layer0.inner_margin": 0,
-    "layer0.tint": ["{ui.fg.rgb}"],
+    "layer0.tint": ["{common.ui.rgb}"],
     "content_margin": [8, 6, 8, 6]
   },
 
@@ -96,7 +96,7 @@
 
   {
     "class": "auto_complete_label",
-    "fg": ["{ui.fg.rgb}"],
+    "fg": ["{common.ui.rgb}"],
     "match_fg": ["{common.accent.rgb}"],
     "selected_fg": ["{common.fg.rgb}"],
     "selected_match_fg": ["{common.accent.rgb}"],
@@ -105,7 +105,7 @@
 
   {
     "class": "table_row",
-    "layer0.tint": ["{ui.panel.row_bg.rgb}"],
+    "layer0.tint": ["{ui.panel.row.rgb}"],
     "layer0.opacity": 0.0
   },
 
@@ -129,8 +129,7 @@
 
   {
     "class": "tool_tip_label_control",
-    "color": ["{ui.fg.rgb}"],
-    "font.face": "Roboto mono",
+    "color": ["{common.ui.rgb}"],
     "font.size": 13
   },
   {
@@ -140,8 +139,8 @@
   },
   {
     "class": "tool_tip_label_control",
-    "settings": ["ui_font_default"],
-    "font.face": ""
+    "settings": ["ui_font_roboto_mono"],
+    "font.face": "Roboto mono"
   },
 
   /* OVERLAY PANELS
@@ -152,21 +151,21 @@
   {
     "class": "overlay_control",
     "layer0.texture": "ayu/assets/overlay-shadow.png",
-    "layer0.inner_margin": [25, 45, 25, 35],
-    "layer0.opacity": 1.0,
+    "layer0.inner_margin": [15, 35, 15, 25],
+    "layer0.opacity": 0.6,
     "layer0.tint": ["{ui.panel.shadow.rgb}"],
 
     "layer1.texture": "ayu/assets/overlay-border.png",
-    "layer1.inner_margin": [25, 45, 25, 35],
+    "layer1.inner_margin": [15, 35, 15, 25],
     "layer1.opacity": 1.0,
-    "layer1.tint": ["{common.fg.rgb}", 30],
+    "layer1.tint": ["{ui.panel.border.rgb}"],
 
     "layer2.texture": "ayu/assets/overlay-bg.png",
-    "layer2.inner_margin": [25, 45, 25, 35],
+    "layer2.inner_margin": [15, 35, 15, 25],
     "layer2.opacity": 1.0,
     "layer2.tint": ["{ui.panel.bg.rgb}"],
 
-    "content_margin": [20, 45, 20, 35]
+    "content_margin": [10, 35, 10, 20]
   },
 
   // Command Panel list item style (cmd + shift + p)
@@ -183,7 +182,7 @@
   {
     "class": "mini_quick_panel_row",
     "attributes": ["selected"],
-    "layer0.tint": ["{ui.panel.row_bg.rgb}"]
+    "layer0.tint": ["{ui.panel.row.rgb}"]
   },
 
   // Quick panel project setting (project manager) (cmd + ctrl + p)
@@ -215,79 +214,72 @@
   },
 
   // Quick panel (project) style inside overlay_control (cmd + shift + p)
-
   {
     "class": "quick_panel",
     "parents": [{"class": "overlay_control"}],
-    "row_padding": [20, 5],
+    "row_padding": [24, 8],
     "layer0.tint": ["{ui.panel.bg.rgb}"],
     "layer0.opacity": 1.0
   },
 
   // Quick Panel selected list item style
-
   {
     "class": "quick_panel_row",
     "attributes": ["selected"],
-    "layer0.tint": ["{ui.panel.row_bg.rgb}"]
+    "layer0.tint": ["{ui.panel.row.rgb}"]
   },
 
   // Panel labels
-
   {
     "class": "quick_panel_label",
-    "fg": ["{ui.fg.rgb}"],
+    "fg": ["{common.ui.rgb}"],
+    "font.bold": false,
     "match_fg": ["{common.accent.rgb}"],
     "selected_fg": ["{common.fg.rgb}"],
     "selected_match_fg": ["{common.accent.rgb}"]
   },
 
   // Panel labels
-
   {
     "class": "quick_panel_label",
     "parents": [{"class": "overlay_control"}],
-    "fg": ["{ui.fg.rgb}"],
+    "fg": ["{common.ui.rgb}"],
     "match_fg": ["{common.accent.rgb}"],
     "selected_fg": ["{common.fg.rgb}"],
     "selected_match_fg": ["{common.accent.rgb}"]
   },
 
   // Panels sublabels
-
   {
     "class": "quick_panel_path_label",
-    "fg": ["{ui.panel.path_fg.rgb}"],
-    "match_fg": ["{common.fg.rgb}"],
-    "selected_fg": ["{ui.fg.rgb}"],
-    "selected_match_fg": ["{common.fg.rgb}"]
+    "fg": ["{common.ui.fade70.rgb}"],
+    "match_fg": ["{common.fg.fade80.rgb}"],
+    "selected_fg": ["{common.ui.fade70.rgb}"],
+    "selected_match_fg": ["{common.fg.fade80.rgb}"]
   },
 
   // Panels data / score
-
   {
     "class": "quick_panel_score_label",
-    "fg": ["{ui.fg.rgb}"],
-    "selected_fg": ["{ui.fg.rgb}"]
+    "fg": ["{common.ui.rgb}"],
+    "selected_fg": ["{common.accent.rgb}"]
   },
 
 
-
   /* TABS
    * Tabs settings and behavioring
    */
-
   {
     "class": "tabset_control",
     "mouse_wheel_switch": false,
     "tab_min_width": 50,
     "tab_overlap": 0,
-    "tab_height": 30,
+    "tab_height": 36,
     "tab_width": 50,
 
     "layer0.tint": ["{common.bg.rgb}"],
     "layer0.opacity": 1.0,
-    "content_margin": [0, 0] // <<<<<<<<<<<<<
+    "content_margin": [10, 0]
   },
   {
     "class": "tabset_control",
@@ -300,7 +292,7 @@
     "content_margin": [0, 0, 0, 0],
     "layer1.opacity": "{ui.opacity}",
     "layer1.texture": "ayu/assets/separator-bottom.png",
-    "layer1.tint": ["{ui.fg.rgb}"],
+    "layer1.tint": ["{ui.separator.rgb}"],
     "layer1.inner_margin": [1, 0, 1, 2]
   },
   {
@@ -309,103 +301,96 @@
     "settings": ["ui_separator", "!ui_native_titlebar"],
     "layer2.opacity": "{ui.opacity}",
     "layer2.texture": "ayu/assets/separator-top.png",
-    "layer2.tint": ["{ui.fg.rgb}"],
+    "layer2.tint": ["{ui.separator.rgb}"],
     "layer2.inner_margin": [1, 2, 1, 0]
   },
 
-  {
-    "class": "tabset_control",
-    "settings": ["ui_big_tabs"],
-    "tab_height": 40
-  },
-
   // Tabs
   {
     "class": "tab_control",
-
-    "layer0.tint": ["{common.bg.rgb}", 0],
+    // Background
+    "layer0.tint": ["{common.bg.rgb}"],
     "layer0.opacity": 1.0,
 
-    "layer1.texture": "",
+    // Top
+    "layer1.texture": "ayu/assets/separator-top.png",
+    "layer1.tint": ["{ui.separator.rgb}"],
+    "layer1.inner_margin": [0, 1, 0, 0],
+    "layer1.opacity": 0.0,
 
-    "layer2.texture": "ayu/assets/separator-bottom.png",
-    "layer2.tint": ["{common.accent.rgb}"],
-    "layer2.inner_margin": [1, 0, 1, 2],
+    // Right
+    "layer2.texture": "ayu/assets/separator-right.png",
+    "layer2.tint": ["{ui.separator.rgb}"],
+    "layer2.inner_margin": [0, 0, 1, 0],
     "layer2.opacity": 0.0,
 
-    "layer3.texture": "",
+    // Bottom
+    "layer3.texture": "ayu/assets/separator-bottom.png",
+    "layer3.tint": ["{ui.separator.rgb}"],
+    "layer3.inner_margin": [0, 0, 0, 1],
+    "layer3.opacity": 0.0,
 
-    "content_margin": [10, -2, 10, 0],
+    "content_margin": [15, -2, 15, 0],
     "max_margin_trim": 12
   },
   {
     "class": "tab_control",
     "settings": ["ui_separator"],
 
-    "layer1.texture": "ayu/assets/separator-right.png",
-    "layer1.tint": ["{ui.fg.rgb}"],
-    "layer1.inner_margin": [0, 1, 2, 1],
-    "layer1.opacity": "{ui.opacity}",
+    "layer1.opacity": 1.0,
 
-    "layer3.texture": "ayu/assets/separator-bottom.png",
-    "layer3.tint": ["{ui.fg.rgb}"],
-    "layer3.inner_margin": [1, 0, 1, 2],
-    "layer3.opacity": "{ui.opacity}"
-  },
-  {
-    "class": "tab_control",
-    "settings": ["ui_big_tabs"],
-    "content_margin": [15, -2, 15, 0]
+    "layer2.opacity": 1.0,
+
+    "layer3.opacity": 1.0
   },
 
   // Selected current tab
-
   {
     "class": "tab_control", "attributes": ["selected"],
-    "layer2.opacity": 1.0,
-    "layer3.opacity": 0.0
+    "settings": ["!ui_separator"],
+    "layer3.tint": ["{common.accent.rgb}"],
+    "layer3.opacity": 1.0
   },
   {
     "class": "tab_control", "attributes": ["selected"],
     "settings": ["ui_separator"],
-    "layer0.tint": ["{ui.fg.rgb}", 15]
+    "layer1.tint": ["{common.accent.rgb}"],
+    "layer3.opacity": 0.0
   },
 
   // Hovered current tab
-
   {
     "class": "tab_control", "attributes": ["hover"],
-    "layer2.opacity": 0.3
+    "settings": ["!ui_separator"],
+    "layer3.tint": ["{common.accent.rgb}"],
+    "layer3.opacity": 0.3
   },
   {
     "class": "tab_control", "attributes": ["hover"],
     "settings": ["ui_separator"],
-    "layer0.tint": ["{ui.fg.rgb}", 6],
+    "layer0.tint": ["{ui.separator.rgb}", 70],
   },
 
   // Selected current tab
-
   {
     "class": "tab_control", "attributes": ["selected", "hover"],
-    "layer2.opacity": 1.0
+    "settings": ["!ui_separator"],
+    "layer3.opacity": 1.0
   },
   {
     "class": "tab_control", "attributes": ["selected", "hover"],
     "settings": ["ui_separator"],
-    "layer0.tint": ["{ui.fg.rgb}", 15]
+    "layer0.tint": ["{common.bg.rgb}"]
   },
 
   // Tab Labels
 
   {
     "class": "tab_label",
-    "fg": ["{common.bg.rgb}", 0],
-    "shadow_color": ["{ui.fg.rgb}"],
-    "shadow_offset": [0, -1],
+    "fg": ["{common.ui.rgb}"],
     "font.italic": false,
     "font.bold": false,
-    "font.size": 12,
-    "font.face": "Roboto mono"
+    "font.size": 12
   },
   {
     "class": "tab_label",
@@ -414,28 +399,15 @@
   },
   {
     "class": "tab_label",
-    "settings": ["ui_font_default"],
-    "font.face": ""
+    "settings": ["ui_font_roboto_mono"],
+    "font.face": "Roboto mono"
   },
   {
     "class": "tab_label",
     "settings": ["highlight_modified_tabs"],
     "font.italic": true,
     "attributes": ["dirty"],
-    "shadow_color": ["{common.accent.rgb}"]
-  },
-  {
-    "class": "tab_label",
-    "fg": ["{ui.fg.rgb}"],
-    "settings": ["ui_fix_tab_labels"],
-    "shadow_color": ["{common.bg.rgb}", 0],
-    "shadow_offset": [0, 0]
-  },
-  {
-    "class": "tab_label",
-    "fg": ["{common.accent.rgb}"],
-    "attributes": ["dirty"],
-    "settings": ["ui_fix_tab_labels", "highlight_modified_tabs"]
+    "fg": ["{common.accent.rgb}"]
   },
 
   // Tab selected label color
@@ -443,17 +415,7 @@
   {
     "class": "tab_label",
     "parents": [{"class": "tab_control", "attributes": ["selected"]}],
-    "fg": ["{common.bg.rgb}", 0],
-    "shadow_color": ["{common.fg.rgb}"],
-    "shadow_offset": [0, -1],
-  },
-  {
-    "class": "tab_label",
-    "settings": ["ui_fix_tab_labels"],
-    "parents": [{"class": "tab_control", "attributes": ["selected"]}],
-    "fg": ["{common.fg.rgb}"],
-    "shadow_color": ["{common.bg.rgb}", 0],
-    "shadow_offset": [0, 0]
+    "fg": ["{common.fg.rgb}"]
   },
 
   {
@@ -469,12 +431,12 @@
 
   // Close Icon
     "layer0.texture": "ayu/assets/close.png",
-    "layer0.tint": ["{ui.fg.rgb}"],
+    "layer0.tint": ["{common.ui.rgb}"],
     "layer0.opacity": 1.0,
 
   // Dirty Icon
     "layer1.texture": "ayu/assets/dirty.png",
-    "layer1.tint": ["{ui.fg.rgb}"],
+    "layer1.tint": ["{common.ui.rgb}"],
     "layer1.opacity": 0,
   },
 
@@ -482,7 +444,7 @@
   {
     "class": "tab_close_button",
     "settings": ["show_tab_close_buttons"],
-    "content_margin": [8, 8]
+    "content_margin": [6, 8]
   },
 
   // Default hover
@@ -499,7 +461,7 @@
     "parents": [{"class": "tab_control", "attributes": ["dirty"]}],
     "layer0.opacity": 0, // Close Icon
     "layer1.opacity": 1.0, // dirty Icon
-    "content_margin": [8, 8]
+    "content_margin": [6, 8]
   },
 
   // Dirty tab on hover
@@ -534,7 +496,7 @@
     "class": "scroll_tabs_left_button",
     "content_margin": [12, 15],
     "layer0.texture": "ayu/assets/arrow-left.png",
-    "layer0.tint": ["{ui.folder.normal.rgb}"],
+    "layer0.tint": ["{ui.icon.rgb}"],
     "layer0.opacity": 1.0
   },
 
@@ -548,16 +510,16 @@
     "class": "scroll_tabs_right_button",
     "content_margin": [12, 15],
     "layer0.texture": "ayu/assets/arrow-right.png",
-    "layer0.tint": ["{ui.folder.normal.rgb}"],
+    "layer0.tint": ["{ui.icon.rgb}"],
     "layer0.opacity": 1.0
   },
   {
     "class": "scroll_tabs_right_button",
     "settings": ["ui_separator"],
     "layer2.texture": "ayu/assets/separator-right.png",
-    "layer2.tint": ["{ui.fg.rgb}"],
+    "layer2.tint": ["{ui.separator.rgb}"],
     "layer2.opacity": "{ui.opacity}",
-    "layer2.inner_margin" : [0, 1, 2, 1]
+    "layer2.inner_margin": [0, 1, 2, 1]
   },
 
   {
@@ -570,7 +532,7 @@
     "class": "show_tabs_dropdown_button",
     "content_margin": [12, 12],
     "layer0.texture": "ayu/assets/overflow-menu.png",
-    "layer0.tint": ["{ui.folder.normal.rgb}"],
+    "layer0.tint": ["{ui.icon.rgb}"],
     "layer0.opacity": 1.0,
     "layer0.inner_margin": [0, 0]
   },
@@ -588,7 +550,7 @@
 
   {
     "class": "sidebar_container",
-    "content_margin": [0, 4, 0, 0],
+    "content_margin": [0, 6, 0, 0],
     "layer0.opacity": 1,
     "layer0.tint": ["{common.bg.rgb}"]
   },
@@ -598,31 +560,22 @@
     "layer1.texture": "ayu/assets/separator-right.png",
     "layer1.inner_margin": [0, 1, 2, 1],
     "layer1.opacity": "{ui.opacity}",
-    "layer1.tint": ["{ui.fg.rgb}"]
-  },
-  {
-    "class": "sidebar_container",
-    "platforms": ["osx"],
-    "settings": ["ui_separator", "!ui_native_titlebar"],
-    "layer2.opacity": "{ui.opacity}",
-    "layer2.texture": "ayu/assets/separator-top.png",
-    "layer2.tint": ["{ui.fg.rgb}"],
-    "layer2.inner_margin": [1, 2, 1, 0]
+    "layer1.tint": ["{ui.separator.rgb}"],
   },
+
   {
     "class": "sidebar_tree",
     "indent_top_level": false,
     "row_padding": [20, 6],
     "dark_content": false,
     "spacer_rows": true,
-    "indent_offset": 0,
-    "indent": 12
+    "indent_offset": 2,
+    "indent": 10
   },
 
   {
     "class": "sidebar_heading",
-    "color": ["{ui.fg.rgb}"],
-    "font.face": "Roboto mono",
+    "color": ["{common.ui.fade60.rgb}"],
     "font.bold": true,
     "font.size": 11
   },
@@ -633,34 +586,33 @@
   },
   {
     "class": "sidebar_heading",
-    "settings": ["ui_font_default"],
-    "font.face": ""
+    "settings": ["ui_font_roboto_mono"],
+    "font.face": "Roboto mono"
   },
 
   {
     "class": "tree_row",
-    "layer1.texture": "ayu/assets/tree-highlight.png",
-    "layer1.tint": ["{ui.fg.rgb}", 50],
-    "layer1.inner_margin": [8, 4, 8, 4],
-    "layer1.opacity": 0
+    "layer0.texture": "ayu/assets/tree-highlight.png",
+    "layer0.tint": ["{ui.separator.rgb}"],
+    "layer0.inner_margin": [8, 4, 8, 4],
+    "layer0.opacity": 0
   },
 
   {
     "class": "tree_row",
-    "layer1.texture": "ayu/assets/tree-highlight-separators.png",
+    "layer0.texture": "ayu/assets/tree-highlight-separators.png",
     "settings": ["ui_separator"]
   },
 
   {
     "class": "tree_row",
     "attributes": ["selected"],
-    "layer1.opacity": 1
+    "layer0.opacity": 1
   },
 
   {
     "class": "sidebar_label",
-    "color": ["{ui.fg.rgb}"],
-    "font.face": "Roboto mono",
+    "color": ["{common.ui.rgb}"],
     "font.size": 12
   },
   {
@@ -670,8 +622,8 @@
   },
   {
     "class": "sidebar_label",
-    "settings": ["ui_font_default"],
-    "font.face": ""
+    "settings": ["ui_font_roboto_mono"],
+    "font.face": "Roboto mono"
   },
 
   {
@@ -689,7 +641,7 @@
   {
     "class": "sidebar_label",
     "parents": [{"class": "tree_row","attributes": ["expandable"]}],
-    "color": ["{ui.fg.rgb}"],
+    "color": ["{common.ui.rgb}"],
     "font.bold": false
   },
 
@@ -745,7 +697,7 @@
     "layer0.opacity": 0,
 
     "layer1.texture": "ayu/assets/folder.png",
-    "layer1.tint": ["{ui.folder.normal.rgb}"],
+    "layer1.tint": ["{ui.icon.rgb}"],
     "layer1.opacity": 1,
 
     "layer2.texture": "ayu/assets/folder-open.png",
@@ -829,11 +781,11 @@
     "class": "icon_folder_dup",
     "content_margin": [9, 9],
     "layer0.texture": "ayu/assets/folder.png",
-    "layer0.tint": ["{ui.folder.normal.rgb}"],
+    "layer0.tint": ["{ui.icon.rgb}"],
     "layer0.opacity": 1.0,
 
     "layer1.texture": "ayu/assets/folder-symlink.png",
-    "layer1.tint": ["{ui.fg.rgb}"],
+    "layer1.tint": ["{common.ui.rgb}"],
     "layer1.opacity": 0.3
   },
 
@@ -859,13 +811,13 @@
   // Opened files
   {
     "class": "close_button",
-    "content_margin": [8, 8],
+    "content_margin": [6, 8],
 
   // Default Close icon
     "layer0.texture": "ayu/assets/close.png",
     "layer0.opacity": 0,
     "layer0.inner_margin": [0, 0],
-    "layer0.tint": ["{ui.fg.rgb}"]
+    "layer0.tint": ["{common.ui.rgb}"]
   },
 
 
@@ -874,15 +826,14 @@
   {
     "class": "close_button",
     "parents": [{ "class": "tree_row", "attributes": ["hover"] }],
-  // Default Close icon
-    "layer0.opacity": 0.6
+    "layer0.opacity": 1
   },
 
   {
     "class": "close_button",
     "attributes": ["dirty"],
     "layer0.texture": "ayu/assets/dirty.png",
-    "layer0.tint": ["{ui.fg.rgb}"],
+    "layer0.tint": ["{common.ui.rgb}"],
     "layer0.opacity": 1.0
   },
 
@@ -903,7 +854,7 @@
     "layer0.opacity": 1.0,
 
     "layer1.texture": "ayu/assets/scrollbar-vertical-wide.png",
-    "layer1.tint": ["{ui.fg.rgb}"],
+    "layer1.tint": ["{common.ui.rgb}"],
     "layer1.opacity": 0.1,
     "layer1.inner_margin": [0, 10],
     "blur": false
@@ -929,7 +880,7 @@
   {
     "class": "puck_control",
     "layer0.texture": "ayu/assets/scrollbar-vertical-wide.png",
-    "layer0.tint": ["{ui.fg.rgb}"],
+    "layer0.tint": ["{common.ui.rgb}"],
     "layer0.opacity": 0.3,
     "layer0.inner_margin": [0, 10],
     "content_margin": [6, 12],
@@ -1017,14 +968,14 @@
   {
     "class": "minimap_control",
     "settings": ["always_show_minimap_viewport"],
-    "viewport_color": ["{ui.minimap}"],
-    "viewport_opacity": "{ui.opacity}"
+    "viewport_color": ["{ui.minimap.rgb}"],
+    "viewport_opacity": 0.2
   },
 
   {
     "class": "minimap_control",
     "settings": ["!always_show_minimap_viewport"],
-    "viewport_color": ["{ui.minimap}"],
+    "viewport_color": ["{ui.minimap.rgb}"],
     "viewport_opacity": { "target": 0, "speed": 4.0, "interpolation": "smoothstep" }
   },
 
@@ -1044,11 +995,10 @@
 
   {
     "class": "label_control",
-    "color": ["{ui.fg.rgb}"],
+    "color": ["{common.ui.rgb}"],
     "shadow_color": [0, 0, 0, 0],
     "shadow_offset": [0, 0],
     "font.bold": false,
-    "font.face": "Roboto mono",
     "font.size": 12
   },
   {
@@ -1058,8 +1008,8 @@
   },
   {
     "class": "label_control",
-    "settings": ["ui_font_default"],
-    "font.face": ""
+    "settings": ["ui_font_roboto_mono"],
+    "font.face": "Roboto mono"
   },
 
   // Status bar labels
@@ -1067,7 +1017,7 @@
   {
     "class": "label_control",
     "parents": [{"class": "status_bar"}],
-    "color": ["{ui.fg.rgb}"],
+    "color": ["{common.ui.rgb}"],
     "font.bold": false
   },
 
@@ -1079,13 +1029,14 @@
     "layer0.tint": ["{common.bg.rgb}"],
     "layer0.opacity": 1,
     "layer1.texture": "ayu/assets/separator-top.png",
+    "layer1.tint": ["{ui.separator.rgb}"],
     "layer1.inner_margin": [1, 2, 1, 0],
-    "content_margin": [10, 0]
+    "content_margin": [16, 3]
   },
   {
     "class": "status_bar",
     "settings": ["ui_separator"],
-    "layer0.tint": ["{ui.panel.bg.rgb}"]
+    // "layer0.tint": ["{ui.panel.bg.rgb}"],
     // "layer1.opacity": "{ui.opacity}"
   },
 
@@ -1102,7 +1053,7 @@
   {
     "class": "panel_button_control",
     "layer0.texture": "ayu/assets/switch-panel.png",
-    "layer0.tint": ["{ui.fg.rgb}"],
+    "layer0.tint": ["{common.ui.rgb}"],
     "layer0.opacity": 1.0
   },
 
@@ -1127,9 +1078,9 @@
   {
     "class": "panel_control",
     "settings": ["ui_separator"],
-    "layer0.tint": ["{ui.panel.bg.rgb}"],
+    // "layer0.tint": ["{ui.panel.bg.rgb}"],
     "layer1.texture": "ayu/assets/separator-top.png",
-    "layer1.tint": ["{ui.fg.rgb}"],
+    "layer1.tint": ["{ui.separator.rgb}"],
     "layer1.inner_margin": [1, 2, 1, 0],
     "layer1.opacity": "{ui.opacity}"
   },
@@ -1140,7 +1091,7 @@
     "class": "panel_close_button",
     "layer0.texture": "ayu/assets/close.png",
     "layer0.opacity": 1.0,
-    "layer0.tint": ["{ui.fg.rgb}"],
+    "layer0.tint": ["{common.ui.rgb}"],
     "content_margin": [0, 0] // 8,8 to show
   },
   {
@@ -1161,7 +1112,7 @@
     "layer1.texture": "ayu/assets/input-border.png",
     "layer1.opacity": "{ui.opacity}",
     "layer1.inner_margin": [10, 8],
-    "layer1.tint": ["{ui.fg.rgb}"],
+    "layer1.tint": ["{ui.separator.rgb}"],
     "content_margin": [10, 7, 10, 5]
   },
 
@@ -1175,9 +1126,9 @@
     "layer0.opacity": 0,
     "layer1.texture": "ayu/assets/input-search.png",
     "layer1.opacity": 1,
-    "layer1.tint": ["{common.accent.rgb}"],
-    "layer1.inner_margin": [35, 0, 0, 0],
-    "content_margin": [43, 7, 10, 4]
+    "layer1.tint": ["{common.ui.rgb}", 100],
+    "layer1.inner_margin": [60, 0, 0, 0],
+    "content_margin": [50, 7, 10, 4]
   },
 
   // Textline input oveflow menu
@@ -1185,7 +1136,7 @@
     "class": "dropdown_button_control",
     "content_margin": [12, 12],
     "layer0.texture": "ayu/assets/overflow-menu.png",
-    "layer0.tint": ["{ui.folder.normal.rgb}"],
+    "layer0.tint": ["{ui.icon.rgb}"],
     "layer0.opacity": 1.0
   },
   {
@@ -1220,7 +1171,7 @@
   {
     "class": "label_control",
     "parents": [{"class": "button_control"}],
-    "color":  ["{ui.fg.rgb}"]
+    "color":  ["{common.ui.rgb}"]
   },
 
   {
@@ -1247,7 +1198,7 @@
   {
     "class": "icon_regex",
     "layer0.texture": "ayu/assets/regex.png",
-    "layer0.tint": ["{ui.fg.rgb}"],
+    "layer0.tint": ["{common.ui.rgb}"],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1263,7 +1214,7 @@
   {
     "class": "icon_case",
     "layer0.texture": "ayu/assets/matchcase.png",
-    "layer0.tint": ["{ui.fg.rgb}"],
+    "layer0.tint": ["{common.ui.rgb}"],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1279,7 +1230,7 @@
   {
     "class": "icon_whole_word",
     "layer0.texture": "ayu/assets/word.png",
-    "layer0.tint": ["{ui.fg.rgb}"],
+    "layer0.tint": ["{common.ui.rgb}"],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1295,7 +1246,7 @@
   {
     "class": "icon_wrap",
     "layer0.texture": "ayu/assets/wrap.png",
-    "layer0.tint": ["{ui.fg.rgb}"],
+    "layer0.tint": ["{common.ui.rgb}"],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1311,7 +1262,7 @@
   {
     "class": "icon_in_selection",
     "layer0.texture": "ayu/assets/inselection.png",
-    "layer0.tint": ["{ui.fg.rgb}"],
+    "layer0.tint": ["{common.ui.rgb}"],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1327,7 +1278,7 @@
   {
     "class": "icon_highlight",
     "layer0.texture": "ayu/assets/highlight.png",
-    "layer0.tint": ["{ui.fg.rgb}"],
+    "layer0.tint": ["{common.ui.rgb}"],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1343,7 +1294,7 @@
   {
     "class": "icon_preserve_case",
     "layer0.texture": "ayu/assets/replace-preserve-case.png",
-    "layer0.tint": ["{ui.fg.rgb}"],
+    "layer0.tint": ["{common.ui.rgb}"],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1359,7 +1310,7 @@
   {
     "class": "icon_context",
     "layer0.texture": "ayu/assets/context.png",
-    "layer0.tint": ["{ui.fg.rgb}"],
+    "layer0.tint": ["{common.ui.rgb}"],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1376,7 +1327,7 @@
   {
     "class": "icon_use_buffer",
     "layer0.texture": "ayu/assets/buffer.png",
-    "layer0.tint": ["{ui.fg.rgb}"],
+    "layer0.tint": ["{common.ui.rgb}"],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
@@ -1392,7 +1343,7 @@
   {
     "class": "icon_reverse",
     "layer0.texture": "ayu/assets/reverse.png",
-    "layer0.tint": ["{ui.fg.rgb}"],
+    "layer0.tint": ["{common.ui.rgb}"],
     "layer0.opacity": 1.0,
     "content_margin": [12, 12]
   },
diff --git a/src/templates/sublime2.ui.json b/src/templates/sublime2.ui.json
deleted file mode 100644
index c4246098..00000000
--- a/src/templates/sublime2.ui.json
+++ /dev/null
@@ -1,1280 +0,0 @@
-// prefix=""
-// sublime="2"
-// ext="sublime-theme"
-[
-
-  /* @ EMPTY WINDOW
-  * Style for empty (no tabs) window
-  ========================================================================= */
-
-  {
-    "class" : "sheet_container_control",
-    "layer0.tint" : ["{common.bg.rgb}"],
-    "layer0.opacity" : 1.0
-  },
-
-
-  /* @ GRID LAYOUT
-  * Grid style
-  ========================================================================= */
-
-  {
-    "class": "grid_layout_control",
-    "border_size": 0,
-    "border_color": ["{ui.grid_divider.rgb}"]
-  },
-  {
-    "class": "grid_layout_control",
-    "settings": ["ui_separator"],
-    "border_size": 1
-  },
-
-  /* @ DIALOG POPUP
-  * Dialog popup style and progressbar
-  ========================================================================= */
-  // !!!
-  {
-    "class": "progress_gauge_control",
-    "layer0.tint": ["{common.accent.rgb}"],
-    "layer0.opacity": 1.0,
-    "content_margin": [0, 6]
-  },
-
-  {
-    "class": "dialog",
-    "layer0.tint": ["{common.bg.rgb}"],
-    "layer0.opacity": 1.0
-  },
-
-  {
-    "class": "progress_bar_control",
-    "layer0.tint": ["{common.bg.rgb}"],
-    "layer0.opacity": 1.0
-  },
-
-
-  /* @ CODE FOLDING
-  * Folding arrow setting and behavioring
-  ========================================================================= */
-  {
-    "class": "fold_button_control",
-    "layer0.texture": "ayu/assets/unfold.png",
-    "layer0.opacity": 1.0,
-    "layer0.inner_margin": 0,
-    "layer0.tint": ["{ui.fg.rgb}"],
-    "content_margin": [8, 6, 8, 6]
-  },
-
-  {
-    "class": "fold_button_control",
-    "attributes": ["hover"],
-    "layer0.tint": ["{common.accent.rgb}"]
-  },
-
-  {
-    "class": "fold_button_control",
-    "attributes": ["expanded"],
-    "layer0.texture": "ayu/assets/fold.png"
-  },
-
-
-  /* @ AUTOCOMPLETE
-  * Autocomplete popup setting and behavioring
-  ========================================================================= */
-
-  {
-    "class": "popup_control",
-    "layer0.tint": ["{ui.panel.bg.rgb}"],
-    "layer0.opacity": 1.0,
-    "content_margin": [0, 0]
-  },
-
-  {
-    "class": "auto_complete",
-    "row_padding": [12, 6],
-    "layer0.tint": ["{ui.panel.bg.rgb}"],
-    "layer0.opacity": 1.0
-  },
-
-  {
-    "class": "auto_complete_label",
-    "fg": ["{ui.fg.rgb}"],
-    "match_fg": ["{common.accent.rgb}"],
-    "selected_fg": ["{common.fg.rgb}"],
-    "selected_match_fg": ["{common.accent.rgb}"]
-  },
-
-  {
-    "class": "table_row",
-    "layer0.tint": ["{ui.panel.row_bg.rgb}"],
-    "layer0.opacity": 0.0
-  },
-
-  {
-    "class": "table_row",
-    "attributes": ["selected"],
-    "layer0.opacity": 1.0
-  },
-
-
-  /* @ TOOLTIP
-  * Tooltip setting and behavioring
-  ========================================================================= */
-
-  {
-    "class": "tool_tip_control",
-    "layer0.tint": ["{common.bg.rgb}"],
-    "layer0.inner_margin": [0, 0],
-    "layer0.opacity": 1.0,
-    "content_margin": [10, 6]
-  },
-
-  {
-    "class": "tool_tip_label_control",
-    "color": ["{ui.fg.rgb}"],
-    "font.face": "Roboto mono",
-    "font.size": 12
-  },
-  {
-    "class": "tool_tip_label_control",
-    "settings": ["ui_font_source_code_pro"],
-    "font.face": "Source Code Pro"
-  },
-  {
-    "class": "tool_tip_label_control",
-    "settings": ["ui_font_default"],
-    "font.face": ""
-  },
-
-  /* @OVERLAY PANELS
-  * Overlay panels setting and behavioring
-  ========================================================================= */
-
-  // Command Panel
-  {
-    "class": "overlay_control",
-    "layer0.texture": "ayu/assets/overlay-shadow.png",
-    "layer0.inner_margin": [25, 45, 25, 35],
-    "layer0.opacity": 1.0,
-    "layer0.tint": ["{ui.panel.shadow.rgb}"],
-
-    "layer1.texture": "ayu/assets/overlay-bg.png",
-    "layer1.inner_margin": [25, 45, 25, 35],
-    "layer1.opacity": 1.0,
-    "layer1.tint": ["{ui.panel.bg.rgb}"],
-
-    "content_margin": [20, 45, 20, 35]
-  },
-
-  // Command Panel list item style (cmd + shift + p)
-
-  {
-    "class": "mini_quick_panel_row",
-    "layer0.tint": ["{common.bg.rgb}", 0],
-    "layer0.inner_margin": [2, 2, 2, 2],
-    "layer0.opacity": 1.0
-  },
-
-  // Command Panel selected list item style (cmd + p)
-
-  {
-    "class": "mini_quick_panel_row",
-    "attributes": ["selected"],
-    "layer0.tint": ["{ui.panel.row_bg.rgb}"]
-  },
-
-  // Quick panel project setting (project manager) (cmd + ctrl + p)
-
-  {
-    "class": "quick_panel",
-    "row_padding": [32, 12],
-    "layer0.tint": ["{ui.panel.bg.rgb}"],
-    "layer0.opacity": 1.0
-  },
-
-  // Quick Panel row default style (project manager)
-
-  {
-    "class": "quick_panel_row",
-    "layer0.texture": "",
-    "layer0.tint": ["{ui.panel.bg.rgb}"],
-    "layer0.inner_margin": 0,
-    "layer0.opacity": 1.0
-  },
-
-  // Row panel style inside comman panel (cmd + shift + p)
-
-  {
-    "class": "quick_panel_row",
-    "parents": [{"class": "overlay_control"}],
-    "layer0.tint": ["{ui.panel.bg.rgb}"],
-    "layer0.opacity": 1.0
-  },
-
-  // Quick panel (project) style inside overlay_control (cmd + shift + p)
-
-  {
-    "class": "quick_panel",
-    "parents": [{"class": "overlay_control"}],
-    "row_padding": [10, 7],
-    "layer0.tint": ["{ui.panel.bg.rgb}"],
-    "layer0.opacity": 1.0
-  },
-
-  // Quick Panel selected list item style
-
-  {
-    "class": "quick_panel_row",
-    "attributes": ["selected"],
-    "layer0.tint": ["{ui.panel.row_bg.rgb}"]
-  },
-
-  // Panel labels
-
-  {
-    "class": "quick_panel_label",
-    "fg": ["{ui.fg.rgb}"],
-    "match_fg": ["{common.accent.rgb}"],
-    "selected_fg": ["{common.fg.rgb}"],
-    "selected_match_fg": ["{common.accent.rgb}"]
-  },
-
-  // Panel labels
-
-  {
-    "class": "quick_panel_label",
-    "parents": [{"class": "overlay_control"}],
-    "fg": ["{ui.fg.rgb}"],
-    "match_fg": ["{common.accent.rgb}"],
-    "selected_fg": ["{common.fg.rgb}"],
-    "selected_match_fg": ["{common.accent.rgb}"]
-  },
-
-  // Panels sublabels
-
-  {
-    "class": "quick_panel_path_label",
-    "fg": ["{ui.panel.path_fg.rgb}"],
-    "match_fg": ["{common.fg.rgb}"],
-    "selected_fg": ["{ui.fg.rgb}"],
-    "selected_match_fg": ["{common.fg.rgb}"]
-  },
-
-  // Panels data / score
-
-  {
-    "class": "quick_panel_score_label",
-    "fg": ["{ui.fg.rgb}"],
-    "selected_fg": ["{ui.fg.rgb}"]
-  },
-
-
-
-  /* @ TABS
-  * Tabs settings and behavioring
-  ========================================================================= */
-
-  {
-    "class": "tabset_control",
-    "tab_overlap": 0,
-    "tab_width": 50,
-    "tab_min_width": 50,
-    "tab_height": 30,
-    "mouse_wheel_switch": false,
-
-    "layer0.opacity": 1.0,
-    "layer0.tint": ["{common.bg.rgb}"],
-    "content_margin": [10, 0]
-  },
-  {
-    "class": "tabset_control",
-    "settings": ["mouse_wheel_switches_tabs", "!enable_tab_scrolling"],
-    "mouse_wheel_switch": true
-  },
-  {
-    "class": "tabset_control",
-    "settings": ["ui_separator"],
-    "content_margin": [0, 0, 0, 0],
-    "layer1.opacity": "{ui.opacity}",
-    "layer1.texture": "ayu/assets/separator-bottom.png",
-    "layer1.tint": ["{ui.fg.rgb}"],
-    "layer1.inner_margin": [1, 0, 1, 2]
-  },
-  {
-    "class": "tabset_control",
-    "settings": ["ui_big_tabs"],
-    "tab_height": 44
-  },
-
-  // Tabs
-  {
-    "class": "tab_control",
-
-    "layer0.tint": ["{common.bg.rgb}"],
-    "layer0.opacity": 1.0,
-
-    "layer1.texture": "",
-
-    "layer2.texture": "ayu/assets/separator-bottom.png",
-    "layer2.tint": ["{common.accent.rgb}"],
-    "layer2.inner_margin": [1, 0, 1, 2],
-    "layer2.opacity": 0.0,
-
-    "layer3.texture": "",
-
-    "content_margin": [10, -2, 10, 0],
-    "max_margin_trim": 12
-  },
-  {
-    "class": "tab_control",
-    "settings": ["ui_separator"],
-
-    "layer1.texture": "ayu/assets/separator-right.png",
-    "layer1.tint": ["{ui.fg.rgb}"],
-    "layer1.inner_margin": [0, 1, 2, 1],
-    "layer1.opacity": "{ui.opacity}",
-
-    "layer3.texture": "ayu/assets/separator-bottom.png",
-    "layer3.tint": ["{ui.fg.rgb}"],
-    "layer3.inner_margin": [1, 0, 1, 2],
-    "layer3.opacity": "{ui.opacity}"
-  },
-  {
-    "class": "tab_control",
-    "settings": ["ui_big_tabs"],
-    "content_margin": [15, -2, 15, 0]
-  },
-
-  // Selected current tab
-
-  {
-    "class": "tab_control", "attributes": ["selected"],
-    "layer2.opacity": 1.0,
-    "layer3.opacity": 0.0
-  },
-
-  // Hovered current tab
-
-  {
-    "class": "tab_control", "attributes": ["hover"],
-    "layer2.opacity": 0.3
-  },
-
-  // Selected current tab
-
-  {
-    "class": "tab_control", "attributes": ["selected","hover"],
-    "layer2.opacity": 1.0
-  },
-
-  // Tab Labels
-
-  {
-    "class": "tab_label",
-    "fg": ["{common.bg.rgb}", 0],
-    "shadow_color": ["{ui.fg.rgb}"],
-    "shadow_offset": [0, -1],
-    "font.size": 12,
-    "font.italic": false,
-    "font.bold": false,
-    "font.face": "Roboto mono"
-  },
-  {
-    "class": "tab_label",
-    "settings": ["ui_font_source_code_pro"],
-    "font.face": "Source Code Pro"
-  },
-  {
-    "class": "tab_label",
-    "settings": ["ui_font_default"],
-    "font.face": ""
-  },
-  {
-    "class": "tab_label",
-    "fg": ["{ui.fg.rgb}"],
-    "settings": ["ui_fix_tab_labels"],
-    "shadow_color": ["{common.bg.rgb}", 0],
-    "shadow_offset": [0, 0]
-  },
-
-  // Tab selected label color
-
-  {
-    "class": "tab_label",
-    "parents": [{"class": "tab_control", "attributes": ["selected"]}],
-    "fg": ["{common.bg.rgb}", 0],
-    "shadow_color": ["{common.fg.rgb}"],
-    "shadow_offset": [0, -1]
-  },
-  {
-    "class": "tab_label",
-    "settings": ["ui_fix_tab_labels"],
-    "parents": [{"class": "tab_control", "attributes": ["selected"]}],
-    "fg": ["{common.fg.rgb}"],
-    "shadow_color": ["{common.bg.rgb}", 0],
-    "shadow_offset": [0, 0]
-  },
-
-  {
-    "class": "tab_label",
-    "attributes": ["transient"],
-    "font.italic": true
-  },
-
-  // Tab Close Buttons
-  {
-    "class": "tab_close_button",
-    "content_margin": [0, 0],
-
-  // Close Icon
-    "layer0.texture": "ayu/assets/close.png",
-    "layer0.tint": ["{ui.fg.rgb}"],
-    "layer0.opacity": 1.0,
-
-  // Dirty Icon
-    "layer1.texture": "ayu/assets/dirty.png",
-    "layer1.tint": ["{ui.fg.rgb}"],
-    "layer1.opacity": 0
-  },
-
-  // Default
-  {
-    "class": "tab_close_button",
-    "settings": ["show_tab_close_buttons"],
-    "content_margin": [8, 8]
-  },
-
-  // Default hover
-  {
-    "class": "tab_close_button",
-    "settings": ["show_tab_close_buttons"],
-    "attributes": ["hover"],
-    "layer0.tint": ["{common.accent.rgb}"]
-  },
-
-  // Dirty tab
-  {
-    "class": "tab_close_button",
-    "parents": [{"class": "tab_control", "attributes": ["dirty"]}],
-    "layer0.opacity": 0, // Close Icon
-    "layer1.opacity": 1.0, // dirty Icon
-    "content_margin": [8, 8]
-  },
-
-  // Dirty tab on hover
-  {
-    "class": "tab_close_button",
-    "parents": [{"class": "tab_control", "attributes": ["dirty"]}],
-    "attributes": ["hover"],
-    "layer0.opacity": 1.0, // Close Icon
-    "layer1.opacity": 0 // Close Icon
-  },
-
-  // Selected dirty tab
-  {
-    "class": "tab_close_button",
-    "parents": [{"class": "tab_control", "attributes": ["selected", "dirty"]}],
-    "layer0.opacity": 0, // Close Icon
-    "layer1.opacity": 1.0, // Dirty Icon
-    "layer1.tint": ["{common.accent.rgb}"]
-  },
-
-  // Selected dirty tab on hover
-  {
-    "class": "tab_close_button",
-    "parents": [{"class": "tab_control", "attributes": ["selected", "dirty"]}],
-    "attributes": ["hover"],
-    "layer0.opacity": 1.0,
-    "layer1.opacity": 0
-  },
-  // tab set scroll left | scroll right
-  {
-    "class": "scroll_tabs_left_button",
-    "content_margin": [12, 15],
-    "layer0.texture": "ayu/assets/arrow-left.png",
-    "layer0.tint": ["{ui.folder.normal.rgb}"],
-    "layer0.opacity": 1.0
-  },
-
-  {
-    "class": "scroll_tabs_left_button",
-    "attributes": ["hover"],
-    "layer0.tint": ["{common.accent.rgb}"]
-  },
-
-  {
-    "class": "scroll_tabs_right_button",
-    "content_margin": [12, 15],
-    "layer0.texture": "ayu/assets/arrow-right.png",
-    "layer0.tint": ["{ui.folder.normal.rgb}"],
-    "layer0.opacity": 1.0
-  },
-  {
-    "class": "scroll_tabs_right_button",
-    "settings": ["ui_separator"],
-    "layer2.texture": "ayu/assets/separator-right.png",
-    "layer2.tint": ["{ui.fg.rgb}"],
-    "layer2.opacity": "{ui.opacity}",
-    "layer2.inner_margin" : [0, 1, 2, 1]
-  },
-
-  {
-    "class": "scroll_tabs_right_button",
-    "attributes": ["hover"],
-    "layer0.tint": ["{common.accent.rgb}"]
-  },
-
-  {
-    "class": "show_tabs_dropdown_button",
-    "content_margin": [12, 12],
-    "layer0.texture": "ayu/assets/overflow-menu.png",
-    "layer0.tint": ["{ui.folder.normal.rgb}"],
-    "layer0.opacity": 1.0,
-    "layer0.inner_margin": [0, 0]
-  },
-
-  {
-    "class": "show_tabs_dropdown_button",
-    "attributes": ["hover"],
-    "layer0.tint": ["{common.accent.rgb}"]
-  },
-
-
-  /* @ SIDEBAR
-  * Sidebar panel settings and behavioring
-  ========================================================================= */
-
-  {
-    "class": "sidebar_container",
-    "content_margin": [0, -20, 0, 0],
-    "layer0.opacity": 1,
-    "layer0.tint": ["{common.bg.rgb}"]
-  },
-  {
-    "class": "sidebar_container",
-    "settings": ["ui_separator"],
-    "layer1.texture": "ayu/assets/separator-right.png",
-    "layer1.tint": ["{ui.fg.rgb}"],
-    "layer1.inner_margin": [0, 1, 2, 1],
-    "layer1.opacity": "{ui.opacity}"
-  },
-
-  {
-    "class": "sidebar_tree",
-    "row_padding": [30, 6],
-    "indent": 12,
-    "indent_offset": 0,
-    "indent_top_level": false,
-    "dark_content": true
-  },
-
-  {
-    "class": "sidebar_heading",
-    "color": ["{common.bg.rgb}"],
-    "font.face": "Roboto mono",
-    "font.bold": true,
-    "font.size": 11
-  },
-  {
-    "class": "sidebar_heading",
-    "settings": ["ui_font_source_code_pro"],
-    "font.face": "Source Code Pro"
-  },
-  {
-    "class": "sidebar_heading",
-    "settings": ["ui_font_default"],
-    "font.face": ""
-  },
-
-  {
-    "class": "tree_row",
-    "layer1.texture": "ayu/assets/tree-highlight.png",
-    "layer1.opacity": { "target": 0.0, "speed": 5.0, "interpolation": "smoothstep" },
-    "layer1.tint": ["{common.accent.rgb}"],
-    "layer1.inner_margin": [5, 0, 0, 3],
-    "layer0.tint": ["{ui.panel.row_bg.rgb}"],
-    "layer0.opacity": 0
-  },
-
-  {
-    "class": "tree_row",
-    "attributes": ["selected"],
-    "layer1.opacity": { "target": 1.0, "speed": 5.0, "interpolation": "smoothstep" }
-  },
-
-  {
-    "class": "sidebar_label",
-    "color": ["{ui.fg.rgb}"],
-    "shadow_color": [0, 0, 0],
-    "shadow_offset": [0, 0],
-    "font.face": "Roboto mono",
-    "font.size": 12
-  },
-  {
-    "class": "sidebar_label",
-    "settings": ["ui_font_source_code_pro"],
-    "font.face": "Source Code Pro"
-  },
-  {
-    "class": "sidebar_label",
-    "settings": ["ui_font_default"],
-    "font.face": ""
-  },
-
-  {
-    "class": "sidebar_label",
-    "parents": [{"class": "tree_row","attributes": ["hover"]}],
-    "color": ["{common.fg.rgb}"]
-  },
-
-  {
-    "class": "sidebar_label",
-    "parents": [{"class": "tree_row","attributes": ["selected"]}],
-    "color": ["{common.fg.rgb}"],
-    "shadow_color": [0, 0, 0],
-    "shadow_offset": [0, 0]
-  },
-
-  {
-    "class": "sidebar_label",
-    "parents": [{"class": "tree_row","attributes": ["expandable"]}],
-    "color": ["{ui.fg.rgb}"],
-    "font.bold": false
-  },
-
-  {
-    "class": "sidebar_label",
-    "parents": [{"class": "tree_row", "attributes": ["expandable"]}],
-    "settings": ["bold_folder_labels"],
-    "font.bold": true
-  },
-
-  {
-    "class": "sidebar_label",
-    "parents": [{"class": "tree_row", "attributes": ["expandable", "hover"]}],
-    "color": ["{common.fg.rgb}"]
-  },
-
-  {
-    "class": "sidebar_label",
-    "parents": [{"class": "tree_row", "attributes": ["expanded"]}],
-    "color": ["{common.fg.rgb}"]
-  },
-
-  {
-    "class": "sidebar_label",
-    "parents": [{"class": "tree_row", "attributes": ["expanded"]}],
-    "settings": ["bold_folder_labels"],
-    "font.bold": true
-  },
-
-  // {
-  //  "class": "sidebar_label",
-  //  "parents": [{"class": "tree_row", "attributes": ["expanded", "selected"]}],
-  //  "color": ["{common.fg.rgb}"]
-  // },
-
-  {
-    "class": "sidebar_label",
-    "attributes": ["transient"],
-    "font.italic": false
-  },
-
-  // Hidden arrow icon before folder
-
-  {
-    "class": "disclosure_button_control",
-    "layer0.texture": "ayu/assets/arrow-right.png",
-    "layer0.tint": ["{ui.folder.normal.rgb}"],
-    "layer0.opacity": 1,
-    "layer0.inner_margin": 0,
-    "content_margin": [12, 15]
-  },
-
-  {
-    "class": "disclosure_button_control",
-    "parents": [{ "class": "tree_row", "attributes": ["hover"]}],
-    "layer0.tint": ["{common.accent.rgb}"]
-  },
-
-  {
-    "class": "disclosure_button_control",
-    "attributes": ["expanded"],
-    "layer0.texture": "ayu/assets/overflow-menu.png",
-    "content_margin": [12, 12]
-  },
-
-  {
-    "class": "disclosure_button_control",
-    "attributes": ["expanded"],
-    "parents": [{ "class": "tree_row", "attributes": ["hover"]}],
-    "layer0.tint": ["{common.accent.rgb}"]
-  },
-
-  // Opened files
-  {
-    "class": "close_button",
-    "content_margin": [8, 8],
-
-  // Default Close icon
-    "layer0.texture": "ayu/assets/close.png",
-    "layer0.opacity": 0,
-    "layer0.inner_margin": [0, 0],
-    "layer0.tint": ["{ui.fg.rgb}"]
-  },
-
-
-  // Opened file hover
-
-  {
-    "class": "close_button",
-    "parents": [{ "class": "tree_row", "attributes": ["hover"] }],
-  // Default Close icon
-    "layer0.opacity": 0.6
-  },
-
-  {
-    "class": "close_button",
-    "attributes": ["dirty"],
-    "layer0.texture": "ayu/assets/dirty.png",
-    "layer0.tint": ["{ui.fg.rgb}"],
-    "layer0.opacity": 1.0
-  },
-
-  {
-    "class": "close_button",
-    "attributes": ["hover"],
-    "layer0.opacity": 1.0,
-    "layer0.tint": ["{common.accent.rgb}"]
-  },
-
-
-  /* @ SCROLLBARS
-  * Scrollbars settings and behavioring
-  ========================================================================= */
-
-  // Normal Vertical scrollbar track
-  // !!!
-  {
-    "class": "scroll_bar_control",
-    "layer0.tint" : ["{common.bg.rgb}"],
-    "layer0.opacity": 1,
-    "layer0.inner_margin": [0, 0],
-    "blur": false
-  },
-
-  // Normal Vertical scrollbar track inside overlay panel
-
-  {
-    "class": "scroll_bar_control",
-    "parents": [{"class": "overlay_control"}],
-    "layer0.tint": ["{common.bg.rgb}", 0],
-    "layer0.opacity": 1.0,
-    "layer0.inner_margin": [0, 2],
-    "blur": false
-  },
-
-  // Normal horizontal scrollbar track
-
-  {
-    "class": "scroll_bar_control",
-    "attributes": ["horizontal"],
-    "layer0.texture": "",
-    "layer0.tint" : ["{common.bg.rgb}"],
-    "layer0.inner_margin": [0, 0],
-    "blur": false
-  },
-
-  // Normal horizontal scrollbar track inside overlay panel
-  // !!!
-  // {
-  //  "class": "scroll_bar_control",
-  //  "attributes": ["horizontal"],
-  //  "parents": [{"class": "overlay_control"}],
-  //  "layer0.tint": ["{common.bg.rgb}", 0],
-  //  "layer0.opacity": 0.0,
-  //  "layer0.inner_margin": [0, 2],
-  //  "blur": false
-  //  },
-
-  // Scrollbars corner
-
-  {
-    "class": "scroll_corner_control",
-    "layer0.texture": "",
-    "layer0.tint":["{common.bg.rgb}"],
-    "layer0.inner_margin": [0, 0],
-    "layer0.opacity": 1,
-    "blur": false
-  },
-
-  // Vertical puck controller
-
-  {
-    "class": "puck_control",
-    "layer0.texture": "",
-    "layer0.tint": ["{ui.scrollbar.puck.rgb}", 50],
-    "layer0.opacity": 1,
-    "layer0.inner_margin": [0, 0],
-    "content_margin": [1, 12],
-    "blur": false
-  },
-
-  // Horizontal puck controller
-
-  {
-    "class": "puck_control",
-    "attributes": ["horizontal"],
-    "layer0.texture": "",
-    "layer0.tint": ["{ui.scrollbar.puck.rgb}", 50],
-    "layer0.inner_margin": [0, 0],
-    "content_margin": [12, 1],
-    "blur": false
-  },
-
-  {
-    "class": "scroll_area_control",
-    "settings": ["overlay_scroll_bars"],
-    "overlay": true
-  },
-
-  {
-    "class": "scroll_area_control",
-    "settings": ["!overlay_scroll_bars"],
-    "overlay": false // set to false for the original behavior
-  },
-
-
-  {
-    "class": "scroll_area_control",
-    "parents": [{"class": "overlay_control"}],
-    "settings": ["overlay_scroll_bars"],
-    "overlay": true // set to false for the original behavior
-  },
-
-  {
-    "class": "scroll_area_control",
-    "parents": [{"class": "sidebar_container"}],
-    "settings": ["!overlay_scroll_bars"],
-    "overlay": false // set to false for the original behavior
-  },
-
-  {
-    "class": "scroll_bar_control",
-    "settings": ["overlay_scroll_bars"],
-    "layer0.tint": [28, 31, 38],
-    "layer0.inner_margin": [0, 5],
-    "blur": false
-  },
-
-  {
-    "class": "scroll_bar_control",
-    "settings": ["overlay_scroll_bars"],
-    "attributes": ["horizontal"],
-    "layer0.inner_margin": [5, 0],
-    "blur": true
-  },
-
-
-  /* @ MINIMAP
-  * Minimap settings and behavioring
-  ========================================================================= */
-
-  {
-    "class": "minimap_control",
-    "settings": ["always_show_minimap_viewport"],
-    "viewport_color": ["{ui.minimap}"]
-  },
-
-  {
-    "class": "minimap_control",
-    "settings": ["!always_show_minimap_viewport"],
-    "viewport_color": ["{ui.minimap}", 20]
-  },
-
-
-  /* @ STATUS BAR
-  * Status bar settings and behavioring
-  ========================================================================= */
-
-  // All labels
-
-  {
-    "class": "label_control",
-    "color": ["{ui.fg.rgb}"],
-    "shadow_color": [0, 0, 0, 0],
-    "shadow_offset": [0, 0],
-    "font.bold": false,
-    "font.face": "Roboto mono",
-    "font.size": 12
-  },
-  {
-    "class": "label_control",
-    "settings": ["ui_font_source_code_pro"],
-    "font.face": "Source Code Pro"
-  },
-  {
-    "class": "label_control",
-    "settings": ["ui_font_default"],
-    "font.face": ""
-  },
-
-  // Status bar labels
-
-  {
-    "class": "label_control",
-    "parents": [{"class": "status_bar"}],
-    "color": ["{ui.fg.rgb}"],
-    "font.bold": false
-  },
-
-  // Text field labels
-
-  {
-    "class": "status_bar",
-    "layer0.texture": "",
-    "layer0.tint": ["{common.bg.rgb}"],
-    "layer0.opacity": 1,
-    "layer1.texture": "ayu/assets/separator-top.png",
-    "layer1.inner_margin": [1, 2, 1, 0],
-    "content_margin": [10, 5]
-  },
-  {
-    "class": "status_bar",
-    "settings": ["ui_separator"],
-    "layer0.tint": ["{ui.panel.bg.rgb}"]
-    // "layer1.opacity": "{ui.opacity}"
-  },
-
-  {
-    "class": "status_container",
-    "content_margin": [0, 5]
-  },
-
-  {
-    "class": "status_button",
-    "min_size": [100, 0]
-  },
-
-
-  /* @ WIDGET PANEL
-  * Widget, input, buttons settings and behavioring
-  ========================================================================= */
-
-
-  // Status bar panel
-  {
-    "class": "panel_control",
-    "layer0.tint": ["{common.bg.rgb}"],
-    "layer0.opacity": 1.0,
-    "content_margin": [0, 5]
-  },
-  {
-    "class": "panel_control",
-    "settings": ["ui_separator"],
-    "layer0.tint": ["{ui.panel.bg.rgb}"],
-    "layer1.texture": "ayu/assets/separator-top.png",
-    "layer1.tint": ["{ui.fg.rgb}"],
-    "layer1.inner_margin": [1, 2, 1, 0],
-    "layer1.opacity": "{ui.opacity}"
-  },
-
-  // Status bar panel close icon
-
-  {
-    "class": "panel_close_button",
-    "layer0.texture": "ayu/assets/close.png",
-    "layer0.opacity": 1.0,
-    "layer0.tint": ["{ui.fg.rgb}"],
-    "content_margin": [0, 0] // 8,8 to show
-  },
-  // !!!
-  {
-    "class": "panel_close_button",
-    "attributes": ["hover"],
-    "layer0.tint": ["{common.accent.rgb}"]
-  },
-
-  // Texline input
-
-  {
-    "class": "text_line_control",
-    "layer0.texture": "ayu/assets/input-bg.png",
-    "layer0.opacity": 1,
-    "layer0.inner_margin": [10, 8],
-    "layer0.tint": ["{ui.panel.bg.rgb}"],
-
-    "layer1.texture": "ayu/assets/input-border.png",
-    "layer1.opacity": "{ui.opacity}",
-    "layer1.inner_margin": [10, 8],
-    "layer1.tint": ["{ui.fg.rgb}"],
-    "content_margin": [10, 7, 10, 5]
-  },
-
-
-  // Textline input inside overlay panels
-
-  {
-    "class": "text_line_control",
-    "parents": [{"class": "overlay_control"}],
-    "layer0.texture": "",
-    "layer0.opacity": 0,
-    "layer1.texture": "ayu/assets/input-search.png",
-    "layer1.opacity": 1,
-    "layer1.tint": ["{common.accent.rgb}"],
-    "layer1.inner_margin": [35, 0, 0, 0],
-    "content_margin": [43, 7, 10, 4]
-  },
-
-  // Textline input oveflow menu
-  {
-    "class": "dropdown_button_control",
-    "content_margin": [12, 12],
-    "layer0.texture": "ayu/assets/overflow-menu.png",
-    "layer0.tint": ["{ui.folder.normal.rgb}"],
-    "layer0.opacity": 1.0
-  },
-  {
-    "class": "dropdown_button_control",
-    "attributes": ["hover"],
-    "layer0.tint": ["{common.accent.rgb}"]
-  },
-
-
-  /* @ BUTTONS
-  * Buttons panels settings and behavioring
-  ========================================================================= */
-
-
-  // Button labels
-
-  {
-    "class": "button_control",
-    "content_margin": [15, 9, 15, 10],
-    "min_size": [60, 0],
-    "layer0.tint": ["{common.accent.rgb}", 10],
-    "layer0.texture": "ayu/assets/input-bg.png",
-    "layer0.inner_margin": [10, 8],
-    "layer0.opacity": 0
-  },
-  {
-    "class": "button_control",
-    "attributes": ["hover"],
-    "layer0.opacity": 1
-  },
-
-  {
-    "class": "label_control",
-    "parents": [{"class": "button_control"}],
-    "color":  ["{ui.fg.rgb}"]
-  },
-
-  {
-    "class": "label_control",
-    "parents": [{"class": "button_control", "attributes": ["hover"]}],
-    "color":  ["{common.accent.rgb}"]
-  },
-
-  // !!!
-  // Small Icon Buttons
-  {
-    "class": "icon_button_control",
-    "layer0.tint": [0, 0, 0],
-    "layer0.opacity": 0,
-    "layer2.tint": ["{common.fg.rgb}"],
-    "layer2.opacity": { "target": 0.0, "speed": 10.0, "interpolation": "smoothstep" },
-    "content_margin": [10, 5]
-  },
-
-
-  /* Buttons icons settings
-  ===================================================================== */
-
-  // Regex Icon
-  {
-    "class": "icon_regex",
-    "layer0.texture": "ayu/assets/regex.png",
-    "layer0.tint": ["{ui.fg.rgb}"],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-  {
-    "class": "icon_regex",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": ["{common.accent.rgb}"]
-  },
-
-  // Preserve case sensitive
-
-  {
-    "class": "icon_case",
-    "layer0.texture": "ayu/assets/matchcase.png",
-    "layer0.tint": ["{ui.fg.rgb}"],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-  {
-    "class": "icon_case",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": ["{common.accent.rgb}"]
-  },
-
-  // Wholeword
-
-  {
-    "class": "icon_whole_word",
-    "layer0.texture": "ayu/assets/word.png",
-    "layer0.tint": ["{ui.fg.rgb}"],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-
-  {
-    "class": "icon_whole_word",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": ["{common.accent.rgb}"]
-  },
-
-  // Wrap
-
-  {
-    "class": "icon_wrap",
-    "layer0.texture": "ayu/assets/wrap.png",
-    "layer0.tint": ["{ui.fg.rgb}"],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-  {
-    "class": "icon_wrap",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": ["{common.accent.rgb}"]
-  },
-
-  // In selection
-
-  {
-    "class": "icon_in_selection",
-    "layer0.texture": "ayu/assets/inselection.png",
-    "layer0.tint": ["{ui.fg.rgb}"],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-  {
-    "class": "icon_in_selection",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": ["{common.accent.rgb}"]
-  },
-
-  // Highlight Result
-
-  {
-    "class": "icon_highlight",
-    "layer0.texture": "ayu/assets/highlight.png",
-    "layer0.tint": ["{ui.fg.rgb}"],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-  {
-    "class": "icon_highlight",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": ["{common.accent.rgb}"]
-  },
-
-  // Preserve Case
-
-  {
-    "class": "icon_preserve_case",
-    "layer0.texture": "ayu/assets/replace-preserve-case.png",
-    "layer0.tint": ["{ui.fg.rgb}"],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-  {
-    "class": "icon_preserve_case",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": ["{common.accent.rgb}"]
-  },
-
-  // Show context
-
-  {
-    "class": "icon_context",
-    "layer0.texture": "ayu/assets/context.png",
-    "layer0.tint": ["{ui.fg.rgb}"],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-
-  {
-    "class": "icon_context",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": ["{common.accent.rgb}"]
-  },
-
-  // Use buffer
-
-  {
-    "class": "icon_use_buffer",
-    "layer0.texture": "ayu/assets/buffer.png",
-    "layer0.tint": ["{ui.fg.rgb}"],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-  {
-    "class": "icon_use_buffer",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": ["{common.accent.rgb}"]
-  },
-
-  // Reverse direction
-
-  {
-    "class": "icon_reverse",
-    "layer0.texture": "ayu/assets/reverse.png",
-    "layer0.tint": ["{ui.fg.rgb}"],
-    "layer0.opacity": 1.0,
-    "content_margin": [12, 12]
-  },
-
-  {
-    "class": "icon_reverse",
-    "parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
-    "layer0.tint": ["{common.accent.rgb}"]
-  },
-
-
-  /* Visual settings
-  ===================================================================== */
-
-  // UI font sizees
-  // ==============
-  {
-    "class": "tab_label",
-    "settings": ["ui_font_size_small"],
-    "font.size": 11
-  },
-  {
-    "class": "sidebar_label",
-    "settings": ["ui_font_size_small"],
-    "font.size": 11
-  },
-  {
-    "class": "label_control",
-    "settings": ["ui_font_size_small"],
-    "font.size": 11
-  },
-  {
-    "class": "tool_tip_label_control",
-    "settings": ["ui_font_size_small"],
-    "font.size": 11
-  }
-]
diff --git a/src/templates/sublime2.widget.json b/src/templates/sublime2.widget.json
deleted file mode 100644
index 2cf9cfd3..00000000
--- a/src/templates/sublime2.widget.json
+++ /dev/null
@@ -1,9 +0,0 @@
-// prefix="Widget - "
-// sublime="2"
-// ext="sublime-settings"
-{
-  "color_scheme": "Packages/ayu/widgets/Widget - ayu-"{theme}".stTheme",
-  "draw_shadows": false,
-  "font_options": ["subpixel_antialias"],
-  "line_padding_top": 3
-}
diff --git a/src/templates/widget.xml b/src/templates/widget.xml
index b2325f57..7881bb3c 100644
--- a/src/templates/widget.xml
+++ b/src/templates/widget.xml
@@ -19,21 +19,21 @@
       <key>settings</key>
       <dict>
         <key>background</key>
-        <string>#"{ui.panel.bg.hex}"</string>
+        <string>"{ui.panel.bg.hex}"</string>
         <key>caret</key>
-        <string>#"{common.accent.hex}"</string>
+        <string>"{common.accent.hex}"</string>
         <key>foreground</key>
-        <string>#"{common.fg.hex}"</string>
-        <key>inactiveSelection</key>
-        <string>#"{syntax.selection.hex}"88</string>
+        <string>"{common.fg.hex}"</string>
         <key>invisibles</key>
-        <string>#343434</string>
+        <string>"{editor.gutter.hex}"</string>
         <key>lineHighlight</key>
-        <string>#"{syntax.line.hex}"</string>
+        <string>"{editor.line.hex}"</string>
+        <key>inactiveSelection</key>
+        <string>"{editor.selection.inactive.hex}"</string>
         <key>selection</key>
-        <string>#"{syntax.selection.hex}"</string>
+        <string>"{editor.selection.bg.hex}"</string>
         <key>selectionBorder</key>
-        <string>#"{syntax.selection.hex}"</string>
+        <string>"{editor.selection.border.hex}"</string>
       </dict>
     </dict>
     <dict>
@@ -46,7 +46,7 @@
         <key>fontStyle</key>
         <string>italic</string>
         <key>foreground</key>
-        <string>#"{syntax.comment.hex}"</string>
+        <string>"{syntax.comment.hex}"</string>
       </dict>
     </dict>
     <dict>
@@ -57,7 +57,7 @@
       <key>settings</key>
       <dict>
         <key>foreground</key>
-        <string>#"{syntax.keyword.hex}"</string>
+        <string>"{syntax.keyword.hex}"</string>
       </dict>
     </dict>
     <dict>
@@ -68,7 +68,7 @@
       <key>settings</key>
       <dict>
         <key>foreground</key>
-        <string>#"{syntax.constant.hex}"</string>
+        <string>"{syntax.constant.hex}"</string>
       </dict>
     </dict>
     <dict>
@@ -79,7 +79,7 @@
       <key>settings</key>
       <dict>
         <key>foreground</key>
-        <string>#"{syntax.string.hex}"</string>
+        <string>"{syntax.string.hex}"</string>
       </dict>
     </dict>
     <dict>
@@ -90,7 +90,7 @@
       <key>settings</key>
       <dict>
         <key>foreground</key>
-        <string>#"{syntax.regexp.hex}"</string>
+        <string>"{syntax.regexp.hex}"</string>
       </dict>
     </dict>
   </array>
diff --git a/src/themes/color.js b/src/themes/color.js
new file mode 100644
index 00000000..bdabc26f
--- /dev/null
+++ b/src/themes/color.js
@@ -0,0 +1,47 @@
+const C = require('color')
+let BASE
+
+class Color {
+  constructor(a) { this.color = a }
+  static from(hex) { return new Color(C('#' + hex)) }
+  get rgb() { return this.color.rgb().array().map(Math.round).join(', ') }
+  get hex() { return this.color.hex() }
+}
+
+const parseFunction = prop => {
+  for (const func of ['fade', 'darken']) {
+    const m = prop.match(new RegExp(`(${func})(\\d{1,})`))
+    if (m && m.length === 3) return [m[1], m[2]]
+  }
+}
+
+const proxy = color => new Proxy(color, {
+  get(target, property, receiver) {
+    const result = Reflect.get(target, property, receiver)
+    if (result || typeof property !== 'string') return result
+
+    const parsed = parseFunction(property)
+    if (!parsed) return
+    switch (parsed[0]) {
+      case 'fade': return fade(target, parseInt(parsed[1]))
+      case 'darken': return darken(target, parseInt(parsed[1]))
+    }
+  }
+})
+
+const fade = (color, value) => {
+  const level = 1 - value / 100
+  const mixed = color.color.mix(BASE.color, level)
+  return proxy(new Color(mixed))
+}
+
+const darken = (color, value) => {
+  const darker = color.color.darken(value / 100)
+  return proxy(new Color(darker))
+}
+
+module.exports = color => proxy(Color.from(color))
+module.exports.base = color => {
+  BASE = Color.from(color)
+  return proxy(BASE)
+}
diff --git a/src/themes/dark.js b/src/themes/dark.js
new file mode 100644
index 00000000..b67b4b95
--- /dev/null
+++ b/src/themes/dark.js
@@ -0,0 +1,60 @@
+const $ = require('./color')
+
+const common = {
+  accent: $`F29718`,
+  bg: $.base`0F1419`,
+  fg: $`BFBAB0`,
+  ui: $`475259`
+}
+
+const syntax = {
+  tag: $`39BAE6`,
+  func: $`FFB454`,
+  entity: $`59C2FF`,
+  string: $`C2D94C`,
+  regexp: $`95E6CB`,
+  markup: $`F07178`,
+  keyword: $`FF7733`,
+  special: $`E6B673`,
+  comment: $`5C6773`,
+  constant: $`FFEE99`,
+  operator: $`F29668`,
+  error: $`FF3333`
+}
+
+const ui = {
+  panel: {
+    bg: common.ui.fade7,
+    shadow: common.bg.darken30,
+    border: common.bg.darken80,
+    row: common.bg.darken20
+  },
+  icon: common.ui.fade55,
+  scrollbar: { puck: $`FFFFFF` },
+  separator: common.bg.darken36,
+  minimap: common.bg.darken70,
+  opacity: 1.0
+}
+
+const editor = {
+  line: common.bg.darken30,
+  gutter: common.ui.fade40,
+  selection: {
+    bg: syntax.entity.fade9,
+    inactive: syntax.entity.fade6,
+    border: syntax.entity.fade13
+  },
+  guide: {
+    stack: common.ui.fade30,
+    active: common.ui.fade70,
+    normal: common.ui.fade30
+  },
+}
+
+module.exports = {
+  theme: 'dark',
+  common,
+  syntax,
+  ui,
+  editor
+}
diff --git a/src/themes/dark.yml b/src/themes/dark.yml
deleted file mode 100644
index 4d1148ef..00000000
--- a/src/themes/dark.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-theme: dark
-
-common:
-  bg: 0F1419
-  fg: E6E1CF
-  accent: F29718
-
-ui:
-  fg: '515C66'
-  panel:
-    bg: 14191F
-    shadow: '000000'
-    path_fg: 42505E
-    row_bg: 191F26
-
-  folder:
-    normal: '3E4B59'
-
-  scrollbar:
-    puck: 'FFFFFF'
-
-  grid_divider: '1D242C' # {fg} at {opacity}
-  minimap: '100, 100, 100'
-  opacity: '0.3'
-
-syntax:
-  line: 151A1F
-  error: FF3333
-  gutter: 35404C
-  selection: '253340'
-  stack_guide: 1A2633
-  active_guide: '314559'
-
-  tag: 39BAE6
-  func: FFB454
-  entity: 59C2FF
-  string: C2D94C
-  regexp: 95E6CB
-  markup: F07178
-  keyword: FF7733
-  special: E6B673
-  comment: 5C6773
-  constant: FFEE99
-  operator: F29668
diff --git a/src/themes/light.js b/src/themes/light.js
new file mode 100644
index 00000000..961f0a29
--- /dev/null
+++ b/src/themes/light.js
@@ -0,0 +1,60 @@
+const $ = require('./color')
+
+const common = {
+  accent: $`FF8F40`,
+  bg: $.base`FAFAFA`,
+  fg: $`61676C`,
+  ui: $`9DA2A6`
+}
+
+const syntax = {
+  tag: $`55B4D4`,
+  func: $`F29718`,
+  entity: $`399EE6`,
+  string: $`86B300`,
+  regexp: $`4CBF99`,
+  markup: $`F07171`,
+  keyword: $`FA6E32`,
+  special: $`E6B673`,
+  comment: $`ABB0B6`,
+  constant: $`A37ACC`,
+  operator: $`ED9366`,
+  error: $`F51818`
+}
+
+const ui = {
+  panel: {
+    bg: $`FFFFFF`,
+    shadow: common.bg.darken20,
+    border: common.bg.darken20,
+    row: common.bg.darken2
+  },
+  icon: common.ui.fade60,
+  scrollbar: { puck: $`000000` },
+  separator: common.bg.darken5,
+  minimap: common.bg.darken10,
+  opacity: 1
+}
+
+const editor = {
+  line: common.bg.darken3,
+  gutter: common.ui.fade35,
+  selection: {
+    bg: syntax.entity.fade9,
+    inactive: syntax.entity.fade7,
+    border: syntax.entity.fade12
+  },
+  guide: {
+    stack: common.ui.fade30,
+    active: common.ui.fade70,
+    normal: common.ui.fade30
+  },
+}
+
+module.exports = {
+  theme: 'light',
+  common,
+  syntax,
+  ui,
+  editor
+}
diff --git a/src/themes/light.yml b/src/themes/light.yml
deleted file mode 100644
index fa929ac5..00000000
--- a/src/themes/light.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-theme: light
-
-common:
-  accent: 'FF6A00'
-  bg: 'FAFAFA'
-  fg: '6E7580'
-
-ui:
-  fg: '85888C'
-  panel:
-    bg: FFFFFF
-    row_bg: F5F5F5
-    shadow: '7E848C'
-    path_fg: 959CA6
-
-  folder:
-    normal: '878F99'
-
-  scrollbar:
-    puck: '000000'
-
-  grid_divider: 'E2E4E7' # {fg} at {opacity}
-  minimap: '130, 140, 153'
-  opacity: '0.2'
-
-syntax:
-  line: F2F2F2
-  error: F51818
-  gutter: D9D8D7
-  selection: F0EEE4
-  stack_guide: DEDDDC
-  active_guide: B3B2B1
-
-  tag: 55B4D4
-  func: F29718
-  entity: 399EE6
-  string: 86B300
-  regexp: 4CBF99
-  markup: F07171
-  keyword: FA6E32
-  special: E6B673
-  comment: ABB0B6
-  constant: A37ACC
-  operator: ED9366
diff --git a/src/themes/mirage.js b/src/themes/mirage.js
new file mode 100644
index 00000000..0672f8e7
--- /dev/null
+++ b/src/themes/mirage.js
@@ -0,0 +1,60 @@
+const $ = require('./color')
+
+const common = {
+  accent: $`FFCC66`,
+  bg: $.base`212733`,
+  fg: $`CCC9C2`,
+  ui: $`667380`
+}
+
+const syntax = {
+  tag: $`5CCFE6`,
+  func: $`FFD580`,
+  entity: $`73D0FF`,
+  string: $`BAE67E`,
+  regexp: $`95E6CB`,
+  markup: $`F28779`,
+  keyword: $`FFA759`,
+  special: $`FFC44C`,
+  comment: $`5C6773`,
+  constant: $`D4BFFF`,
+  operator: $`F29E74`,
+  error: $`FF3333`
+}
+
+const ui = {
+  panel: {
+    bg: common.ui.fade7,
+    shadow: common.bg.darken30,
+    border: common.bg.darken40,
+    row: common.bg.darken5
+  },
+  icon: common.ui.fade55,
+  scrollbar: { puck: $`FFFFFF` },
+  separator: common.bg.darken20,
+  minimap: common.bg.darken40,
+  opacity: 1.0
+}
+
+const editor = {
+  line: common.bg.darken14,
+  gutter: common.ui.fade35,
+  selection: {
+    bg: syntax.entity.fade10,
+    inactive: syntax.entity.fade8,
+    border: syntax.entity.fade13
+  },
+  guide: {
+    stack: common.ui.fade30,
+    active: common.ui.fade70,
+    normal: common.ui.fade30
+  },
+}
+
+module.exports = {
+  theme: 'mirage',
+  common,
+  syntax,
+  ui,
+  editor
+}
diff --git a/src/themes/mirage.yml b/src/themes/mirage.yml
deleted file mode 100644
index 37b32a2f..00000000
--- a/src/themes/mirage.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-theme: mirage
-
-common:
-  bg: '212733'
-  fg: D9D7CE
-  accent: FFCC66
-
-ui:
-  fg: '738699'
-  panel:
-    bg: 272D38
-    shadow: '11141A'
-    path_fg: '66737F'
-    row_bg: '303540'
-
-  folder:
-    normal: '3E4B59'
-
-  scrollbar:
-    puck: 'FFFFFF'
-
-  grid_divider: '343D4A' # {fg} at {opacity}
-  minimap: '100, 100, 100'
-  opacity: '0.3'
-
-syntax:
-  line: '242B38'
-  error: FF3333
-  gutter: '434E59'
-  selection: '343F4C'
-  stack_guide: '39434D'
-  active_guide: '737D87'
-
-  tag: 5CCFE6
-  func: FFD580
-  entity: 73D0FF
-  string: BAE67E
-  regexp: 95E6CB
-  markup: F28779
-  keyword: FFA759
-  special: FFC44C
-  comment: 5C6773
-  constant: D4BFFF
-  operator: F29E74
diff --git a/widgets/Widget - ayu-dark.stTheme b/widgets/Widget - ayu-dark.stTheme
index 8ed0294f..d68383a6 100644
--- a/widgets/Widget - ayu-dark.stTheme	
+++ b/widgets/Widget - ayu-dark.stTheme	
@@ -19,21 +19,21 @@
       <key>settings</key>
       <dict>
         <key>background</key>
-        <string>#14191F</string>
+        <string>#13181D</string>
         <key>caret</key>
         <string>#F29718</string>
         <key>foreground</key>
-        <string>#E6E1CF</string>
-        <key>inactiveSelection</key>
-        <string>#25334088</string>
+        <string>#BFBAB0</string>
         <key>invisibles</key>
-        <string>#343434</string>
+        <string>#252D33</string>
         <key>lineHighlight</key>
-        <string>#151A1F</string>
+        <string>#0A0E12</string>
+        <key>inactiveSelection</key>
+        <string>#131E27</string>
         <key>selection</key>
-        <string>#253340</string>
+        <string>#16242E</string>
         <key>selectionBorder</key>
-        <string>#253340</string>
+        <string>#192B37</string>
       </dict>
     </dict>
     <dict>
diff --git a/widgets/Widget - ayu-light.stTheme b/widgets/Widget - ayu-light.stTheme
index a8bf3424..8f8ac4cf 100644
--- a/widgets/Widget - ayu-light.stTheme	
+++ b/widgets/Widget - ayu-light.stTheme	
@@ -21,19 +21,19 @@
         <key>background</key>
         <string>#FFFFFF</string>
         <key>caret</key>
-        <string>#FF6A00</string>
+        <string>#FF8F40</string>
         <key>foreground</key>
-        <string>#6E7580</string>
-        <key>inactiveSelection</key>
-        <string>#F0EEE488</string>
+        <string>#61676C</string>
         <key>invisibles</key>
-        <string>#343434</string>
+        <string>#D9DBDD</string>
         <key>lineHighlight</key>
-        <string>#F2F2F2</string>
+        <string>#F3F3F3</string>
+        <key>inactiveSelection</key>
+        <string>#ECF4F9</string>
         <key>selection</key>
-        <string>#F0EEE4</string>
+        <string>#E9F2F8</string>
         <key>selectionBorder</key>
-        <string>#F0EEE4</string>
+        <string>#E3EFF8</string>
       </dict>
     </dict>
     <dict>
diff --git a/widgets/Widget - ayu-mirage.stTheme b/widgets/Widget - ayu-mirage.stTheme
index 28054674..e288a1f0 100644
--- a/widgets/Widget - ayu-mirage.stTheme	
+++ b/widgets/Widget - ayu-mirage.stTheme	
@@ -19,21 +19,21 @@
       <key>settings</key>
       <dict>
         <key>background</key>
-        <string>#272D38</string>
+        <string>#262C38</string>
         <key>caret</key>
         <string>#FFCC66</string>
         <key>foreground</key>
-        <string>#D9D7CE</string>
-        <key>inactiveSelection</key>
-        <string>#343F4C88</string>
+        <string>#CCC9C2</string>
         <key>invisibles</key>
-        <string>#343434</string>
+        <string>#39424E</string>
         <key>lineHighlight</key>
-        <string>#242B38</string>
+        <string>#1C222C</string>
+        <key>inactiveSelection</key>
+        <string>#283543</string>
         <key>selection</key>
-        <string>#343F4C</string>
+        <string>#293847</string>
         <key>selectionBorder</key>
-        <string>#343F4C</string>
+        <string>#2C3D4E</string>
       </dict>
     </dict>
     <dict>
diff --git a/yarn.lock b/yarn.lock
deleted file mode 100644
index 0fc5ab85..00000000
--- a/yarn.lock
+++ /dev/null
@@ -1,1095 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-
-archy@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
-
-argparse@^1.0.7:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
-  dependencies:
-    sprintf-js "~1.0.2"
-
-arr-diff@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
-  dependencies:
-    arr-flatten "^1.0.1"
-
-arr-flatten@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.0.1.tgz#e5ffe54d45e19f32f216e91eb99c8ce892bb604b"
-
-array-differ@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
-
-array-uniq@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-
-array-unique@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
-
-balanced-match@^0.4.1:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
-
-beeper@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809"
-
-brace-expansion@^1.0.0:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.6.tgz#7197d7eaa9b87e648390ea61fc66c84427420df9"
-  dependencies:
-    balanced-match "^0.4.1"
-    concat-map "0.0.1"
-
-braces@^1.8.2:
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
-  dependencies:
-    expand-range "^1.8.1"
-    preserve "^0.2.0"
-    repeat-element "^1.1.2"
-
-buffer-shims@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51"
-
-chalk@^1.0.0, chalk@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
-
-clone-buffer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
-
-clone-stats@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1"
-
-clone-stats@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680"
-
-clone@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"
-
-clone@^1.0.0, clone@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149"
-
-cloneable-readable@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.0.0.tgz#a6290d413f217a61232f95e458ff38418cfb0117"
-  dependencies:
-    inherits "^2.0.1"
-    process-nextick-args "^1.0.6"
-    through2 "^2.0.1"
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-
-core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-
-dateformat@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.0.0.tgz#2743e3abb5c3fc2462e527dca445e04e9f4dee17"
-
-defaults@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
-  dependencies:
-    clone "^1.0.2"
-
-deprecated@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/deprecated/-/deprecated-0.0.1.tgz#f9c9af5464afa1e7a971458a8bdef2aa94d5bb19"
-
-detect-file@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-0.1.0.tgz#4935dedfd9488648e006b0129566e9386711ea63"
-  dependencies:
-    fs-exists-sync "^0.1.0"
-
-duplexer2@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
-  dependencies:
-    readable-stream "~1.1.9"
-
-end-of-stream@~0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-0.1.5.tgz#8e177206c3c80837d85632e8b9359dfe8b2f6eaf"
-  dependencies:
-    once "~1.3.0"
-
-escape-string-regexp@^1.0.2:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-
-expand-brackets@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
-  dependencies:
-    is-posix-bracket "^0.1.0"
-
-expand-range@^1.8.1:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
-  dependencies:
-    fill-range "^2.1.0"
-
-expand-tilde@^1.2.1, expand-tilde@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-1.2.2.tgz#0b81eba897e5a3d31d1c3d102f8f01441e559449"
-  dependencies:
-    os-homedir "^1.0.1"
-
-extend@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.0.tgz#5a474353b9f3353ddd8176dfd37b91c83a46f1d4"
-
-extglob@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
-  dependencies:
-    is-extglob "^1.0.0"
-
-fancy-log@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.0.tgz#45be17d02bb9917d60ccffd4995c999e6c8c9948"
-  dependencies:
-    chalk "^1.1.1"
-    time-stamp "^1.0.0"
-
-filename-regex@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.0.tgz#996e3e80479b98b9897f15a8a58b3d084e926775"
-
-fill-range@^2.1.0:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
-  dependencies:
-    is-number "^2.1.0"
-    isobject "^2.0.0"
-    randomatic "^1.1.3"
-    repeat-element "^1.1.2"
-    repeat-string "^1.5.2"
-
-find-index@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/find-index/-/find-index-0.1.1.tgz#675d358b2ca3892d795a1ab47232f8b6e2e0dde4"
-
-findup-sync@^0.4.2:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.4.3.tgz#40043929e7bc60adf0b7f4827c4c6e75a0deca12"
-  dependencies:
-    detect-file "^0.1.0"
-    is-glob "^2.0.1"
-    micromatch "^2.3.7"
-    resolve-dir "^0.1.0"
-
-fined@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/fined/-/fined-1.0.2.tgz#5b28424b760d7598960b7ef8480dff8ad3660e97"
-  dependencies:
-    expand-tilde "^1.2.1"
-    lodash.assignwith "^4.0.7"
-    lodash.isempty "^4.2.1"
-    lodash.isplainobject "^4.0.4"
-    lodash.isstring "^4.0.1"
-    lodash.pick "^4.2.1"
-    parse-filepath "^1.0.1"
-
-first-chunk-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"
-
-flagged-respawn@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-0.3.2.tgz#ff191eddcd7088a675b2610fffc976be9b8074b5"
-
-for-in@^0.1.5:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.6.tgz#c9f96e89bfad18a545af5ec3ed352a1d9e5b4dc8"
-
-for-own@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.4.tgz#0149b41a39088c7515f51ebe1c1386d45f935072"
-  dependencies:
-    for-in "^0.1.5"
-
-fs-exists-sync@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"
-
-fs-jetpack@^0.10.0:
-  version "0.10.5"
-  resolved "https://registry.yarnpkg.com/fs-jetpack/-/fs-jetpack-0.10.5.tgz#c9db5a8fc2b8a2a5f02b878b52d52fa93b3ae3ec"
-  dependencies:
-    minimatch "^3.0.2"
-    mkdirp "^0.5.1"
-    q "^1.0.1"
-    rimraf "^2.2.8"
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-
-gaze@^0.5.1:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/gaze/-/gaze-0.5.2.tgz#40b709537d24d1d45767db5a908689dfe69ac44f"
-  dependencies:
-    globule "~0.1.0"
-
-glob-base@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
-  dependencies:
-    glob-parent "^2.0.0"
-    is-glob "^2.0.0"
-
-glob-parent@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
-  dependencies:
-    is-glob "^2.0.0"
-
-glob-stream@^3.1.5:
-  version "3.1.18"
-  resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-3.1.18.tgz#9170a5f12b790306fdfe598f313f8f7954fd143b"
-  dependencies:
-    glob "^4.3.1"
-    glob2base "^0.0.12"
-    minimatch "^2.0.1"
-    ordered-read-streams "^0.1.0"
-    through2 "^0.6.1"
-    unique-stream "^1.0.0"
-
-glob-watcher@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/glob-watcher/-/glob-watcher-0.0.6.tgz#b95b4a8df74b39c83298b0c05c978b4d9a3b710b"
-  dependencies:
-    gaze "^0.5.1"
-
-glob2base@^0.0.12:
-  version "0.0.12"
-  resolved "https://registry.yarnpkg.com/glob2base/-/glob2base-0.0.12.tgz#9d419b3e28f12e83a362164a277055922c9c0d56"
-  dependencies:
-    find-index "^0.1.1"
-
-glob@^4.3.1:
-  version "4.5.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-4.5.3.tgz#c6cb73d3226c1efef04de3c56d012f03377ee15f"
-  dependencies:
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^2.0.1"
-    once "^1.3.0"
-
-glob@^7.0.5:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.2"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@~3.1.21:
-  version "3.1.21"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-3.1.21.tgz#d29e0a055dea5138f4d07ed40e8982e83c2066cd"
-  dependencies:
-    graceful-fs "~1.2.0"
-    inherits "1"
-    minimatch "~0.2.11"
-
-global-modules@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-0.2.3.tgz#ea5a3bed42c6d6ce995a4f8a1269b5dae223828d"
-  dependencies:
-    global-prefix "^0.1.4"
-    is-windows "^0.2.0"
-
-global-prefix@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-0.1.5.tgz#8d3bc6b8da3ca8112a160d8d496ff0462bfef78f"
-  dependencies:
-    homedir-polyfill "^1.0.0"
-    ini "^1.3.4"
-    is-windows "^0.2.0"
-    which "^1.2.12"
-
-globule@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/globule/-/globule-0.1.0.tgz#d9c8edde1da79d125a151b79533b978676346ae5"
-  dependencies:
-    glob "~3.1.21"
-    lodash "~1.0.1"
-    minimatch "~0.2.11"
-
-glogg@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.0.tgz#7fe0f199f57ac906cf512feead8f90ee4a284fc5"
-  dependencies:
-    sparkles "^1.0.0"
-
-graceful-fs@^3.0.0:
-  version "3.0.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-3.0.11.tgz#7613c778a1afea62f25c630a086d7f3acbbdd818"
-  dependencies:
-    natives "^1.1.0"
-
-graceful-fs@~1.2.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-1.2.3.tgz#15a4806a57547cb2d2dbf27f42e89a8c3451b364"
-
-gulp-exec@^2.1.2:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/gulp-exec/-/gulp-exec-2.1.3.tgz#460a4ec8df86841d1738bc74958c68e5769342d9"
-  dependencies:
-    gulp-util "^3.0.7"
-    gulplog "^1.0.0"
-    through2 "^2.0.1"
-
-gulp-util@^3.0.0, gulp-util@^3.0.7:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f"
-  dependencies:
-    array-differ "^1.0.0"
-    array-uniq "^1.0.2"
-    beeper "^1.0.0"
-    chalk "^1.0.0"
-    dateformat "^2.0.0"
-    fancy-log "^1.1.0"
-    gulplog "^1.0.0"
-    has-gulplog "^0.1.0"
-    lodash._reescape "^3.0.0"
-    lodash._reevaluate "^3.0.0"
-    lodash._reinterpolate "^3.0.0"
-    lodash.template "^3.0.0"
-    minimist "^1.1.0"
-    multipipe "^0.1.2"
-    object-assign "^3.0.0"
-    replace-ext "0.0.1"
-    through2 "^2.0.0"
-    vinyl "^0.5.0"
-
-gulp@^3.9.1:
-  version "3.9.1"
-  resolved "https://registry.yarnpkg.com/gulp/-/gulp-3.9.1.tgz#571ce45928dd40af6514fc4011866016c13845b4"
-  dependencies:
-    archy "^1.0.0"
-    chalk "^1.0.0"
-    deprecated "^0.0.1"
-    gulp-util "^3.0.0"
-    interpret "^1.0.0"
-    liftoff "^2.1.0"
-    minimist "^1.1.0"
-    orchestrator "^0.3.0"
-    pretty-hrtime "^1.0.0"
-    semver "^4.1.0"
-    tildify "^1.0.0"
-    v8flags "^2.0.2"
-    vinyl-fs "^0.3.0"
-
-gulplog@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/gulplog/-/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5"
-  dependencies:
-    glogg "^1.0.0"
-
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  dependencies:
-    ansi-regex "^2.0.0"
-
-has-gulplog@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/has-gulplog/-/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce"
-  dependencies:
-    sparkles "^1.0.0"
-
-homedir-polyfill@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc"
-  dependencies:
-    parse-passwd "^1.0.0"
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-1.0.2.tgz#ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b"
-
-inherits@2, inherits@^2.0.1, inherits@~2.0.1:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-
-ini@^1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
-
-interpret@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.1.tgz#d579fb7f693b858004947af39fa0db49f795602c"
-
-is-absolute@^0.2.3:
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-0.2.6.tgz#20de69f3db942ef2d87b9c2da36f172235b1b5eb"
-  dependencies:
-    is-relative "^0.2.1"
-    is-windows "^0.2.0"
-
-is-buffer@^1.0.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.4.tgz#cfc86ccd5dc5a52fa80489111c6920c457e2d98b"
-
-is-dotfile@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.2.tgz#2c132383f39199f8edc268ca01b9b007d205cc4d"
-
-is-equal-shallow@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
-  dependencies:
-    is-primitive "^2.0.0"
-
-is-extendable@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-
-is-extglob@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
-
-is-glob@^2.0.0, is-glob@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
-  dependencies:
-    is-extglob "^1.0.0"
-
-is-number@^2.0.2, is-number@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
-  dependencies:
-    kind-of "^3.0.2"
-
-is-posix-bracket@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
-
-is-primitive@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
-
-is-relative@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-0.2.1.tgz#d27f4c7d516d175fb610db84bbeef23c3bc97aa5"
-  dependencies:
-    is-unc-path "^0.1.1"
-
-is-stream@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-
-is-unc-path@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-0.1.2.tgz#6ab053a72573c10250ff416a3814c35178af39b9"
-  dependencies:
-    unc-path-regex "^0.1.0"
-
-is-utf8@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
-
-is-windows@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c"
-
-isarray@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-
-isarray@1.0.0, isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-
-isexe@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-1.1.2.tgz#36f3e22e60750920f5e7241a476a8c6a42275ad0"
-
-isobject@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
-  dependencies:
-    isarray "1.0.0"
-
-kind-of@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.1.0.tgz#475d698a5e49ff5e53d14e3e732429dc8bf4cf47"
-  dependencies:
-    is-buffer "^1.0.2"
-
-liftoff@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.3.0.tgz#a98f2ff67183d8ba7cfaca10548bd7ff0550b385"
-  dependencies:
-    extend "^3.0.0"
-    findup-sync "^0.4.2"
-    fined "^1.0.1"
-    flagged-respawn "^0.3.2"
-    lodash.isplainobject "^4.0.4"
-    lodash.isstring "^4.0.1"
-    lodash.mapvalues "^4.4.0"
-    rechoir "^0.6.2"
-    resolve "^1.1.7"
-
-lodash._basecopy@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
-
-lodash._basetostring@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5"
-
-lodash._basevalues@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7"
-
-lodash._getnative@^3.0.0:
-  version "3.9.1"
-  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
-
-lodash._isiterateecall@^3.0.0:
-  version "3.0.9"
-  resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
-
-lodash._reescape@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reescape/-/lodash._reescape-3.0.0.tgz#2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a"
-
-lodash._reevaluate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz#58bc74c40664953ae0b124d806996daca431e2ed"
-
-lodash._reinterpolate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
-
-lodash._root@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
-
-lodash.assignwith@^4.0.7:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.assignwith/-/lodash.assignwith-4.2.0.tgz#127a97f02adc41751a954d24b0de17e100e038eb"
-
-lodash.escape@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698"
-  dependencies:
-    lodash._root "^3.0.0"
-
-lodash.isarguments@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
-
-lodash.isarray@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
-
-lodash.isempty@^4.2.1:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.isempty/-/lodash.isempty-4.4.0.tgz#6f86cbedd8be4ec987be9aaf33c9684db1b31e7e"
-
-lodash.isplainobject@^4.0.4:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
-
-lodash.isstring@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
-
-lodash.keys@^3.0.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
-  dependencies:
-    lodash._getnative "^3.0.0"
-    lodash.isarguments "^3.0.0"
-    lodash.isarray "^3.0.0"
-
-lodash.mapvalues@^4.4.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz#1bafa5005de9dd6f4f26668c30ca37230cc9689c"
-
-lodash.pick@^4.2.1:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
-
-lodash.restparam@^3.0.0:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
-
-lodash.template@^3.0.0:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-3.6.2.tgz#f8cdecc6169a255be9098ae8b0c53d378931d14f"
-  dependencies:
-    lodash._basecopy "^3.0.0"
-    lodash._basetostring "^3.0.0"
-    lodash._basevalues "^3.0.0"
-    lodash._isiterateecall "^3.0.0"
-    lodash._reinterpolate "^3.0.0"
-    lodash.escape "^3.0.0"
-    lodash.keys "^3.0.0"
-    lodash.restparam "^3.0.0"
-    lodash.templatesettings "^3.0.0"
-
-lodash.templatesettings@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz#fb307844753b66b9f1afa54e262c745307dba8e5"
-  dependencies:
-    lodash._reinterpolate "^3.0.0"
-    lodash.escape "^3.0.0"
-
-lodash@^4.16.4:
-  version "4.17.4"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
-
-lodash@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551"
-
-lru-cache@2:
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
-
-map-cache@^0.2.0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
-
-micromatch@^2.3.7:
-  version "2.3.11"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
-  dependencies:
-    arr-diff "^2.0.0"
-    array-unique "^0.2.1"
-    braces "^1.8.2"
-    expand-brackets "^0.1.4"
-    extglob "^0.3.1"
-    filename-regex "^2.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.1"
-    kind-of "^3.0.2"
-    normalize-path "^2.0.1"
-    object.omit "^2.0.0"
-    parse-glob "^3.0.4"
-    regex-cache "^0.4.2"
-
-minimatch@^2.0.1:
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"
-  dependencies:
-    brace-expansion "^1.0.0"
-
-minimatch@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
-  dependencies:
-    brace-expansion "^1.0.0"
-
-minimatch@~0.2.11:
-  version "0.2.14"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.2.14.tgz#c74e780574f63c6f9a090e90efbe6ef53a6a756a"
-  dependencies:
-    lru-cache "2"
-    sigmund "~1.0.0"
-
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-
-minimist@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-
-mkdirp@^0.5.0, mkdirp@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  dependencies:
-    minimist "0.0.8"
-
-multipipe@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/multipipe/-/multipipe-0.1.2.tgz#2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"
-  dependencies:
-    duplexer2 "0.0.2"
-
-natives@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.0.tgz#e9ff841418a6b2ec7a495e939984f78f163e6e31"
-
-normalize-path@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.0.1.tgz#47886ac1662760d4261b7d979d241709d3ce3f7a"
-
-object-assign@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2"
-
-object.omit@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
-  dependencies:
-    for-own "^0.1.4"
-    is-extendable "^0.1.1"
-
-once@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  dependencies:
-    wrappy "1"
-
-once@~1.3.0:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.3.3.tgz#b2e261557ce4c314ec8304f3fa82663e4297ca20"
-  dependencies:
-    wrappy "1"
-
-orchestrator@^0.3.0:
-  version "0.3.8"
-  resolved "https://registry.yarnpkg.com/orchestrator/-/orchestrator-0.3.8.tgz#14e7e9e2764f7315fbac184e506c7aa6df94ad7e"
-  dependencies:
-    end-of-stream "~0.1.5"
-    sequencify "~0.0.7"
-    stream-consume "~0.1.0"
-
-ordered-read-streams@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz#fd565a9af8eb4473ba69b6ed8a34352cb552f126"
-
-os-homedir@^1.0.0, os-homedir@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-
-parse-filepath@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.1.tgz#159d6155d43904d16c10ef698911da1e91969b73"
-  dependencies:
-    is-absolute "^0.2.3"
-    map-cache "^0.2.0"
-    path-root "^0.1.1"
-
-parse-glob@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
-  dependencies:
-    glob-base "^0.3.0"
-    is-dotfile "^1.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.0"
-
-parse-passwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-
-path-root-regex@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
-
-path-root@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7"
-  dependencies:
-    path-root-regex "^0.1.0"
-
-preserve@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
-
-pretty-hrtime@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
-
-process-nextick-args@^1.0.6, process-nextick-args@~1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
-
-q@^1.0.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
-
-randomatic@^1.1.3:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.6.tgz#110dcabff397e9dcff7c0789ccc0a49adf1ec5bb"
-  dependencies:
-    is-number "^2.0.2"
-    kind-of "^3.0.2"
-
-"readable-stream@>=1.0.33-1 <1.1.0-0":
-  version "1.0.34"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
-readable-stream@^2.1.5:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.2.tgz#a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"
-  dependencies:
-    buffer-shims "^1.0.0"
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
-    string_decoder "~0.10.x"
-    util-deprecate "~1.0.1"
-
-readable-stream@~1.1.9:
-  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
-rechoir@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
-  dependencies:
-    resolve "^1.1.6"
-
-regex-cache@^0.4.2:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"
-  dependencies:
-    is-equal-shallow "^0.1.3"
-    is-primitive "^2.0.0"
-
-remove-trailing-separator@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz#615ebb96af559552d4bf4057c8436d486ab63cc4"
-
-repeat-element@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
-
-repeat-string@^1.5.2:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-
-replace-ext@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924"
-
-replace-ext@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
-
-resolve-dir@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-0.1.1.tgz#b219259a5602fac5c5c496ad894a6e8cc430261e"
-  dependencies:
-    expand-tilde "^1.2.2"
-    global-modules "^0.2.3"
-
-resolve@^1.1.6, resolve@^1.1.7:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.2.0.tgz#9589c3f2f6149d1417a40becc1663db6ec6bc26c"
-
-rimraf@^2.2.8:
-  version "2.5.4"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04"
-  dependencies:
-    glob "^7.0.5"
-
-semver@^4.1.0:
-  version "4.3.6"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
-
-sequencify@~0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/sequencify/-/sequencify-0.0.7.tgz#90cff19d02e07027fd767f5ead3e7b95d1e7380c"
-
-sigmund@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
-
-sparkles@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.0.tgz#1acbbfb592436d10bbe8f785b7cc6f82815012c3"
-
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-
-stream-consume@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/stream-consume/-/stream-consume-0.1.0.tgz#a41ead1a6d6081ceb79f65b061901b6d8f3d1d0f"
-
-string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-
-strip-ansi@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  dependencies:
-    ansi-regex "^2.0.0"
-
-strip-bom@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-1.0.0.tgz#85b8862f3844b5a6d5ec8467a93598173a36f794"
-  dependencies:
-    first-chunk-stream "^1.0.0"
-    is-utf8 "^0.2.0"
-
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-
-through2@^0.6.1:
-  version "0.6.5"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48"
-  dependencies:
-    readable-stream ">=1.0.33-1 <1.1.0-0"
-    xtend ">=4.0.0 <4.1.0-0"
-
-through2@^2.0.0, through2@^2.0.1:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
-  dependencies:
-    readable-stream "^2.1.5"
-    xtend "~4.0.1"
-
-tildify@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/tildify/-/tildify-1.2.0.tgz#dcec03f55dca9b7aa3e5b04f21817eb56e63588a"
-  dependencies:
-    os-homedir "^1.0.0"
-
-time-stamp@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.0.1.tgz#9f4bd23559c9365966f3302dbba2b07c6b99b151"
-
-unc-path-regex@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
-
-unique-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-1.0.0.tgz#d59a4a75427447d9aa6c91e70263f8d26a4b104b"
-
-user-home@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190"
-
-util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-
-v8flags@^2.0.2:
-  version "2.0.11"
-  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.0.11.tgz#bca8f30f0d6d60612cc2c00641e6962d42ae6881"
-  dependencies:
-    user-home "^1.1.1"
-
-vinyl-fs@^0.3.0:
-  version "0.3.14"
-  resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-0.3.14.tgz#9a6851ce1cac1c1cea5fe86c0931d620c2cfa9e6"
-  dependencies:
-    defaults "^1.0.0"
-    glob-stream "^3.1.5"
-    glob-watcher "^0.0.6"
-    graceful-fs "^3.0.0"
-    mkdirp "^0.5.0"
-    strip-bom "^1.0.0"
-    through2 "^0.6.1"
-    vinyl "^0.4.0"
-
-vinyl@^0.4.0:
-  version "0.4.6"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.4.6.tgz#2f356c87a550a255461f36bbeb2a5ba8bf784847"
-  dependencies:
-    clone "^0.2.0"
-    clone-stats "^0.0.1"
-
-vinyl@^0.5.0:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.5.3.tgz#b0455b38fc5e0cf30d4325132e461970c2091cde"
-  dependencies:
-    clone "^1.0.0"
-    clone-stats "^0.0.1"
-    replace-ext "0.0.1"
-
-vinyl@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.0.1.tgz#1c3b4931e7ac4c1efee743f3b91a74c094407bb6"
-  dependencies:
-    clone "^1.0.0"
-    clone-buffer "^1.0.0"
-    clone-stats "^1.0.0"
-    cloneable-readable "^1.0.0"
-    is-stream "^1.1.0"
-    remove-trailing-separator "^1.0.1"
-    replace-ext "^1.0.0"
-
-which@^1.2.12:
-  version "1.2.12"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.2.12.tgz#de67b5e450269f194909ef23ece4ebe416fa1192"
-  dependencies:
-    isexe "^1.1.1"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-
-"xtend@>=4.0.0 <4.1.0-0", xtend@~4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
-
-yamljs@^0.2.8:
-  version "0.2.8"
-  resolved "https://registry.yarnpkg.com/yamljs/-/yamljs-0.2.8.tgz#ef23fb006e62f6ae07b406aa2a949561f336ea5c"
-  dependencies:
-    argparse "^1.0.7"
-    glob "^7.0.5"