From 9305b869f8782a2c6bb403f9e01fbf81f8a68f53 Mon Sep 17 00:00:00 2001
From: unknown <rafaellaguna@gmail.com>
Date: Mon, 16 Dec 2013 23:22:36 +0100
Subject: [PATCH] Fix for bug #1256560

---
 .../Lubuntu-default/gtk-3.0/apps/baobab.css   |  16 +
 .../Lubuntu-default/gtk-3.0/apps/gedit.css    |  40 +
 .../gtk-3.0/apps/gnome-terminal.css           |   7 +
 .../combobox-button-toolbar-focused.png       | Bin 0 -> 662 bytes
 ...ombobox-button-toolbar-pressed-focused.png | Bin 0 -> 493 bytes
 .../assets/combobox-button-toolbar.png        | Bin 0 -> 493 bytes
 ...diance-combobox-button-toolbar-focused.png | Bin 0 -> 596 bytes
 ...ombobox-button-toolbar-pressed-focused.png | Bin 0 -> 542 bytes
 .../radiance-combobox-button-toolbar.png      | Bin 0 -> 542 bytes
 .../Lubuntu-default/gtk-3.0/gtk-lubuntu.css   | 223 +++++
 .../Lubuntu-default/gtk-3.0/gtk-main.css      |  71 ++
 .../gtk-3.0/gtk-widgets-assets-radiance.css   |   8 +
 .../gtk-3.0/gtk-widgets-assets.css            |  40 +
 .../gtk-3.0/gtk-widgets-backdrop.css          | 170 +++-
 .../gtk-3.0/gtk-widgets-borders-radiance.css  |  57 +-
 .../gtk-3.0/gtk-widgets-borders.css           | 151 ++-
 .../gtk-3.0/gtk-widgets-radiance.css          |  82 +-
 .../gtk-3.0/gtk-widgets-toolbar.css           | 735 --------------
 .../Lubuntu-default/gtk-3.0/gtk-widgets.css   | 893 ++++++++++++++++--
 .../themes/Lubuntu-default/gtk-3.0/gtk.css    |  62 +-
 .../Lubuntu-default/gtk-3.0/settings.ini      |   2 +-
 21 files changed, 1613 insertions(+), 944 deletions(-)
 create mode 100644 usr/share/themes/Lubuntu-default/gtk-3.0/apps/baobab.css
 create mode 100644 usr/share/themes/Lubuntu-default/gtk-3.0/apps/gedit.css
 create mode 100644 usr/share/themes/Lubuntu-default/gtk-3.0/apps/gnome-terminal.css
 create mode 100644 usr/share/themes/Lubuntu-default/gtk-3.0/assets/combobox-button-toolbar-focused.png
 create mode 100644 usr/share/themes/Lubuntu-default/gtk-3.0/assets/combobox-button-toolbar-pressed-focused.png
 create mode 100644 usr/share/themes/Lubuntu-default/gtk-3.0/assets/combobox-button-toolbar.png
 create mode 100644 usr/share/themes/Lubuntu-default/gtk-3.0/assets/radiance-combobox-button-toolbar-focused.png
 create mode 100644 usr/share/themes/Lubuntu-default/gtk-3.0/assets/radiance-combobox-button-toolbar-pressed-focused.png
 create mode 100644 usr/share/themes/Lubuntu-default/gtk-3.0/assets/radiance-combobox-button-toolbar.png
 create mode 100644 usr/share/themes/Lubuntu-default/gtk-3.0/gtk-lubuntu.css
 create mode 100644 usr/share/themes/Lubuntu-default/gtk-3.0/gtk-main.css
 delete mode 100644 usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-toolbar.css

diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/apps/baobab.css b/usr/share/themes/Lubuntu-default/gtk-3.0/apps/baobab.css
new file mode 100644
index 0000000..f4dcf6c
--- /dev/null
+++ b/usr/share/themes/Lubuntu-default/gtk-3.0/apps/baobab.css
@@ -0,0 +1,16 @@
+.baobab-toolbar.toolbar {
+    border-color: shade (@bg_color, 0.9);
+    border-style: solid;
+    border-width: 0 0 1px 0;
+    border-radius: 0;
+}
+
+.cell.baobab-level-cell,
+.cell.baobab-level-cell:hover,
+.cell.baobab-level-cell:selected,
+.cell.baobab-level-cell:selected:hover {
+    border-color: alpha (black, 0.06);
+    border-width: 1px;
+    border-style: solid;
+    background-color: @base_color;
+}
diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/apps/gedit.css b/usr/share/themes/Lubuntu-default/gtk-3.0/apps/gedit.css
new file mode 100644
index 0000000..9ef1f6c
--- /dev/null
+++ b/usr/share/themes/Lubuntu-default/gtk-3.0/apps/gedit.css
@@ -0,0 +1,40 @@
+@define-color notebook_tab_gradient_b shade (@bg_color, 0.98);
+
+GeditWindow .pane-separator,
+GeditWindow .pane-separator:hover {
+}
+
+GeditPanel.title GtkLabel {
+}
+
+GeditPanel .toolbar {
+    border-style: none;
+    background-color: transparent;
+}
+
+GeditDocumentsPanel .view {
+}
+
+GeditDocumentsPanel .view:backdrop {
+}
+
+GeditWindow .notebook {
+    padding: 1px;
+    border-radius: 1px;
+}
+
+GeditPanel .notebook {
+    padding: 3px;
+    border-radius: 1px;
+}
+
+GeditPanel .notebook tab,
+GeditWindow .notebook tab {
+    border-radius: 3px;
+}
+
+GeditFloatingSlider .not-found {
+    color: @error_fg_color;
+    background-image: none;
+    background-color: @error_bg_color;
+}
\ No newline at end of file
diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/apps/gnome-terminal.css b/usr/share/themes/Lubuntu-default/gtk-3.0/apps/gnome-terminal.css
new file mode 100644
index 0000000..9ee2792
--- /dev/null
+++ b/usr/share/themes/Lubuntu-default/gtk-3.0/apps/gnome-terminal.css
@@ -0,0 +1,7 @@
+/* gnome-terminal */
+TerminalScreen {
+    -TerminalScreen-background-darkness: 0.95;
+    background-color: #300a24;
+    color: #fff;
+}
+
diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/assets/combobox-button-toolbar-focused.png b/usr/share/themes/Lubuntu-default/gtk-3.0/assets/combobox-button-toolbar-focused.png
new file mode 100644
index 0000000000000000000000000000000000000000..72700b8f195945a4bf9a665fc00aba73c2b39aa8
GIT binary patch
literal 662
zcmV;H0%`q;P)<h;3K|Lk000e1NJLTq000gE000#T1^@s6c3Izv00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-3$;G4=pWmfVThu0wYO8
zK~y-)m6Od&lwlOb&wZZf{qWUv`XEF?RC1A~O+g}73K_I-(JpG+rbP?)E#^N6LTDSf
zH3(Nlq=8Hf1~rH<!2}T)6wR1A@AGkQn+l5-uNThp2lt+Pjvg8sN=v1ZDVNJ=Hk*us
zLuV&1I3fxnqQPDPa3Yculm%b~yeT3pM6z73*BgJp`Ni#;N{k~f8U|p?o^<fSA&7Uu
zef_xK*?N_A8f&B6-hT1!{o6Z4Bn03nfE@rhed(UYsi|aOaxk$bPP&pP6@7fvWN8_~
zSHC>EF|9)9*2c!hG63`fpns$eNCSwjJ^s8fbNAu1$%%7ML_{e7@*nZPa{Ifh@yKNs
zU<3fE0tN~I;oP=NmJtyh0YIjp`(o0#O;M@=^Z`(+=-=9n=8i}diAZ13RRI9C*OgtB
z##(8U)oL|e7{r^G3{n=#_-eJ96bG;0B!VcgH*<4yt}r-#{(iRvXGyR-HZ~@O!FZs*
zn{CGeXyI2f3QgLhdf@ilp+QjE&34ZdQTtG!1bwlyxz<HWH2}z8$yt0LYH1L0nj((;
zPW;20B-Wi_b{J>a*}dA*{K*r?ZUb;MzqtKWcO^L-8;S@LTo4W{9GI+Q_w57cTdO78
zT%S<+_mygOeSwJDR4z|BGCGJ4n!t*Ptcc`*$^lrVP|vb#<;v{L^Gc=i2|$~OnCkU<
wf2-BfrQUvjW_;KmXao+_%mZ*ll>a{KCp_>16Dli*;Q#;t07*qoM6N<$g0#sVOaK4?

literal 0
HcmV?d00001

diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/assets/combobox-button-toolbar-pressed-focused.png b/usr/share/themes/Lubuntu-default/gtk-3.0/assets/combobox-button-toolbar-pressed-focused.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d4f3970db1080a42c79059bdd337cee1bcbc580
GIT binary patch
literal 493
zcmV<J0TTX+P)<h;3K|Lk000e1NJLTq000gE000#T1^@s6c3Izv0005BNkl<Zc-ozk
zze>YU6o=C`ZKB4csWqt$mYAmbcN2mI5u`&EI=Cq~`2=nb_90wci;fDugM+ITq+87@
zVsQ``>taEr{t6L_3VJ>8al$2E&N(-S(RH04QLoooh9+Fseg%U#zsJvg$FU#5z3W=%
zj$`eW%VqPc>w^VR6itrfDuN&oNs_9Hl3OVh3ah$4zhhbD6VJ16@sZ=<aG3ZMWx$S+
z0UY4LB#?lT&1OT-bDo31-T0J6koZD!j1)+NS<^HQQ27*MawJawat(=C7D^>;3so;6
zrv4%_apj3(vDhHQxrWI8RZIX5m$d}32Qfn<vibb9O^Evpk)sh)V9xj5w@#-sNh2nK
z0&&o4wdDVZZ&4HpRIRG2v=9VdA2Uu-U5=({A;ddcF>M$|4Puv8%wXBq!;oCiiaa6q
z{^Fv44DtK#_+i;uz+>I!gMjoKjkQgPX$GN!DbqAXS(YVLRTaZ1mM~Anaf|>fwvD-t
z(Be(C8XiItnNi^26%6A14qn30e?oph?xD4_T5Wl^*=+idvH)EmqUfs7Znw2=x2xiC
jCMFjn$1e+j8=vO`rFEnwCxSSw00000NkvXXu0mjf%Rb!|

literal 0
HcmV?d00001

diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/assets/combobox-button-toolbar.png b/usr/share/themes/Lubuntu-default/gtk-3.0/assets/combobox-button-toolbar.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d4f3970db1080a42c79059bdd337cee1bcbc580
GIT binary patch
literal 493
zcmV<J0TTX+P)<h;3K|Lk000e1NJLTq000gE000#T1^@s6c3Izv0005BNkl<Zc-ozk
zze>YU6o=C`ZKB4csWqt$mYAmbcN2mI5u`&EI=Cq~`2=nb_90wci;fDugM+ITq+87@
zVsQ``>taEr{t6L_3VJ>8al$2E&N(-S(RH04QLoooh9+Fseg%U#zsJvg$FU#5z3W=%
zj$`eW%VqPc>w^VR6itrfDuN&oNs_9Hl3OVh3ah$4zhhbD6VJ16@sZ=<aG3ZMWx$S+
z0UY4LB#?lT&1OT-bDo31-T0J6koZD!j1)+NS<^HQQ27*MawJawat(=C7D^>;3so;6
zrv4%_apj3(vDhHQxrWI8RZIX5m$d}32Qfn<vibb9O^Evpk)sh)V9xj5w@#-sNh2nK
z0&&o4wdDVZZ&4HpRIRG2v=9VdA2Uu-U5=({A;ddcF>M$|4Puv8%wXBq!;oCiiaa6q
z{^Fv44DtK#_+i;uz+>I!gMjoKjkQgPX$GN!DbqAXS(YVLRTaZ1mM~Anaf|>fwvD-t
z(Be(C8XiItnNi^26%6A14qn30e?oph?xD4_T5Wl^*=+idvH)EmqUfs7Znw2=x2xiC
jCMFjn$1e+j8=vO`rFEnwCxSSw00000NkvXXu0mjf%Rb!|

literal 0
HcmV?d00001

diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/assets/radiance-combobox-button-toolbar-focused.png b/usr/share/themes/Lubuntu-default/gtk-3.0/assets/radiance-combobox-button-toolbar-focused.png
new file mode 100644
index 0000000000000000000000000000000000000000..30df61630afb3c8c767a7a47745b9183f4016dff
GIT binary patch
literal 596
zcmV-a0;~OrP)<h;3K|Lk000e1NJLTq000gE000#T1^@s6c3Izv00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-3$;G4;SlwSp@(90pUqR
zK~y-)m6X40Q&AMhzu$ZBdoQoeOAMw-tDs9UU=ei?m$sk<p&4{?aC7P)3JygF{R;#^
zgu2v0K`3SvsgqO?O9v65V2gu47EQpVlG^0GckgkjA(Vo7U--gZKIeNmoO5{V<z@r`
zosVDQhj;5;3@Dzz_rWPboPYqJDFVPM!fA>PwQc1jT?vgWKE5%z)&l`l0JLkhn)VNj
zo9e_=R61JCtHdv8Ka9L$X}ZgBX4`rvhK=1=x_;&?NdbTo0Mlo$&pv<vKzQ-mgIfLm
z`($ombzVfM0N6cF_q<a8>5E4<zgN8Y)gMt;08jyteeCwL@7l|bX7nHUKlK-EIjG#A
zU=LPlyGb$tpaum2K)Ri+pS#Us77#1TPn)398|y8TDe>Ft8|!JxCNZ2TaeSt(V8N+T
zy<@U~)01-*<s&VZ%Pv!5aV#41l*HH_v4ItMx@y5rW>A^jh*7Qs0GYZ9?OzHYKLE(U
z;GHM$j_kN#wixg^fTZ`;Mx&wMc2ApwdMnb-Mq+iIMhaHzbE&8cu{Eb6ovhuyd~%Uw
z!uh37j--ePNdkZ)#1UcvSkKvJXzc4ldH>nf+2iW~ev@?k{Pox2?KJU*Mhfw<;!wA5
isQWh~1(1;J-K4(}9=glo+cPTw0000<MNUMnLSTX=<_G=&

literal 0
HcmV?d00001

diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/assets/radiance-combobox-button-toolbar-pressed-focused.png b/usr/share/themes/Lubuntu-default/gtk-3.0/assets/radiance-combobox-button-toolbar-pressed-focused.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f5ab4edcd3efe3c9a0e8e1a0af0b7c4c3037df1
GIT binary patch
literal 542
zcmV+(0^$9MP)<h;3K|Lk000e1NJLTq000gE000#T1^@s6c3Izv0005yNkl<ZcmZSB
zzkfal1n*~IAO#%Uy!<y1|A5ke4{QRmH!b_Pf77zp2R1Hyx_AAOJ=<2#E#9$ejtaV7
zSs)gWl#~=vQ&STO^7NF+N{&$}Dap`js>nB8Jfkmh>+(7C_pV?1V9&b63;+NB&j`~f
z2*fN%m=%cGpqL$qIf0lrB{o!X|HdVscCMKp0MpC|#EfW|2?;Yp4ddCoY-Z=qH4B#l
zHG;$$cnJgpBUCfToJk$tyVor|4%Em@j7A2i&1{pqYOVKfSab!bkp-cVu&t~;4V7B^
z)-Qex)W}APM&^vTIO)CX7k&b2WG6|ZsHiB<-t~+AJbU(xi)f8de{$_vzwpPyOP2&m
z(kL!2&b?>d!auKGz2YHBV^w~N`0n)!J_7y7O_CpH^){&OT08F%$r_i;>M;dsyiBsj
z)k~&0?_4wQD9IYPE}zx5bL~7(4j~vFj4(~pyBoxIu9^Gsz~<$FK#i;*Ndb^VXlN)~
zZmuW$%#L#Y*%MmDS1p<-w{h__^-asBhizRkYsQY%bM66cn*r3s2R0HY@EeGKK<U3g
z{2hot>{vbb<&HIT9`9H)cgLQMi}Np@-me4HBmm1&48X{gc=P75^p}?}#esstP%H$+
gf>6agko1WF063rwJBNP7+W-In07*qoM6N<$g7-H2oB#j-

literal 0
HcmV?d00001

diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/assets/radiance-combobox-button-toolbar.png b/usr/share/themes/Lubuntu-default/gtk-3.0/assets/radiance-combobox-button-toolbar.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f5ab4edcd3efe3c9a0e8e1a0af0b7c4c3037df1
GIT binary patch
literal 542
zcmV+(0^$9MP)<h;3K|Lk000e1NJLTq000gE000#T1^@s6c3Izv0005yNkl<ZcmZSB
zzkfal1n*~IAO#%Uy!<y1|A5ke4{QRmH!b_Pf77zp2R1Hyx_AAOJ=<2#E#9$ejtaV7
zSs)gWl#~=vQ&STO^7NF+N{&$}Dap`js>nB8Jfkmh>+(7C_pV?1V9&b63;+NB&j`~f
z2*fN%m=%cGpqL$qIf0lrB{o!X|HdVscCMKp0MpC|#EfW|2?;Yp4ddCoY-Z=qH4B#l
zHG;$$cnJgpBUCfToJk$tyVor|4%Em@j7A2i&1{pqYOVKfSab!bkp-cVu&t~;4V7B^
z)-Qex)W}APM&^vTIO)CX7k&b2WG6|ZsHiB<-t~+AJbU(xi)f8de{$_vzwpPyOP2&m
z(kL!2&b?>d!auKGz2YHBV^w~N`0n)!J_7y7O_CpH^){&OT08F%$r_i;>M;dsyiBsj
z)k~&0?_4wQD9IYPE}zx5bL~7(4j~vFj4(~pyBoxIu9^Gsz~<$FK#i;*Ndb^VXlN)~
zZmuW$%#L#Y*%MmDS1p<-w{h__^-asBhizRkYsQY%bM66cn*r3s2R0HY@EeGKK<U3g
z{2hot>{vbb<&HIT9`9H)cgLQMi}Np@-me4HBmm1&48X{gc=P75^p}?}#esstP%H$+
gf>6agko1WF063rwJBNP7+W-In07*qoM6N<$g7-H2oB#j-

literal 0
HcmV?d00001

diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-lubuntu.css b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-lubuntu.css
new file mode 100644
index 0000000..75fca3d
--- /dev/null
+++ b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-lubuntu.css
@@ -0,0 +1,223 @@
+
+
+/**********
+ * states *
+ **********/
+*:insensitive {
+    color: shade (@bg_color, 0.6);
+    text-shadow: none;
+}
+
+/************
+ * toolbars *
+ ************/
+
+.menubar.toolbar,
+.primary-toolbar,
+.primary-toolbar .toolbar,
+.primary-toolbar.toolbar {
+	-GtkWidget-window-dragging: true;
+	background-image: -gtk-gradient (linear, left top, left bottom,
+					from (@toolbar_bg_top_color),
+					to (@toolbar_bg_bottom_color));
+	border-top-color: @toolbar_border_top_color;
+	border-bottom-color: @toolbar_border_bottom_color;
+	border-style: solid;
+	border-width: 1px 0 1px 0;
+	padding: 2px;
+	color: @toolbar_fg_color;
+	-unico-border-gradient: none;
+	-unico-inner-stroke-gradient: none;
+	-unico-inner-stroke-top-color: @transparent;
+	-unico-inner-stroke-width: 0;
+}
+
+.menubar.toolbar :insensitive,
+.primary-toolbar :insensitive {
+	color: mix (@toolbar_bg_color, @toolbar_fg_color, 0.35);
+}
+
+.menubar.toolbar GtkSeparatorToolItem,
+.menubar.toolbar .separator,
+.menubar.toolbar .separator:insensitive,
+.primary-toolbar GtkSeparatorToolItem,
+.primary-toolbar .separator,
+.primary-toolbar .separator:insensitive {
+	border-color: alpha (shade (@toolbar_bg_color, 0.9), 0.5);
+	border-style: solid;
+
+	-unico-border-gradient: none;
+	-unico-inner-stroke-color: alpha (shade (@toolbar_bg_color, 1.26), 0.4);
+	-unico-inner-stroke-gradient: none;
+}
+
+
+/*************************
+ * progressbar and scale *
+ *************************/
+
+.scale.trough.highlight {
+    background-color: @progress_color;
+    background-image: none;
+    background-clip: content-box;
+}
+
+.menubar .menuitem .scale.highlight.left,
+.scale.highlight.left,
+.progressbar,
+.progressbar row,
+.progressbar row:hover,
+.progressbar row:selected,
+.progressbar row:selected:focused {
+    border-radius: 8px;
+    border-width: 0px;
+    background-image: none;
+    background-color: @progress_color;
+    border-style: solid;
+}
+
+/********
+ * menu *
+ ********/
+
+.menubar {
+	padding: 2px;
+}
+
+GtkTreeMenu.menu .menuitem:insensitive,
+GtkTreeMenu.menu .menuitem *:insensitive,
+.toolbar .primary-toolbar .menu .menuitem:insensitive,
+.toolbar .primary-toolbar .menu .menuitem *:insensitive,
+.toolbar .menubar.toolbar .menu .menuitem:insensitive,
+.toolbar .menubar.toolbar .menu .menuitem *:insensitive,
+.toolbar .header-bar .menu .menuitem:insensitive,
+.toolbar .header-bar .menu .menuitem *:insensitive,
+GtkMenuToolButton.menu .menuitem:insensitive,
+GtkMenuToolButton.menu .menuitem *:insensitive,
+.primary-toolbar .button .menu .menuitem:insensitive,
+.primary-toolbar .button .menu .menuitem *:insensitive,
+.menubar.toolbar .button .menu .menuitem:insensitive,
+.menubar.toolbar .button .menu .menuitem *:insensitive,
+.header-bar .button .menu .menuitem:insensitive,
+.header-bar .button .menu .menuitem *:insensitive,
+.menuitem:insensitive,
+.menuitem *:insensitive {
+    color: mix (@dark_fg_color, @dark_bg_color, 0.5);
+    text-shadow: none;
+}
+
+.menuitem .accelerator:insensitive {
+    color: alpha (mix (@dark_fg_color, @dark_bg_color, 0.5), 0.5);
+    text-shadow: none;
+}
+
+/***************
+ * menubaritem *
+ ***************/
+
+.menubar.menuitem:hover,
+.menubar .menuitem:hover {
+    border-radius: 4px 4px 0 0;
+    border-width: 1px 1px 0 1px;
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (@selected_bg_color, 1.20)),
+                                     to (shade (@selected_bg_color, 0.80)));
+
+    box-shadow: none;
+
+    color: @selected_fg_color;
+    text-shadow: none;
+}
+
+
+/*************
+ * Scrollbar *
+ *************/
+.scrollbar {
+	background-image: none;
+	border-style: solid;
+	-GtkRange-trough-border: 0;
+	-GtkRange-arrow-scaling: 0.444;
+	-GtkRange-slider-width: 10;
+	-GtkRange-stepper-size: 0;
+	-GtkScrollbar-min-slider-length: 30;
+	-GtkRange-stepper-spacing: 0;
+	-GtkRange-trough-under-steppers: 1;
+	-unico-inner-stroke-style: none;
+}
+
+.scrollbar,
+.scrollbar.vertical,
+.scrollbar.horizontal {
+    -GtkScrollbar-has-backward-stepper: 0;
+    -GtkScrollbar-has-forward-stepper: 0;
+    -GtkRange-slider-width: 12px;
+    border-radius: 10px;
+    border-image: none;
+}
+
+/* Through */
+.scrollbar.trough.vertical,
+.scrollbar.trough.horizontal {
+	background-image: -gtk-gradient (linear,
+		left top, right top,
+		from (shade (@trough_bg_color_b, 0.99)),
+		to (@trough_bg_color_a));
+	background-color: shade (@theme_bg_color, 0.882);
+	border-radius: 0;
+	-adwaita-border-gradient: -gtk-gradient (linear,
+		left top, right top,
+		from (alpha (@scrollslider_gradient_a, 1.00)),
+		to (alpha (@scrollslider_gradient_a, 0.00)));
+	border-width: 0;
+	border-style: none;
+}
+
+
+/* Sliders and buttons */
+.scrollbar.slider.vertical,
+.scrollbar.button.vertical,
+.scrollbar.slider.horizontal,
+.scrollbar.button.horizontal {
+	background-image: -gtk-gradient (linear,
+		left top, right top,
+		from (@scrollslider_gradient_a),
+		to (@scrollslider_gradient_b));
+	background-color: @theme_base_color;
+	border-color: transparent;
+	border-radius: 10;
+	border-width: 1px;
+}
+
+.scrollbar.slider.vertical:prelight,
+.scrollbar.slider.horizontal:prelight {
+	background-image: -gtk-gradient (linear,
+		left top, right top,
+		from (shade (@scrollslider_gradient_a, 0.90)),
+		to (shade (@scrollslider_gradient_b, 0.90)));
+	background-color: @theme_base_color;
+	border-color: transparent;
+	border-radius: 10;
+	border-width: 1px;
+}
+
+.scrollbar.slider.vertical:prelight:active,
+.scrollbar.slider.horizontal:prelight:active {
+	background-image: -gtk-gradient (linear,
+		left top, right top,
+		from (shade (@scrollslider_gradient_a, 0.80)),
+		to (shade (@scrollslider_gradient_b, 0.80)));
+	background-color: @theme_base_color;
+	border-color: transparent;
+	border-radius: 10;
+	border-width: 1px;
+}
+
+.scrollbar.slider:insensitive {
+	background-color: @theme_base_color;
+}
+
+.scrollbar.trough:insensitive {
+	background-color: shade (@theme_bg_color, 0.882);
+}
+
diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-main.css b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-main.css
new file mode 100644
index 0000000..fe97a29
--- /dev/null
+++ b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-main.css
@@ -0,0 +1,71 @@
+/*default color scheme */
+@define-color bg_color #e0e0e0;
+@define-color fg_color #4c4c4c;
+@define-color base_color #ffffff;
+@define-color text_color #333333;
+@define-color selected_bg_color #8FB2CF;
+@define-color selected_fg_color #ffffff;
+@define-color tooltip_bg_color #333333;
+@define-color tooltip_fg_color #ffffff;
+
+/* misc colors used by gtk+ */
+@define-color info_fg_color rgb (181, 171, 156);
+@define-color info_bg_color rgb (252, 252, 189);
+@define-color warning_fg_color rgb (173, 120, 41);
+@define-color warning_bg_color rgb (250, 173, 61);
+@define-color question_fg_color rgb (97, 122, 214);
+@define-color question_bg_color rgb (138, 173, 212);
+@define-color error_fg_color rgb (166, 38, 38);
+@define-color error_bg_color rgb (237, 54, 54);
+@define-color link_color @selected_bg_color;
+@define-color error_color #cc0000;
+@define-color combobox_color #888888;
+@define-color progress_color #5591c3;
+@define-color scroll_color #B3B3B3;
+
+/* theme common colors */
+@define-color button_bg_color shade (@bg_color, 1.02); /*shade (#cdcdcd, 1.08);*/
+@define-color notebook_button_bg_color shade (@bg_color, 1.02);
+@define-color button_insensitive_bg_color mix (@button_bg_color, @bg_color, 0.6);
+@define-color dark_bg_color #e0e0e0;
+@define-color dark_fg_color @fg_color;
+@define-color borders @dark_bg_color;
+@define-color transparent rgba (0, 0, 0, 0);
+
+@define-color backdrop_fg_color mix (@bg_color, @fg_color, 0.8);
+@define-color backdrop_text_color mix (@base_color, @text_color, 0.8);
+@define-color backdrop_dark_fg_color mix (@dark_bg_color, @dark_fg_color, 0.75);
+@define-color backdrop_selected_bg_color shade (@bg_color, 0.92);
+@define-color backdrop_selected_fg_color @fg_color;
+
+@define-color scrollslider_gradient_a #bdbdbd;
+@define-color scrollslider_gradient_b #bdbdbd;
+@define-color scrollslider_border #bdbdbd;
+@define-color trough_bg_color_a #efefef;
+@define-color trough_bg_color_b #e0e0e0;
+
+@define-color toolbar_base #e0e0e0;
+@define-color toolbar_final #bcbcbc;
+@define-color toolbar_border #ffffff;
+@define-color toolbar_bg_color @toolbar_base;
+@define-color toolbar_fg_color @fg_color;
+@define-color toolbar_textshadow_color @bg_color;
+@define-color toolbar_bg_top_color @toolbar_base;
+@define-color toolbar_bg_bottom_color @toolbar_final;
+@define-color toolbar_border_top_color @toolbar_base;
+@define-color toolbar_border_bottom_color @toolbar_border;
+
+@import url("gtk-widgets-borders.css");
+@import url("gtk-widgets-borders-radiance.css");
+@import url("gtk-widgets-assets.css");
+@import url("gtk-widgets-assets-radiance.css");
+@import url("gtk-widgets.css");
+@import url("gtk-widgets-radiance.css");
+@import url("apps/unity.css");
+@import url("apps/baobab.css");
+@import url("apps/gedit.css");
+@import url("apps/nautilus.css");
+@import url("apps/gnome-panel.css");
+@import url("apps/gnome-terminal.css");
+
+@import url("gtk-lubuntu.css");
diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-assets-radiance.css b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-assets-radiance.css
index dbf3f13..69e73d6 100644
--- a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-assets-radiance.css
+++ b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-assets-radiance.css
@@ -10,6 +10,14 @@
     background-image: url("assets/check-menuitem-dark.png");
 }
 
+.menu .check:active:insensitive {
+    background-image: url("assets/check-menuitem-insensitive-dark.png");
+}
+
 .menu .radio:active {
     background-image: url("assets/radio-menuitem-dark.png");
 }
+
+.menu .radio:active:insensitive {
+    background-image: url("assets/radio-menuitem-insensitive-dark.png");
+}
\ No newline at end of file
diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-assets.css b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-assets.css
index b38a6f0..d008c19 100644
--- a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-assets.css
+++ b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-assets.css
@@ -92,6 +92,12 @@
     background-image: url("assets/check-selected-alt.png");
 }
 
+.check row:active:hover,
+.check row:selected:active:hover,
+.check row:selected:active:focus:hover {
+    background-image: url("assets/check-selected-hover-alt.png");
+}
+
 .check:active:insensitive {
     background-image: url("assets/check-selected-disabled.png");
 }
@@ -377,29 +383,55 @@
 }*/
 
 .primary-toolbar .menu .check,
+.menubar.toolbar .menu .check,
+.header-bar .menu .check,
 .menu .check {
     background-image: url("assets/check-menuitem-unselected.png");
 }
 
 .primary-toolbar .menu .radio,
+.menubar.toolbar .menu .radio,
+.header-bar .menu .radio,
 .menu .radio {
     background-image: url("assets/check-menuitem-unselected.png");
 }
 
 .primary-toolbar .menu .check:active,
+.menubar.toolbar .menu .check:active,
+.header-bar .menu .check:active,
 .toolbar .menu .check:active:hover,
 .menu .check:active,
 .menu .check:active:hover {
     background-image: url("assets/check-menuitem.png");
 }
 
+.primary-toolbar .menu .check:active:insensitive,
+.menubar.toolbar .menu .check:active:insensitive,
+.header-bar .menu .check:active:insensitive,
+.toolbar .menu .check:active:hover:insensitive,
+.menu .check:active:insensitive,
+.menu .check:active:hover:insensitive {
+    background-image: url("assets/check-menuitem-insensitive.png");
+}
+
 .primary-toolbar .menu .radio:active,
+.menubar.toolbar .menu .radio:active,
+.header-bar .menu .radio:active,
 .toolbar .menu .radio:active:hover,
 .menu .radio:active,
 .menu .radio:active:hover {
     background-image: url("assets/radio-menuitem.png");
 }
 
+.primary-toolbar .menu .radio:active:insensitive,
+.menubar.toolbar .menu .radio:active:insensitive,
+.header-bar .menu .radio:active:insensitive,
+.toolbar .menu .radio:active:hover:insensitive,
+.menu .radio:active:insensitive,
+.menu .radio:active:hover:insensitive {
+    background-image: url("assets/radio-menuitem-insensitive.png");
+}
+
 .toolbar .menu .check {
     background-image: url("assets/check-menuitem-unselected.png");
 }
@@ -412,10 +444,18 @@
     background-image: url("assets/check-menuitem-dark.png");
 }
 
+.toolbar .menu .check:active:insensitive {
+    background-image: url("assets/check-menuitem-insensitive-dark.png");
+}
+
 .toolbar .menu .radio:active {
     background-image: url("assets/radio-menuitem-dark.png");
 }
 
+.toolbar .menu .radio:active:insensitive {
+    background-image: url("assets/radio-menuitem-insensitive-dark.png");
+}
+
 /*********************
  * GtkScale's slider *
  *********************/
diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-backdrop.css b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-backdrop.css
index 55e1c1f..ac12b5b 100644
--- a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-backdrop.css
+++ b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-backdrop.css
@@ -37,6 +37,7 @@ GtkWindow:backdrop {
 *:selected:backdrop,
 *:selected:focused:backdrop {
     background-color: @backdrop_selected_bg_color;
+
     color: @backdrop_selected_fg_color;
 }
 
@@ -89,7 +90,6 @@ GtkScale.slider.vertical:backdrop,
     border-top-color: shade (@bg_color, 0.86);
     border-right-color: shade (@bg_color, 0.82);
     border-bottom-color: shade (@bg_color, 0.76);
-    border-bottom-color: #ff0000;
     border-left-color: shade (@bg_color, 0.82);
 
     color: mix (@fg_color, @bg_color, 0.2);
@@ -250,7 +250,17 @@ GtkComboBox.combobox-entry .button:insensitive:backdrop,
 .primary-toolbar .linked .button:backdrop,
 .primary-toolbar .linked .button:active:backdrop,
 .primary-toolbar .linked .button:active:hover:backdrop,
-.primary-toolbar .linked .button:insensitive:backdrop {
+.primary-toolbar .linked .button:insensitive:backdrop,
+.menubar.toolbar .linked .entry:backdrop,
+.menubar.toolbar .linked .button:backdrop,
+.menubar.toolbar .linked .button:active:backdrop,
+.menubar.toolbar .linked .button:active:hover:backdrop,
+.menubar.toolbar .linked .button:insensitive:backdrop,
+.header-bar .linked .entry:backdrop,
+.header-bar .linked .button:backdrop,
+.header-bar .linked .button:active:backdrop,
+.header-bar .linked .button:active:hover:backdrop,
+.header-bar .linked .button:insensitive:backdrop {
     border-width: 1px;
     border-right-width: 0;
 
@@ -269,7 +279,17 @@ GtkComboBox.combobox-entry .button:insensitive:backdrop,
 .primary-toolbar .linked .button:first-child:backdrop,
 .primary-toolbar .linked .button:active:first-child:backdrop,
 .primary-toolbar .linked .button:active:hover:first-child:backdrop,
-.primary-toolbar .linked .button:insensitive:first-child:backdrop {
+.primary-toolbar .linked .button:insensitive:first-child:backdrop,
+.menubar.toolbar .linked .entry:first-child:backdrop,
+.menubar.toolbar .linked .button:first-child:backdrop,
+.menubar.toolbar .linked .button:active:first-child:backdrop,
+.menubar.toolbar .linked .button:active:hover:first-child:backdrop,
+.menubar.toolbar .linked .button:insensitive:first-child:backdrop,
+.header-bar .linked .entry:first-child:backdrop,
+.header-bar .linked .button:first-child:backdrop,
+.header-bar .linked .button:active:first-child:backdrop,
+.header-bar .linked .button:active:hover:first-child:backdrop,
+.header-bar .linked .button:insensitive:first-child:backdrop {
     border-width: 1px;
     border-right-width: 0;
 
@@ -290,7 +310,17 @@ GtkComboBox.combobox-entry .button:insensitive:backdrop,
 .primary-toolbar .linked .button:last-child:backdrop,
 .primary-toolbar .linked .button:active:last-child:backdrop,
 .primary-toolbar .linked .button:active:hover:last-child:backdrop,
-.primary-toolbar .linked .button:insensitive:last-child:backdrop {
+.primary-toolbar .linked .button:insensitive:last-child:backdrop,
+.menubar.toolbar .linked .entry:last-child:backdrop,
+.menubar.toolbar .linked .button:last-child:backdrop,
+.menubar.toolbar .linked .button:active:last-child:backdrop,
+.menubar.toolbar .linked .button:active:hover:last-child:backdrop,
+.menubar.toolbar .linked .button:insensitive:last-child:backdrop,
+.header-bar .linked .entry:last-child:backdrop,
+.header-bar .linked .button:last-child:backdrop,
+.header-bar .linked .button:active:last-child:backdrop,
+.header-bar .linked .button:active:hover:last-child:backdrop,
+.header-bar .linked .button:insensitive:last-child:backdrop {
     border-width: 1px;
 
     border-radius: 3px;
@@ -310,7 +340,17 @@ GtkComboBox.combobox-entry .button:insensitive:backdrop,
 .primary-toolbar .linked .button:only-child:backdrop,
 .primary-toolbar .linked .button:active:only-child:backdrop,
 .primary-toolbar .linked .button:active:hover:only-child:backdrop,
-.primary-toolbar .linked .button:insensitive:only-child:backdrop {
+.primary-toolbar .linked .button:insensitive:only-child:backdrop,
+.menubar.toolbar .linked .entry:only-child:backdrop,
+.menubar.toolbar .linked .button:only-child:backdrop,
+.menubar.toolbar .linked .button:active:only-child:backdrop,
+.menubar.toolbar .linked .button:active:hover:only-child:backdrop,
+.menubar.toolbar .linked .button:insensitive:only-child:backdrop,
+.header-bar .linked .entry:only-child:backdrop,
+.header-bar .linked .button:only-child:backdrop,
+.header-bar .linked .button:active:only-child:backdrop,
+.header-bar .linked .button:active:hover:only-child:backdrop,
+.header-bar .linked .button:insensitive:only-child:backdrop {
     border-width: 1px;
 
     border-radius: 3px;
@@ -592,6 +632,10 @@ GtkComboBox.combobox-entry .button:insensitive:backdrop {
 
 .primary-toolbar .entry.progressbar:backdrop,
 .primary-toolbar .entry.progressbar:backdrop,
+.menubar.toolbar .entry.progressbar:backdrop,
+.menubar.toolbar .entry.progressbar:backdrop,
+.header-bar .entry.progressbar:backdrop,
+.header-bar .entry.progressbar:backdrop,
 .entry.progressbar:backdrop {
 }
 
@@ -660,7 +704,7 @@ GtkIconView.view.cell:selected:focused:backdrop {
  ***********/
 .menubar:backdrop,
 .menubar .menuitem:backdrop {
-    color: shade (@bg_color, 0.86); /* metacity unfocused color */
+    color: shade (#a39e9a, 0.86); /* metacity unfocused color */
 }
 
 /************
@@ -839,7 +883,9 @@ GtkScrolledWindow.frame:backdrop {
 }
 
 .menubar .menuitem.separator:backdrop,
-.primary-toolbar .menuitem.separator:backdrop {
+.primary-toolbar .menuitem.separator:backdrop,
+.menubar.toolbar .menuitem.separator:backdrop,
+.header-bar .menuitem.separator:backdrop {
 }
 
 /***********
@@ -897,7 +943,11 @@ GtkScrolledWindow.frame:backdrop {
  ***********/
 .menu.spinner:backdrop,
 .primary-toolbar .spinner:backdrop,
-.primary-toolbar .spinner:backdrop {
+.primary-toolbar .spinner:backdrop,
+.menubar.toolbar .spinner:backdrop,
+.menubar.toolbar .spinner:backdrop,
+.header-bar .spinner:backdrop,
+.header-bar .spinner:backdrop {
     color: @backdrop_selected_bg_color;
 }
 
@@ -1003,7 +1053,11 @@ GtkTextView:backdrop {
 /* primary-toolbar */
 .primary-toolbar:backdrop,
 .primary-toolbar .toolbar:backdrop,
-.primary-toolbar.toolbar:backdrop {
+.primary-toolbar.toolbar:backdrop,
+.menubar.toolbar .toolbar:backdrop,
+.menubar.toolbar.toolbar:backdrop,
+.header-bar .toolbar:backdrop,
+.header-bar.toolbar:backdrop {
     background-color: @dark_bg_color;
     background-image: none;
     border-bottom-color: shade (@dark_bg_color, 0.94);
@@ -1011,7 +1065,7 @@ GtkTextView:backdrop {
     border-width: 0 0 1px 0;
     padding: 2px;
 
-    color: shade (@bg_color, 0.86); /* metacity unfocused color */
+    color: shade (#a39e9a, 0.86); /* metacity unfocused color */
     text-shadow: 0 1px shade (@dark_bg_color, 1.06);
 
     -unico-border-gradient: none;
@@ -1019,13 +1073,21 @@ GtkTextView:backdrop {
     -unico-inner-stroke-width: 0;
 }
 
-.primary-toolbar :insensitive:backdrop {
+.primary-toolbar :insensitive:backdrop,
+.menubar.toolbar :insensitive:backdrop,
+.header-bar :insensitive:backdrop {
     text-shadow: 0 -1px shade (@dark_bg_color, 0.82);
 }
 
 .primary-toolbar GtkComboBox:backdrop,
 .primary-toolbar .button *:backdrop,
-.primary-toolbar .button:backdrop {
+.primary-toolbar .button:backdrop,
+.menubar.toolbar GtkComboBox:backdrop,
+.menubar.toolbar .button *:backdrop,
+.menubar.toolbar .button:backdrop,
+.header-bar GtkComboBox:backdrop,
+.header-bar .button *:backdrop,
+.header-bar .button:backdrop {
     background-color: @transparent;
     background-image: none;
     border-color: @transparent;
@@ -1033,7 +1095,7 @@ GtkTextView:backdrop {
     border-width: 1px;
     padding: 2px;
 
-    color: shade (@bg_color, 0.86); /* metacity unfocused color */
+    color: shade (#a39e9a, 0.86); /* metacity unfocused color */
     text-shadow: 0 1px shade (@dark_bg_color, 1.06);
 
     /* This breaks Gtk+ 3.5.x, lp #1015497. */
@@ -1050,15 +1112,27 @@ GtkTextView:backdrop {
     -unico-outer-stroke-width: 0;
 }
 
-.primary-toolbar .button *:hover:backdrop {
-    color: shade (shade (@bg_color, 0.86), 1.1);
+.primary-toolbar .button *:hover:backdrop,
+.menubar.toolbar .button *:hover:backdrop,
+.header-bar .button *:hover:backdrop {
+    color: shade (shade (#a39e9a, 0.86), 1.1);
 }
 
 .primary-toolbar .raised .button:backdrop,
 .primary-toolbar .raised.button:backdrop,
 .primary-toolbar .button:hover:backdrop,
 .primary-toolbar .button:active:backdrop,
-.primary-toolbar .button:insensitive:backdrop {
+.primary-toolbar .button:insensitive:backdrop,
+.menubar.toolbar .raised .button:backdrop,
+.menubar.toolbar .raised.button:backdrop,
+.menubar.toolbar .button:hover:backdrop,
+.menubar.toolbar .button:active:backdrop,
+.menubar.toolbar .button:insensitive:backdrop,
+.header-bar .raised .button:backdrop,
+.header-bar .raised.button:backdrop,
+.header-bar .button:hover:backdrop,
+.header-bar .button:active:backdrop,
+.header-bar .button:insensitive:backdrop {
     border-width: 1px;
 
     /* This breaks Gtk+ 3.5.x, lp #1015497. */
@@ -1076,7 +1150,9 @@ GtkTextView:backdrop {
     -unico-outer-stroke-width: 1px;
 }
 
-.primary-toolbar GtkComboBox.combobox-entry .button:backdrop {
+.primary-toolbar GtkComboBox.combobox-entry .button:backdrop,
+.menubar.toolbar GtkComboBox.combobox-entry .button:backdrop,
+.header-bar GtkComboBox.combobox-entry .button:backdrop {
     -unico-inner-stroke-width: 1px;
     -unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
                                                  from (shade (@dark_bg_color, 1.01)),
@@ -1086,7 +1162,15 @@ GtkTextView:backdrop {
 .primary-toolbar GtkComboBox.combobox-entry .button:backdrop,
 .primary-toolbar .raised .button:backdrop,
 .primary-toolbar .raised.button:backdrop,
-.primary-toolbar .button:hover:backdrop {
+.primary-toolbar .button:hover:backdrop,
+.menubar.toolbar GtkComboBox.combobox-entry .button:backdrop,
+.menubar.toolbar .raised .button:backdrop,
+.menubar.toolbar .raised.button:backdrop,
+.menubar.toolbar .button:hover:backdrop,
+.header-bar GtkComboBox.combobox-entry .button:backdrop,
+.header-bar .raised .button:backdrop,
+.header-bar .raised.button:backdrop,
+.header-bar .button:hover:backdrop {
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@dark_bg_color, 1.06)),
                                      to (shade (@dark_bg_color, 0.98)));
@@ -1100,7 +1184,9 @@ GtkTextView:backdrop {
                                                  to (shade (@dark_bg_color, 1.02)));
 }
 
-.primary-toolbar .button:active:backdrop {
+.primary-toolbar .button:active:backdrop,
+.menubar.toolbar .button:active:backdrop,
+.header-bar .button:active:backdrop {
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@dark_bg_color, 0.9)),
                                      to (shade (@dark_bg_color, 0.95)));
@@ -1115,7 +1201,9 @@ GtkTextView:backdrop {
                                                  to (shade (@dark_bg_color, 0.93)))
 }
 
-.primary-toolbar .button:active:hover:backdrop {
+.primary-toolbar .button:active:hover:backdrop,
+.menubar.toolbar .button:active:hover:backdrop,
+.header-bar .button:active:hover:backdrop {
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@dark_bg_color, 0.95)),
                                      to (shade (@dark_bg_color, 1.0)));
@@ -1129,7 +1217,11 @@ GtkTextView:backdrop {
 }
 
 .primary-toolbar .button:active:insensitive:backdrop,
-.primary-toolbar .button:insensitive:backdrop {
+.primary-toolbar .button:insensitive:backdrop,
+.menubar.toolbar .button:active:insensitive:backdrop,
+.menubar.toolbar .button:insensitive:backdrop,
+.header-bar .button:active:insensitive:backdrop,
+.header-bar .button:insensitive:backdrop {
     text-shadow: none;
 
     -unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
@@ -1141,7 +1233,9 @@ GtkTextView:backdrop {
                                                  to (shade (@dark_bg_color, 1.06)));
 }
 
-.primary-toolbar .button:insensitive:backdrop {
+.primary-toolbar .button:insensitive:backdrop,
+.menubar.toolbar .button:insensitive:backdrop,
+.header-bar .button:insensitive:backdrop {
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@dark_bg_color, 1.01)),
                                      to (shade (@dark_bg_color, 0.99)));
@@ -1151,7 +1245,9 @@ GtkTextView:backdrop {
                                                  to (shade (@dark_bg_color, 1.04)));
 }
 
-.primary-toolbar .button:active:insensitive:backdrop {
+.primary-toolbar .button:active:insensitive:backdrop,
+.menubar.toolbar .button:active:insensitive:backdrop,
+.header-bar .button:active:insensitive:backdrop {
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@dark_bg_color, 0.94)),
                                      to (shade (@dark_bg_color, 1.02)));
@@ -1163,7 +1259,13 @@ GtkTextView:backdrop {
 
 .primary-toolbar .entry:backdrop,
 .primary-toolbar .entry:active:backdrop,
-.primary-toolbar .entry:focused:backdrop {
+.primary-toolbar .entry:focused:backdrop,
+.menubar.toolbar .entry:backdrop,
+.menubar.toolbar .entry:active:backdrop,
+.menubar.toolbar .entry:focused:backdrop,
+.header-bar .entry:backdrop,
+.header-bar .entry:active:backdrop,
+.header-bar .entry:focused:backdrop {
     border-radius: 3px;
 
     color: @text_color;
@@ -1174,7 +1276,9 @@ GtkTextView:backdrop {
                                                  to (shade (@dark_bg_color, 1.06)));
 }
 
-.primary-toolbar .entry:backdrop {
+.primary-toolbar .entry:backdrop,
+.menubar.toolbar .entry:backdrop,
+.header-bar .entry:backdrop {
     -unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
                                            from (shade (@dark_bg_color, 0.75)),
                                            to (shade (@dark_bg_color, 0.95)));
@@ -1183,14 +1287,18 @@ GtkTextView:backdrop {
                                                  to (alpha (shade (@bg_color, 0.05), 0.01)));
 }
 
-.primary-toolbar .entry:insensitive:backdrop {
+.primary-toolbar .entry:insensitive:backdrop,
+.menubar.toolbar .entry:insensitive:backdrop,
+.header-bar .entry:insensitive:backdrop {
     -unico-outer-stroke-width: 1px;
     -unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
                                                  from (shade (@dark_bg_color, 1.01)),
                                                  to (shade (@dark_bg_color, 1.06)));
 }
 
-.primary-toolbar .entry:focused:backdrop {
+.primary-toolbar .entry:focused:backdrop,
+.menubar.toolbar .entry:focused:backdrop,
+.header-bar .entry:focused:backdrop {
     -unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
                                            from (shade (@backdrop_selected_bg_color, 0.75)),
                                            to (shade (@backdrop_selected_bg_color, 0.8)));
@@ -1200,7 +1308,13 @@ GtkTextView:backdrop {
 
 .primary-toolbar GtkSeparatorToolItem:backdrop,
 .primary-toolbar .separator:backdrop,
-.primary-toolbar .separator:insensitive:backdrop {
+.primary-toolbar .separator:insensitive:backdrop,
+.menubar.toolbar GtkSeparatorToolItem:backdrop,
+.menubar.toolbar .separator:backdrop,
+.menubar.toolbar .separator:insensitive:backdrop,
+.header-bar GtkSeparatorToolItem:backdrop,
+.header-bar .separator:backdrop,
+.header-bar .separator:insensitive:backdrop {
     border-color: shade (@dark_bg_color, 0.94);
     border-style: solid;
 
diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-borders-radiance.css b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-borders-radiance.css
index 7a6570b..0a9cde2 100644
--- a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-borders-radiance.css
+++ b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-borders-radiance.css
@@ -1,36 +1,73 @@
-.primary-toolbar .button {
+.primary-toolbar .button,
+.menubar.toolbar .button,
+.header-bar .button {
     border-image: url("assets/radiance-button-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
 }
 
-.primary-toolbar .button:focused {
+.primary-toolbar .button:focused,
+.menubar.toolbar .button:focused,
+.header-bar .button:focused {
     border-image: url("assets/radiance-button-toolbar-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
 }
 
-.primary-toolbar .button:active {
+.primary-toolbar .button:active,
+.menubar.toolbar .button:active,
+.header-bar .button:active {
     border-image: url("assets/radiance-button-toolbar-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
 }
 
-.primary-toolbar .button:active:focused {
+.primary-toolbar .button:active:focused,
+.menubar.toolbar .button:active:focused,
+.header-bar .button:active:focused {
     border-image: url("assets/radiance-button-toolbar-active-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
 }
 
-.primary-toolbar .button:backdrop {
+.primary-toolbar .button:backdrop,
+.menubar.toolbar .button:backdrop,
+.header-bar .button:backdrop {
     border-image: url("assets/radiance-backdrop-button-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
 }
 
-.primary-toolbar .button:active:backdrop {
+.primary-toolbar .button:active:backdrop,
+.menubar.toolbar .button:active:backdrop,
+.header-bar .button:active:backdrop {
     border-image: url("assets/radiance-backdrop-button-toolbar-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
 }
 
-.primary-toolbar .entry {
+.primary-toolbar .entry,
+.menubar.toolbar .entry,
+.header-bar .entry {
     border-image: url("assets/radiance-entry-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
 }
 
-.primary-toolbar .entry:focus {
+.primary-toolbar .entry:focus,
+.menubar.toolbar .entry:focus,
+.header-bar .entry:focus {
     border-image: url("assets/radiance-entry-toolbar-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
 }
 
+.primary-toolbar GtkComboBox.combobox-entry .button,
+.primary-toolbar GtkComboBox.combobox-entry .button:focus:insensitive,
+.menubar.toolbar GtkComboBox.combobox-entry .button,
+.menubar.toolbar GtkComboBox.combobox-entry .button:focus:insensitive,
+.header-bar GtkComboBox.combobox-entry .button,
+.header-bar GtkComboBox.combobox-entry .button:focus:insensitive {
+    border-image: url("assets/radiance-combobox-button-toolbar.png") 10 12 10 1 / 10px 12px 10px 1px stretch;
+}
+
+.primary-toolbar GtkComboBox.combobox-entry .button:focus,
+.menubar.toolbar GtkComboBox.combobox-entry .button:focus,
+.header-bar GtkComboBox.combobox-entry .button:focus {
+    border-image: url("assets/radiance-combobox-button-toolbar-focused.png") 10 12 10 1 / 10px 12px 10px 1px stretch;
+}
+
+.primary-toolbar GtkComboBox.combobox-entry .button:focus:active:focus,
+.menubar.toolbar GtkComboBox.combobox-entry .button:focus:active:focus,
+.header-bar GtkComboBox.combobox-entry .button:focus:active:focus {
+    border-image: url("assets/radiance-combobox-button-toolbar-pressed-focused.png") 10 12 10 1 / 10px 12px 10px 1px stretch;
+}
+
 .menubar.menuitem:hover,
 .menubar .menuitem:hover {
-    border-image: none;
-}
+    border-image: url("assets/radiance-menubaritem.png") 8 10 1 10 / 8px 10px 1px 10px stretch;
+}
\ No newline at end of file
diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-borders.css b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-borders.css
index 8b99ea9..b9f30af 100644
--- a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-borders.css
+++ b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-borders.css
@@ -19,7 +19,7 @@ GtkSwitch.trough:active {
  * button *
  **********/
 .button {
-    border-radius: 9px;
+    border-radius: 8px;
     border-width: 1px;
     border-style: solid;
     border-color: transparent;
@@ -110,32 +110,45 @@ GtkSwitch.trough:active {
     border-image: url("assets/button-default-focused-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
 }
 
-.primary-toolbar .button {
+.primary-toolbar .button,
+.menubar.toolbar .button,
+.header-bar .button {
     border-image: url("assets/button-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
 }
 
-.primary-toolbar .button:focused {
+.primary-toolbar .button:focused,
+.menubar.toolbar .button:focused,
+.header-bar .button:focused {
     border-image: url("assets/button-toolbar-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
 }
 
-.primary-toolbar .button:active {
+.primary-toolbar .button:active,
+.menubar.toolbar .button:active,
+.header-bar .button:active {
     border-image: url("assets/button-toolbar-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
 }
 
-.primary-toolbar .button:active:focused {
+.primary-toolbar .button:active:focused,
+.menubar.toolbar .button:active:focused,
+.header-bar .button:active:focused {
     border-image: url("assets/button-toolbar-active-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
 }
 
-.primary-toolbar .button:backdrop {
+.primary-toolbar .button:backdrop,
+.menubar.toolbar .button:backdrop,
+.header-bar .button:backdrop {
     border-image: url("assets/backdrop-button-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
 }
 
-.primary-toolbar .button:active:backdrop {
+.primary-toolbar .button:active:backdrop,
+.menubar.toolbar .button:active:backdrop,
+.header-bar .button:active:backdrop {
     border-image: url("assets/backdrop-button-toolbar-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
 }
 
 .menubar.menuitem:hover,
 .menubar .menuitem:hover {
+    border-image: url("assets/menubaritem.png") 8 10 1 10 / 8px 10px 1px 10px stretch;
 }
 
 /*********
@@ -175,16 +188,24 @@ GtkSwitch.trough:active {
     border-image: url("assets/backdrop-entry-disabled.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
 }
 
-.primary-toolbar .entry {
+.primary-toolbar .entry,
+.menubar.toolbar .entry,
+.header-bar .entry {
     border-image: url("assets/entry-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
 }
 
-.primary-toolbar .entry:focus {
+.primary-toolbar .entry:focus,
+.menubar.toolbar .entry:focus,
+.header-bar .entry:focus {
     border-image: url("assets/entry-toolbar-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
 }
 
 .primary-toolbar .entry.progressbar,
 .primary-toolbar .entry.progressbar,
+.menubar.toolbar .entry.progressbar,
+.menubar.toolbar .entry.progressbar,
+.header-bar .entry.progressbar,
+.header-bar .entry.progressbar,
 .entry.progressbar {
     border-radius: 8px;
     border-width: 0;
@@ -231,16 +252,45 @@ GtkComboBox.combobox-entry .button:active:focus {
     border-image: url("assets/combobox-button-pressed-focused.png") 10 12 10 1 / 10px 12px 10px 1px stretch;
 }
 
+.primary-toolbar GtkComboBox.combobox-entry .button,
+.primary-toolbar GtkComboBox.combobox-entry .button:focus:insensitive,
+.menubar.toolbar GtkComboBox.combobox-entry .button,
+.menubar.toolbar GtkComboBox.combobox-entry .button:focus:insensitive,
+.header-bar GtkComboBox.combobox-entry .button,
+.header-bar GtkComboBox.combobox-entry .button:focus:insensitive {
+    border-image: url("assets/combobox-button-toolbar.png") 10 12 10 1 / 10px 12px 10px 1px stretch;
+}
+
+.primary-toolbar GtkComboBox.combobox-entry .button:focus,
+.menubar.toolbar GtkComboBox.combobox-entry .button:focus,
+.header-bar GtkComboBox.combobox-entry .button:focus {
+    border-image: url("assets/combobox-button-toolbar-focused.png") 10 12 10 1 / 10px 12px 10px 1px stretch;
+}
+
+.primary-toolbar GtkComboBox.combobox-entry .button:focus:active:focus,
+.menubar.toolbar GtkComboBox.combobox-entry .button:focus:active:focus,
+.header-bar GtkComboBox.combobox-entry .button:focus:active:focus {
+    border-image: url("assets/combobox-button-toolbar-pressed-focused.png") 10 12 10 1 / 10px 12px 10px 1px stretch;
+}
+
 .primary-toolbar GtkComboBox.combobox-entry .entry:first-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:first-child {
+.primary-toolbar GtkComboBox.combobox-entry .button:first-child,
+.menubar.toolbar GtkComboBox.combobox-entry .entry:first-child,
+.menubar.toolbar GtkComboBox.combobox-entry .button:first-child,
+.header-bar GtkComboBox.combobox-entry .entry:first-child,
+.header-bar GtkComboBox.combobox-entry .button:first-child {
     border-image-width: 10px 0 10px 12px;
     border-radius: 8px 0 0 8px;
     border-right-width: 0;
 }
 
 .primary-toolbar GtkComboBox.combobox-entry .entry:last-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:last-child {
-    border-image-width: 10px 12px 10px 0;
+.primary-toolbar GtkComboBox.combobox-entry .button:last-child,
+.menubar.toolbar GtkComboBox.combobox-entry .entry:last-child,
+.menubar.toolbar GtkComboBox.combobox-entry .button:last-child,
+.header-bar GtkComboBox.combobox-entry .entry:last-child,
+.header-bar GtkComboBox.combobox-entry .button:last-child {
+    border-image-width: 10px 12px 10px 1px;
     border-radius: 0 8px 8px 0;
     border-left-width: 0;
 }
@@ -264,6 +314,22 @@ GtkComboBox.combobox-entry .button:active:focus {
 .primary-toolbar .raised .button:active,
 .primary-toolbar .button.raised:insensitive,
 .primary-toolbar .raised .button:insensitive,
+.menubar.toolbar .entry,
+.menubar.toolbar GtkComboBox.combobox-entry .entry,
+.menubar.toolbar GtkComboBox.combobox-entry .button,
+.menubar.toolbar .button:active,
+.menubar.toolbar .button.raised:active,
+.menubar.toolbar .raised .button:active,
+.menubar.toolbar .button.raised:insensitive,
+.menubar.toolbar .raised .button:insensitive,
+.header-bar .entry,
+.header-bar GtkComboBox.combobox-entry .entry,
+.header-bar GtkComboBox.combobox-entry .button,
+.header-bar .button:active,
+.header-bar .button.raised:active,
+.header-bar .raised .button:active,
+.header-bar .button.raised:insensitive,
+.header-bar .raised .button:insensitive,
 .inline-toolbar.toolbar .button:active,
 .inline-toolbar.toolbar .button:insensitive,
 .inline-toolbar.toolbar GtkToolButton .button:active,
@@ -271,7 +337,15 @@ GtkComboBox.combobox-entry .button:active:focus {
 .primary-toolbar GtkSwitch.trough,
 .primary-toolbar GtkSwitch.trough:insensitive,
 .primary-toolbar GtkComboBox .button:active,
-.primary-toolbar GtkComboBox .button:insensitive {
+.primary-toolbar GtkComboBox .button:insensitive,
+.menubar.toolbar GtkSwitch.trough,
+.header-bar GtkSwitch.trough,
+.menubar.toolbar GtkSwitch.trough:insensitive,
+.header-bar GtkSwitch.trough:insensitive,
+.menubar.toolbar GtkComboBox .button:active,
+.header-bar GtkComboBox .button:active,
+.menubar.toolbar GtkComboBox .button:insensitive,
+.header-bar GtkComboBox .button:insensitive {
 }
 
 /* primary toolbar - focused element borders */
@@ -283,16 +357,40 @@ GtkComboBox.combobox-entry .button:active:focus {
 .primary-toolbar .raised .button:focus:active,
 .primary-toolbar .button.raised.default:active,
 .primary-toolbar .raised .button.default:active,
+.menubar.toolbar .entry:focus,
+.menubar.toolbar .button:active:focus,
+.menubar.toolbar GtkComboBox.combobox-entry .entry:focus,
+.menubar.toolbar GtkComboBox.combobox-entry .button:focus,
+.menubar.toolbar .button.raised:focus:active,
+.menubar.toolbar .raised .button:focus:active,
+.menubar.toolbar .button.raised.default:active,
+.menubar.toolbar .raised .button.default:active,
+.header-bar .entry:focus,
+.header-bar .button:active:focus,
+.header-bar GtkComboBox.combobox-entry .entry:focus,
+.header-bar GtkComboBox.combobox-entry .button:focus,
+.header-bar .button.raised:focus:active,
+.header-bar .raised .button:focus:active,
+.header-bar .button.raised.default:active,
+.header-bar .raised .button.default:active,
 .inline-toolbar.toolbar .button:focus:active,
 .inline-toolbar.toolbar .button.default:active,
-.primary-toolbar GtkComboBox .button:active:focus {
+.primary-toolbar GtkComboBox .button:active:focus,
+.menubar.toolbar GtkComboBox .button:active:focus,
+.header-bar GtkComboBox .button:active:focus {
 }
 
 /* primary toolbar - generic button borders */
 .primary-toolbar .button.raised,
 .primary-toolbar .raised .button,
+.menubar.toolbar .button.raised,
+.menubar.toolbar .raised .button,
+.header-bar .button.raised,
+.header-bar .raised .button,
 .inline-toolbar.toolbar .button,
-.primary-toolbar GtkComboBox .button {
+.primary-toolbar GtkComboBox .button,
+.menubar.toolbar GtkComboBox .button,
+.header-bar GtkComboBox .button {
 }
 
 /* primary toolbar - focused button borders */
@@ -300,9 +398,19 @@ GtkComboBox.combobox-entry .button:active:focus {
 .primary-toolbar .button.raised.default,
 .primary-toolbar .raised .button:focus,
 .primary-toolbar .raised .button.default,
+.menubar.toolbar .button.raised:focus,
+.menubar.toolbar .button.raised.default,
+.menubar.toolbar .raised .button:focus,
+.menubar.toolbar .raised .button.default,
+.header-bar .button.raised:focus,
+.header-bar .button.raised.default,
+.header-bar .raised .button:focus,
+.header-bar .raised .button.default,
 .inline-toolbar.toolbar .button:focus,
 .inline-toolbar.toolbar .button.default,
-.primary-toolbar GtkComboBox .button:focus {
+.primary-toolbar GtkComboBox .button:focus,
+.menubar.toolbar GtkComboBox .button:focus,
+.header-bar GtkComboBox .button:focus {
 }
 
 /* column-headers borders */
@@ -375,15 +483,18 @@ GtkSwitch.trough:backdrop,
 }
 
 .trough {
+    border-image: url("assets/progressbar-horizontal-trough.png") 6 7 6 7 / 6px 7px 6px 7px stretch;
 }
 
 .trough.vertical {
+    border-image: url("assets/progressbar-vertical-trough.png") 7 6 7 6 / 7px 6px 7px 6px stretch;
 }
 
 .trough row {
 }
 
 .trough.vertical {
+    border-image: url("assets/progressbar-vertical-trough.png") 7 6 7 6 / 7px 6px 7px 6px stretch;
 }
 
 GtkSwitch.trough {
@@ -394,11 +505,15 @@ GtkSwitch.trough:active {
     border-image: url("assets/switch-trough-on.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
 }
 
-.primary-toolbar GtkSwitch.trough {
+.primary-toolbar GtkSwitch.trough,
+.menubar.toolbar GtkSwitch.trough,
+.header-bar GtkSwitch.trough {
     border-image: url("assets/switch-trough-toolbar-off.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
 }
 
-.primary-toolbar GtkSwitch.trough:active {
+.primary-toolbar GtkSwitch.trough:active,
+.menubar.toolbar GtkSwitch.trough:active,
+.header-bar GtkSwitch.trough:active {
     border-image: url("assets/switch-trough-toolbar-on.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
 }
 
diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-radiance.css b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-radiance.css
index eab9f38..791cfdf 100644
--- a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-radiance.css
+++ b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-radiance.css
@@ -1,38 +1,74 @@
 /* Set up shadows and hilights for button visual separation */
 .primary-toolbar .linked .button,
 .primary-toolbar .button.raised.linked,
-.primary-toolbar .raised.linked .button {
+.primary-toolbar .raised.linked .button,
+.menubar.toolbar .linked .button,
+.menubar.toolbar .button.raised.linked,
+.menubar.toolbar .raised.linked .button,
+.header-bar .linked .button,
+.header-bar .button.raised.linked,
+.header-bar .button.raised.linked .button {
     box-shadow: inset 1px 0 shade (@dark_bg_color, 1.1),
                 inset -1px 0 shade (@dark_bg_color, 0.9);
 }
 
 .primary-toolbar .linked .button:first-child,
 .primary-toolbar .button.raised.linked:first-child,
-.primary-toolbar .raised.linked .button:first-child {
+.primary-toolbar .raised.linked .button:first-child,
+.menubar.toolbar .linked .button:first-child,
+.menubar.toolbar .button.raised.linked:first-child,
+.menubar.toolbar .raised.linked .button:first-child,
+.header-bar .linked .button:first-child,
+.header-bar .button.raised.linked:first-child,
+.header-bar .raised.linked .button:first-child {
     box-shadow: inset -1px 0 shade (@dark_bg_color, 0.9);
 }
 
 .primary-toolbar .linked .button:last-child,
 .primary-toolbar .button.raised.linked:last-child,
-.primary-toolbar .raised.linked .button:last-child {
+.primary-toolbar .raised.linked .button:last-child,
+.menubar.toolbar .linked .button:last-child,
+.menubar.toolbar .button.raised.linked:last-child,
+.menubar.toolbar .raised.linked .button:last-child,
+.header-bar .linked .button:last-child,
+.header-bar .button.raised.linked:last-child,
+.header-bar .raised.linked .button:last-child {
     box-shadow: inset 1px 0 shade (@dark_bg_color, 1.1)
 }
 
 .primary-toolbar .linked .button:active,
 .primary-toolbar .button.raised.linked:active,
-.primary-toolbar .raised.linked .button:active {
+.primary-toolbar .raised.linked .button:active,
+.menubar.toolbar .linked .button:active,
+.menubar.toolbar .button.raised.linked:active,
+.menubar.toolbar .raised.linked .button:active,
+.header-bar .linked .button:active,
+.header-bar .button.raised.linked:active,
+.header-bar .raised.linked .button:active {
     box-shadow: inset 1px 0 shade (@dark_bg_color, 0.9);
 }
 
 .primary-toolbar .linked .button:insensitive,
 .primary-toolbar .button.raised.linked:insensitive,
-.primary-toolbar .raised.linked .button:insensitive {
+.primary-toolbar .raised.linked .button:insensitive,
+.menubar.toolbar .linked .button:insensitive,
+.menubar.toolbar .button.raised.linked:insensitive,
+.menubar.toolbar .raised.linked .button:insensitive,
+.header-bar .linked .button:insensitive,
+.header-bar .button.raised.linked:insensitive,
+.header-bar .raised.linked .button:insensitive {
     box-shadow: inset -1px 0 shade (@dark_bg_color, 0.9);
 }
 
 .primary-toolbar .linked .button:backdrop:last-child,
 .primary-toolbar .button.raised.linked:backdrop:last-child,
-.primary-toolbar .raised.linked .button:backdrop:last-child {
+.primary-toolbar .raised.linked .button:backdrop:last-child,
+.menubar.toolbar .linked .button:backdrop:last-child,
+.menubar.toolbar .button.raised.linked:backdrop:last-child,
+.menubar.toolbar .raised.linked .button:backdrop:last-child,
+.header-bar .linked .button:backdrop:last-child,
+.header-bar .button.raised.linked:backdrop:last-child,
+.header-bar .raised.linked .button:backdrop:last-child {
     box-shadow: inset 1px 0 shade (@dark_bg_color, 1.1);
 }
 
@@ -43,8 +79,8 @@
 
 .menubar.menuitem:hover,
 .menubar .menuitem:hover {
-    color: @selected_fg_color;
-    text-shadow: 0 1px shade (@selected_bg_color, 1.1);
+    color: @dark_fg_color;
+    text-shadow: 0 1px shade (@dark_bg_color, 1.1);
 }
 
 .menuitem:hover,
@@ -62,7 +98,9 @@
 /* primary-toolbar */
 .primary-toolbar,
 .primary-toolbar .toolbar,
-.primary-toolbar.toolbar {
+.primary-toolbar.toolbar,
+.menubar.toolbar,
+.header-bar {
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@dark_bg_color, 0.96)),
                                      to (shade (@dark_bg_color, 1.1)));
@@ -72,13 +110,21 @@
     text-shadow: 0 1px shade (@dark_bg_color, 1.1);
 }
 
-.primary-toolbar :insensitive {
+.primary-toolbar :insensitive,
+.menubar.toolbar :insensitive,
+.header-bar :insensitive {
     text-shadow: 0 1px shade (@dark_bg_color, 1.1);
 }
 
 .primary-toolbar GtkComboBox,
 .primary-toolbar .button *,
-.primary-toolbar .button {
+.primary-toolbar .button,
+.menubar.toolbar GtkComboBox,
+.menubar.toolbar .button *,
+.menubar.toolbar .button,
+.header-bar GtkComboBox,
+.header-bar .button *,
+.header-bar .button {
     text-shadow: 0 1px alpha (shade (@dark_bg_color, 1.25), 0.32);
 }
 
@@ -86,8 +132,18 @@
 .primary-toolbar .raised.button,
 .primary-toolbar .button:hover,
 .primary-toolbar .button:active,
-.primary-toolbar .button:insensitive {
+.primary-toolbar .button:insensitive,
+.menubar.toolbar .raised .button,
+.menubar.toolbar .raised.button,
+.menubar.toolbar .button:hover,
+.menubar.toolbar .button:active,
+.menubar.toolbar .button:insensitive,
+.header-bar .raised .button,
+.header-bar .raised.button,
+.header-bar .button:hover,
+.header-bar .button:active,
+.header-bar .button:insensitive {
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@dark_bg_color, 1.03)),
                                      to (shade (@dark_bg_color, 0.96)));
-}
+}
\ No newline at end of file
diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-toolbar.css b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-toolbar.css
deleted file mode 100644
index 308254c..0000000
--- a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-toolbar.css
+++ /dev/null
@@ -1,735 +0,0 @@
-/* primary-toolbar */
-.menubar.toolbar,
-.primary-toolbar,
-.primary-toolbar .toolbar,
-.primary-toolbar.toolbar {
-	-GtkWidget-window-dragging: true;
-	background-image: -gtk-gradient (linear, left top, left bottom,
-					from (@toolbar_bg_top_color),
-					to (@toolbar_bg_bottom_color));
-	border-top-color: @toolbar_border_top_color;
-	border-bottom-color: @toolbar_border_bottom_color;
-	border-style: solid;
-	border-width: 1px 0 1px 0;
-	padding: 2px;
-	color: @toolbar_fg_color;
-	-unico-border-gradient: none;
-	-unico-inner-stroke-gradient: none;
-	-unico-inner-stroke-top-color: @transparent;
-	-unico-inner-stroke-width: 0;
-}
-
-.menubar.toolbar :insensitive,
-.primary-toolbar :insensitive {
-	color: mix (@toolbar_bg_color, @toolbar_fg_color, 0.35);
-}
-
-.menubar.toolbar GtkComboBox,
-.menubar.toolbar .button *,
-.menubar.toolbar .button,
-.primary-toolbar GtkComboBox,
-.primary-toolbar .button *,
-.primary-toolbar .button {
-	background-color: @transparent;
-	background-image: none;
-	border-color: @transparent;
-	border-width: 1px;
-	padding: 2px;
-	color: @toolbar_fg_color;
-	transition: 0ms ease-in-out;
-	-unico-focus-border-color: @transparent;
-	-unico-focus-fill-color: @transparent;
-	-unico-focus-outer-stroke-color: @transparent;
-	-unico-border-gradient: none;
-	-unico-glow-radius: 0;
-	-unico-inner-stroke-width: 0;
-	-unico-outer-stroke-width: 0;
-}
-.menubar.toolbar .button,
-.primary-toolbar .button,
-whatever {
-	padding: 3px 1.5px;
-}
-
-.menubar.toolbar GtkLabel,
-.primary-toolbar GtkLabel,
-whatever {
-	color: @toolbar_fg_color;
-}
-
-.menubar.toolbar GtkLabel:insensitive,
-.primary-toolbar GtkLabel:insensitive,
-.menubar.toolbar .button *:insensitive,
-.primary-toolbar .button *:insensitive {
-	color: mix (@toolbar_bg_color, @toolbar_fg_color, 0.35);
-}
-.menubar.toolbar GtkLabel:active,
-.menubar.toolbar GtkLabel:active:hover,
-.primary-toolbar GtkLabel:active,
-.primary-toolbar GtkLabel:active:hover,
-.menubar.toolbar .button *:active,
-.menubar.toolbar .button *:active:hover,
-.primary-toolbar .button *:active,
-.primary-toolbar .button *:active:hover,
-.whatever {
-	color: @toolbarbutton_selected_fg_color;
-}
-
-.menubar.toolbar GtkComboBox .cell,
-.primary-toolbar GtkComboBox .cell {
-	color: @toolbar_fg_color;
-}
-
-.menubar.toolbar .linked .button,
-.menubar.toolbar .linked .button:hover,
-.menubar.toolbar .linked .button:active,
-.menubar.toolbar .linked .button:insensitive,
-.menubar.toolbar .raised .button,
-.menubar.toolbar .raised.button,
-.menubar.toolbar .button:hover,
-.menubar.toolbar .button:active,
-.menubar.toolbar .button:insensitive,
-.primary-toolbar .raised .button,
-.primary-toolbar .raised.button,
-.primary-toolbar .button:hover,
-.primary-toolbar .button:active,
-.primary-toolbar .button:insensitive {
-	border-width: 1px;
-	transition: 0ms ease-in-out;
-	-unico-inner-stroke-width: 1px;
-	-unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-					from (alpha (shade (@toolbar_bg_color, 1.08), 0.5)),
-					to (alpha (shade (@toolbar_bg_color, 1.08), 0.5)));
-	-unico-outer-stroke-width: 1px;
-}
-.menubar.toolbar .linked .button,
-.menubar.toolbar .linked .button:hover,
-.menubar.toolbar .linked .button:active,
-.menubar.toolbar .linked .button:insensitive,
-whatever {
-	-unico-inner-stroke-width: 0;
-}
-
-.menubar.toolbar .linked .button:focus,
-.menubar.toolbar .raised .button:focus,
-.menubar.toolbar .raised.button:focus,
-.menubar.toolbar .button:hover:focus,
-.menubar.toolbar .button:active:focus,
-.menubar.toolbar .button:insensitive:focus,
-.primary-toolbar .raised .button:focus,
-.primary-toolbar .raised.button:focus,
-.primary-toolbar .button:hover:focus,
-.primary-toolbar .button:active:focus,
-.primary-toolbar .button:insensitive:focus {
-	-unico-outer-stroke-gradient: none;
-	-unico-outer-stroke-color: @transparent;
-}
-
-.menubar.toolbar GtkComboBox.combobox-entry .button,
-.primary-toolbar GtkComboBox.combobox-entry .button {
-	-unico-inner-stroke-width: 1px;
-	-unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-					from (alpha (shade (@toolbar_bg_color, 1.08), 0.25)),
-					to (alpha (shade (@toolbar_bg_color, 1.08), 0.75)));
-}
-
-@define-color toolbarhover_bg_color	mix (@toolbar_fg_color, @toolbar_bg_color, 0.9);
-
-.menubar.toolbar .linked .button,
-.menubar.toolbar .linked .button:insensitive,
-.menubar.toolbar GtkComboBox.combobox-entry .button,
-/*.menubar.toolbar .raised .button,*/
-/*.menubar.toolbar .raised.button,*/
-.menubar.toolbar .button:hover,
-.primary-toolbar .linked .button,
-.primary-toolbar .linked .button:insensitive,
-.primary-toolbar GtkComboBox.combobox-entry .button,
-.primary-toolbar .raised .button,
-.primary-toolbar .raised.button,
-.primary-toolbar .button:hover,
-whatever {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbarhover_bg_color, 1.2)),
-					to (shade (@toolbarhover_bg_color, 1.05)));
-	border-color: shade (@toolbar_bg_color, 0.8);
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbar_bg_color, 0.85)),
-					to (shade (@toolbar_bg_color, 0.75)));
-	-unico-glow-color: shade (@toolbar_bg_color, 1.08);
-	-unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbar_bg_color, 1.25)),
-					to (shade (@toolbar_bg_color, 1.0)));
-}
-.menubar.toolbar .linked .button:insensitive,
-.primary-toolbar .linked .button:insensitive,
-whatever {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbarhover_bg_color, 1.075)),
-					to (shade (@toolbarhover_bg_color, 0.975)));
-}
-.menubar.toolbar .linked .button:hover,
-.menubar.toolbar .raised .button:hover,
-.menubar.toolbar .raised.button:hover,
-.primary-toolbar .linked .button:hover,
-.primary-toolbar .raised .button:hover,
-.primary-toolbar .raised.button:hover,
-whatever {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbarhover_bg_color, 1.225)),
-					to (shade (@toolbarhover_bg_color, 1.075)));
-}
-/*
-.menubar.toolbar .raised .button,
-.menubar.toolbar .raised .button:insensitive,
-.menubar.toolbar .raised.button,
-.menubar.toolbar .raised.button:insensitive,
-whatever {
-	background-color: @transparent;
-	background-image: none;
-	border-color: @transparent;
-	-unico-border-gradient: none;
-	-unico-inner-stroke-color: @transparent;
-	-unico-inner-stroke-gradient: none;
-	-unico-outer-stroke-color: @transparent;
-	-unico-outer-stroke-gradient: none;
-	-unico-glow-color: @transparent;
-}
-*/
-
-@define-color toolbarbutton_selected_border_color	mix (@toolbarbutton_selected_bg_color, @toolbar_bg_color, 0.75);
-
-.menubar.toolbar .button:active,
-.primary-toolbar .button:active {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbarbutton_selected_bg_color, 0.9)),
-					to (shade (@toolbarbutton_selected_bg_color, 1.1)));
-	border-color: shade (@toolbarbutton_selected_border_color, 0.8);
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbarbutton_selected_border_color, 0.8)),
-					to (shade (@toolbarbutton_selected_border_color, 0.85)));
-	-unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbarbutton_selected_bg_color, 0.75)),
-					to (shade (@toolbarbutton_selected_bg_color, 1.05)));
-}
-
-.menubar.toolbar .button:active:hover,
-.primary-toolbar .button:active:hover {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbarbutton_selected_bg_color, 0.925)),
-					to (shade (@toolbarbutton_selected_bg_color, 1.125)));
-}
-
-.menubar.toolbar .button:active:insensitive,
-.menubar.toolbar .button:insensitive,
-.primary-toolbar .button:active:insensitive,
-.primary-toolbar .button:insensitive {
-	/*border-color: shade (@toolbar_bg_color, 0.85);
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbar_bg_color, 0.8)),
-					to (shade (@toolbar_bg_color, 0.9)));
-	-unico-glow-radius: 0;
-	-unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-					from (alpha (shade (@toolbar_bg_color, 1.2), 0.18)),
-					to (alpha (shade (@toolbar_bg_color, 1.4), 0.5)));*/
-	border-color: shade (@toolbar_bg_color, 0.85);
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbar_bg_color, 0.8)),
-					to (shade (@toolbar_bg_color, 0.9)));
-	-unico-glow-radius: 0;
-	-unico-inner-stroke-color: @transparent;
-	-unico-inner-stroke-gradient: none;
-	-unico-outer-stroke-color: @transparent;
-	-unico-outer-stroke-gradient: none;
-}
-
-.menubar.toolbar .button:insensitive,
-.primary-toolbar .button:insensitive {
-	/*background-image: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbar_bg_color, 1.01)),
-					to (shade (@toolbar_bg_color, 0.99)));
-	-unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbar_bg_color, 1.12)),
-					to (shade (@toolbar_bg_color, 1.04)));*/
-	background-color: @transparent;
-	background-image: none;
-	border-color: shade (@toolbar_bg_color, 0.85);
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbar_bg_color, 0.9)),
-					to (shade (@toolbar_bg_color, 0.8)));
-}
-
-.menubar.toolbar .button:active:insensitive,
-.primary-toolbar .button:active:insensitive {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbar_bg_color, 0.9)),
-					to (shade (@toolbar_bg_color, 1.0)));
-	-unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbar_bg_color, 0.85)),
-					to (shade (@toolbar_bg_color, 1.05)));
-}
-
-.menubar.toolbar .entry,
-.menubar.toolbar .entry:active,
-.menubar.toolbar .entry:focused,
-.primary-toolbar .entry,
-.primary-toolbar .entry:active,
-.primary-toolbar .entry:focused {
-	-unico-outer-stroke-width: 1px;
-	-unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-					from (alpha (shade (@toolbar_bg_color, 1.08), 0.25)),
-					to (alpha (shade (@toolbar_bg_color, 1.08), 0.75)));
-}
-
-.menubar.toolbar .entry,
-.primary-toolbar .entry {
-	border-color: shade (@toolbar_bg_color, 0.85);
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbar_bg_color, 0.75)),
-					to (shade (@toolbar_bg_color, 0.95)));
-}
-
-.menubar.toolbar .entry:insensitive,
-.primary-toolbar .entry:insensitive {
-	-unico-outer-stroke-width: 1px;
-	-unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-					from (alpha (shade (@toolbar_bg_color, 1.08), 0.18)),
-					to (alpha (shade (@toolbar_bg_color, 1.08), 0.5)));
-}
-
-.menubar.toolbar .entry:focused,
-.primary-toolbar .entry:focused {
-	border-color: shade (@selected_bg_color, 0.925);
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@selected_bg_color, 0.85)),
-					to (shade (@selected_bg_color, 0.9)));
-	-unico-inner-stroke-color: alpha (@selected_bg_color, 0.4);
-	-unico-inner-stroke-gradient: none;
-}
-
-.menubar.toolbar GtkSeparatorToolItem,
-.menubar.toolbar .separator,
-.menubar.toolbar .separator:insensitive,
-.primary-toolbar GtkSeparatorToolItem,
-.primary-toolbar .separator,
-.primary-toolbar .separator:insensitive {
-	border-color: alpha (shade (@toolbar_bg_color, 0.9), 0.5);
-	border-style: solid;
-
-	-unico-border-gradient: none;
-	-unico-inner-stroke-color: alpha (shade (@toolbar_bg_color, 1.26), 0.4);
-	-unico-inner-stroke-gradient: none;
-}
-
-
-
-
-/*****************
- * Linked button *
- *****************/
-
-/* Middle button */
-.menubar.toolbar .linked .entry,
-.menubar.toolbar .linked .button,
-.menubar.toolbar .linked .button:hover,
-.menubar.toolbar .linked .button:active,
-.menubar.toolbar .linked .button:active:hover,
-.menubar.toolbar .linked .button:insensitive,
-.primary-toolbar .linked .entry,
-.primary-toolbar .linked .button,
-.primary-toolbar .linked .button:hover,
-.primary-toolbar .linked .button:active,
-.primary-toolbar .linked .button:active:hover,
-.primary-toolbar .linked .button:insensitive {
-	border-width: 1px;
-	border-right-width: 0;
-	-unico-outer-stroke-width: 1px 0 1px 0;
-}
-
-/* Leftmost button */
-.menubar.toolbar .linked .entry:first-child,
-.menubar.toolbar .linked .button:first-child,
-.menubar.toolbar .linked .button:hover:first-child,
-.menubar.toolbar .linked .button:active:first-child,
-.menubar.toolbar .linked .button:active:hover:first-child,
-.menubar.toolbar .linked .button:insensitive:first-child,
-.primary-toolbar .linked .entry:first-child,
-.primary-toolbar .linked .button:first-child,
-.primary-toolbar .linked .button:hover:first-child,
-.primary-toolbar .linked .button:active:first-child,
-.primary-toolbar .linked .button:active:hover:first-child,
-.primary-toolbar .linked .button:insensitive:first-child {
-	border-width: 1px;
-	border-right-width: 0;
-	-unico-outer-stroke-width: 1px 0 1px 1px;
-}
-
-/* Rightmost button */
-.menubar.toolbar .linked .entry:last-child,
-.menubar.toolbar .linked .button:last-child,
-.menubar.toolbar .linked .button:hover:last-child,
-.menubar.toolbar .linked .button:active:last-child,
-.menubar.toolbar .linked .button:active:hover:last-child,
-.menubar.toolbar .linked .button:insensitive:last-child,
-.primary-toolbar .linked .entry:last-child,
-.primary-toolbar .linked .button:last-child,
-.primary-toolbar .linked .button:hover:last-child,
-.primary-toolbar .linked .button:active:last-child,
-.primary-toolbar .linked .button:active:hover:last-child,
-.primary-toolbar .linked .button:insensitive:last-child {
-	border-width: 1px;
-	-unico-outer-stroke-width: 1px 1px 1px 0;
-}
-
-/* Linked single button */
-.menubar.toolbar .linked .entry:only-child,
-.menubar.toolbar .linked .button:only-child,
-.menubar.toolbar .linked .button:hover:only-child,
-.menubar.toolbar .linked .button:active:only-child,
-.menubar.toolbar .linked .button:active:hover:only-child,
-.menubar.toolbar .linked .button:insensitive:only-child,
-.primary-toolbar .linked .entry:only-child,
-.primary-toolbar .linked .button:only-child,
-.primary-toolbar .linked .button:hover:only-child,
-.primary-toolbar .linked .button:active:only-child,
-.primary-toolbar .linked .button:active:hover:only-child,
-.primary-toolbar .linked .button:insensitive:only-child,
-.menubar.toolbar .linked .entry:first-child:last-child,
-.menubar.toolbar .linked .button:first-child:last-child,
-.menubar.toolbar .linked .button:hover:first-child:last-child,
-.menubar.toolbar .linked .button:active:first-child:last-child,
-.menubar.toolbar .linked .button:active:hover:first-child:last-child,
-.menubar.toolbar .linked .button:insensitive:first-child:last-child,
-.primary-toolbar .linked .entry:first-child:last-child,
-.primary-toolbar .linked .button:first-child:last-child,
-.primary-toolbar .linked .button:hover:first-child:last-child,
-.primary-toolbar .linked .button:active:first-child:last-child,
-.primary-toolbar .linked .button:active:hover:first-child:last-child,
-.primary-toolbar .linked .button:insensitive:first-child:last-child,
-whatever {
-	border-width: 1px;
-	-unico-outer-stroke-width: 1px;
-}
-
-
-
-
-/************
- * Backdrop *
- ************/
-
-.menubar.toolbar:backdrop,
-.primary-toolbar:backdrop,
-.primary-toolbar .toolbar:backdrop,
-.primary-toolbar.toolbar:backdrop {
-	background-color: @toolbar_bg_color;
-	background-image: none;
-	border-bottom-color: @toolbar_bg_color;
-	border-style: solid;
-	color: mix (@toolbar_bg_color, @toolbar_fg_color, 0.5);
-	-unico-border-gradient: none;
-	-unico-inner-stroke-gradient: none;
-	-unico-inner-stroke-width: 0;
-}
-
-.menubar.toolbar :insensitive:backdrop,
-.primary-toolbar :insensitive:backdrop {
-}
-
-.menubar.toolbar GtkComboBox:backdrop,
-.menubar.toolbar .button *:backdrop,
-.menubar.toolbar .button:backdrop,
-.primary-toolbar GtkComboBox:backdrop,
-.primary-toolbar .button *:backdrop,
-.primary-toolbar .button:backdrop {
-	background-color: @transparent;
-	background-image: none;
-	border-color: @transparent;
-	color: mix (@toolbar_bg_color, @toolbar_fg_color, 0.5);
-	transition: 0ms ease-in-out;
-	-unico-focus-border-color: alpha (@backdrop_selected_bg_color, 0.5);
-	-unico-focus-fill-color: alpha (@backdrop_selected_bg_color, 0.2);
-	-unico-focus-outer-stroke-color: @transparent;
-	-unico-border-gradient: none;
-	-unico-glow-radius: 0;
-	-unico-inner-stroke-width: 0;
-	-unico-outer-stroke-width: 0;
-}
-
-.menubar.toolbar .button *:hover:backdrop,
-.primary-toolbar .button *:hover:backdrop {
-	color: mix (@toolbar_bg_color, @toolbar_fg_color, 0.5);
-}
-
-.menubar.toolbar .raised .button:backdrop,
-.menubar.toolbar .raised.button:backdrop,
-.menubar.toolbar .button:hover:backdrop,
-.menubar.toolbar .button:active:backdrop,
-.menubar.toolbar .button:insensitive:backdrop,
-.primary-toolbar .raised .button:backdrop,
-.primary-toolbar .raised.button:backdrop,
-.primary-toolbar .button:hover:backdrop,
-.primary-toolbar .button:active:backdrop,
-.primary-toolbar .button:insensitive:backdrop {
-	transition: 0ms ease-in-out;
-	-unico-focus-fill-color: @transparent;
-	-unico-focus-border-color: @transparent;
-	-unico-focus-outer-stroke-color: @transparent;
-	-unico-inner-stroke-width: 1px;
-	-unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbar_bg_color, 1.01)),
-					to (shade (@toolbar_bg_color, 1.06)));
-	-unico-outer-stroke-width: 1px;
-}
-
-.menubar.toolbar GtkComboBox.combobox-entry .button:backdrop,
-.primary-toolbar GtkComboBox.combobox-entry .button:backdrop {
-	-unico-inner-stroke-width: 1px;
-	-unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbar_bg_color, 1.01)),
-					to (shade (@toolbar_bg_color, 1.06)));
-}
-
-.menubar.toolbar GtkComboBox.combobox-entry .button:backdrop,
-.menubar.toolbar .raised .button:backdrop,
-.menubar.toolbar .raised.button:backdrop,
-.menubar.toolbar .button:hover:backdrop,
-.primary-toolbar GtkComboBox.combobox-entry .button:backdrop,
-.primary-toolbar .raised .button:backdrop,
-.primary-toolbar .raised.button:backdrop,
-.primary-toolbar .button:hover:backdrop {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbar_bg_color, 1.06)),
-					to (shade (@toolbar_bg_color, 0.98)));
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbar_bg_color, 0.9)),
-					to (shade (@toolbar_bg_color, 0.87)));
-	-unico-glow-radius: 0;
-	-unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbar_bg_color, 1.12)),
-					to (shade (@toolbar_bg_color, 1.02)));
-}
-
-.menubar.toolbar .button:active:backdrop,
-.primary-toolbar .button:active:backdrop {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbar_bg_color, 0.9)),
-					to (shade (@toolbar_bg_color, 0.95)));
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbar_bg_color, 0.75)),
-					to (shade (@toolbar_bg_color, 0.85)));
-	-unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbar_bg_color, 0.88)),
-					to (shade (@toolbar_bg_color, 0.93)))
-}
-
-.menubar.toolbar .button:active:hover:backdrop,
-.primary-toolbar .button:active:hover:backdrop {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbar_bg_color, 0.95)),
-					to (shade (@toolbar_bg_color, 1.0)));
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbar_bg_color, 0.75)),
-					to (shade (@toolbar_bg_color, 0.85)));
-	-unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbar_bg_color, 0.93)),
-					to (shade (@toolbar_bg_color, 0.94)))
-}
-
-.menubar.toolbar .button:active:insensitive:backdrop,
-.menubar.toolbar .button:insensitive:backdrop,
-.primary-toolbar .button:active:insensitive:backdrop,
-.primary-toolbar .button:insensitive:backdrop {
-	border-color: shade (@toolbar_bg_color, 1.0);
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbar_bg_color, 1.0)),
-					to (shade (@toolbar_bg_color, 1.0)));
-	-unico-glow-radius: 0;
-	-unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbar_bg_color, 1.01)),
-					to (shade (@toolbar_bg_color, 1.06)));
-}
-
-.menubar.toolbar .button:insensitive:backdrop,
-.primary-toolbar .button:insensitive:backdrop {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbar_bg_color, 1.01)),
-					to (shade (@toolbar_bg_color, 0.99)));
-	-unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbar_bg_color, 1.1)),
-					to (shade (@toolbar_bg_color, 1.04)));
-}
-
-.menubar.toolbar .button:active:insensitive:backdrop,
-.primary-toolbar .button:active:insensitive:backdrop {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbar_bg_color, 0.94)),
-					to (shade (@toolbar_bg_color, 1.02)));
-	-unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbar_bg_color, 0.92)),
-					to (shade (@toolbar_bg_color, 1.0)));
-}
-
-.menubar.toolbar .entry:backdrop,
-.menubar.toolbar .entry:active:backdrop,
-.menubar.toolbar .entry:focused:backdrop,
-.primary-toolbar .entry:backdrop,
-.primary-toolbar .entry:active:backdrop,
-.primary-toolbar .entry:focused:backdrop {
-	color: @text_color;
-	-unico-outer-stroke-width: 1px;
-	-unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbar_bg_color, 1.01)),
-					to (shade (@toolbar_bg_color, 1.06)));
-}
-
-.menubar.toolbar .entry:backdrop,
-.primary-toolbar .entry:backdrop {
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbar_bg_color, 0.75)),
-					to (shade (@toolbar_bg_color, 0.95)));
-}
-
-.menubar.toolbar .entry:insensitive:backdrop,
-.primary-toolbar .entry:insensitive:backdrop {
-	-unico-outer-stroke-width: 1px;
-	-unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbar_bg_color, 1.01)),
-					to (shade (@toolbar_bg_color, 1.06)));
-}
-
-.menubar.toolbar .entry:focused:backdrop,
-.primary-toolbar .entry:focused:backdrop {
-	-unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@backdrop_selected_bg_color, 0.75)),
-					to (shade (@backdrop_selected_bg_color, 0.8)));
-	-unico-inner-stroke-color: alpha (@backdrop_selected_bg_color, 0.2);
-	-unico-inner-stroke-gradient: none;
-}
-
-.menubar.toolbar GtkSeparatorToolItem:backdrop,
-.menubar.toolbar .separator:backdrop,
-.menubar.toolbar .separator:insensitive:backdrop,
-.primary-toolbar GtkSeparatorToolItem:backdrop,
-.primary-toolbar .separator:backdrop,
-.primary-toolbar .separator:insensitive:backdrop {
-	border-color: shade (@toolbar_bg_color, 0.94);
-	border-style: solid;
-	-unico-border-gradient: none;
-	-unico-inner-stroke-color: shade (@toolbar_bg_color, 1.04);
-	-unico-inner-stroke-gradient: none;
-}
-
-
-.menubar.toolbar:backdrop,
-.menubar.toolbar *:backdrop,
-.menubar.toolbar .button:backdrop,
-.menubar.toolbar .button *:backdrop,
-.menubar.toolbar .button *:active:backdrop,
-.primary-toolbar:backdrop,
-.primary-toolbar *:backdrop,
-.primary-toolbar.toolbar:backdrop,
-.primary-toolbar .toolbar:backdrop,
-.primary-toolbar .button:backdrop,
-.primary-toolbar .button *:backdrop,
-.primary-toolbar .button *:active:backdrop,
-.whatever {
-	text-shadow: none;
-}
-
-
-
-/* trough */
-
-@define-color toolbartrough_bg_color	shade (mix (@toolbar_fg_color, @toolbar_bg_color, 0.85), 1.05);
-.menubar.toolbar .trough,
-.menubar.toolbar .trough row,
-.menubar.toolbar .trough row:hover,
-.menubar.toolbar .trough row:selected,
-.menubar.toolbar .trough row:selected:focused,
-.primary-toolbar .trough,
-.primary-toolbar .trough row,
-.primary-toolbar .trough row:hover,
-.primary-toolbar .trough row:selected,
-.primary-toolbar .trough row:selected:focused,
-whatever {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbartrough_bg_color, 0.9)),
-					to (shade (@toolbartrough_bg_color, 1.05)));
-	border-style: solid;
-	border-width: 1px;
-
-	/*color: @text_color;*/
-
-	border-color: shade (@toolbartrough_bg_color, 0.75);
-	-unico-border-gradient: none;
-	-unico-outer-stroke-width: 0;
-}
-.menubar.toolbar .trough.vertical,
-.primary-toolbar .trough.vertical,
-whatever {
-	background-image: -gtk-gradient (linear, left top, right top,
-					from (shade (@toolbartrough_bg_color, 0.9)),
-					to (shade (@toolbartrough_bg_color, 1.05)));
-}
-.menubar.toolbar .trough:insensitive,
-.menubar.toolbar .trough row:insensitive,
-.menubar.toolbar .trough row:selected:insensitive,
-.menubar.toolbar .trough.vertical:insensitive,
-.primary-toolbar .trough:insensitive,
-.primary-toolbar .trough row:insensitive,
-.primary-toolbar .trough row:selected:insensitive,
-.primary-toolbar .trough.vertical:insensitive,
-whatever {
-	background-color: shade (@toolbar_bg_color, 0.95);
-	background-image: none;
-	border-color: shade (@toolbar_bg_color, 0.9);
-	-unico-border-gradient: none;
-}
-
-
-
-/* entry */
-
-@define-color toolbarentry_bg_color	mix (@base_color, @toolbar_bg_color, 0.75);
-@define-color toolbarentry_fg_color	shade (@toolbar_fg_color, 1.1);
-@define-color toolbarentryfocused_bg_color	mix (@toolbar_bg_color, @base_color, 0.6);
-@define-color toolbarentryfocused_fg_color	shade (@text_color, 0.9);
-
-.menubar.toolbar .entry,
-.menubar.toolbar .entry:backdrop,
-.primary-toolbar .entry,
-.primary-toolbar .entry:backdrop,
-whatever {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbarentry_bg_color, 0.9)),
-					to (@toolbarentry_bg_color));
-	color: @toolbarentry_fg_color;
-}
-.menubar.toolbar .entry:focused,
-.primary-toolbar .entry:focused,
-whatever {
-	background-image: -gtk-gradient (linear, left top, left bottom,
-					from (shade (@toolbarentryfocused_bg_color, 0.9)),
-					to (@toolbarentryfocused_bg_color));
-	color: @toolbarentryfocused_fg_color;
-}
-.menubar.toolbar .entry:selected,
-.primary-toolbar .entry:selected,
-whatever {
-	background-color: @unfocused_selected_bg_color;
-	color: @unfocused_selected_fg_color;
-}
-.menubar.toolbar .entry:selected:focused,
-.primary-toolbar .entry:selected:focused,
-whatever {
-	background-color: @selected_bg_color;
-	color: @selected_fg_color;
-}
-.menubar.toolbar .entry:insensitive,
-.primary-toolbar .entry:insensitive,
-whatever {
-	background-color: shade (@toolbar_bg_color, 0.9);
-	background-image: none;
-	color: mix (@toolbar_bg_color, @toolbar_fg_color, 0.5);
-}
-
diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets.css b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets.css
index 42553d3..c264056 100644
--- a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets.css
+++ b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets.css
@@ -44,7 +44,6 @@
     -GtkToolbar-internal-padding: 0;
     -GtkTreeView-expander-size: 8;
     -GtkTreeView-vertical-separator: 0;
-  /*  -GtkWidget-wide-separators: true;		*/
     -GtkWidget-separator-width: 2;
     -GtkWidget-separator-height: 2;
     -GtkWidget-focus-padding: 0;
@@ -273,7 +272,17 @@ GtkSwitch.slider:backdrop,
 .primary-toolbar .linked .button,
 .primary-toolbar .linked .button:active,
 .primary-toolbar .linked .button:active:hover,
-.primary-toolbar .linked .button:insensitive {
+.primary-toolbar .linked .button:insensitive,
+.menubar.toolbar .linked .entry,
+.menubar.toolbar .linked .button,
+.menubar.toolbar .linked .button:active,
+.menubar.toolbar .linked .button:active:hover,
+.menubar.toolbar .linked .button:insensitive,
+.header-bar .linked .entry,
+.header-bar .linked .button,
+.header-bar .linked .button:active,
+.header-bar .linked .button:active:hover,
+.header-bar .linked .button:insensitive {
     border-width: 1px;
     border-right-width: 0;
 
@@ -401,44 +410,86 @@ GtkSwitch.slider:backdrop,
 /* Set up shadows and hilights for button visual separation */
 .primary-toolbar .linked .button,
 .primary-toolbar .button.raised.linked,
-.primary-toolbar .raised.linked .button {
+.primary-toolbar .raised.linked .button,
+.menubar.toolbar .linked .button,
+.menubar.toolbar .button.raised.linked,
+.menubar.toolbar .raised.linked .button,
+.header-bar .linked .button,
+.header-bar .button.raised.linked,
+.header-bar .raised.linked .button {
     box-shadow: inset 1px 0 shade (@dark_bg_color, 1.4),
                 inset -1px 0 shade (@dark_bg_color, 0.9);
 }
 
 .primary-toolbar .linked .button:first-child,
 .primary-toolbar .button.raised.linked:first-child,
-.primary-toolbar .raised.linked .button:first-child {
+.primary-toolbar .raised.linked .button:first-child,
+.menubar.toolbar .linked .button:first-child,
+.menubar.toolbar .button.raised.linked:first-child,
+.menubar.toolbar .raised.linked .button:first-child,
+.header-bar .linked .button:first-child,
+.header-bar .button.raised.linked:first-child,
+.header-bar .raised.linked .button:first-child {
     box-shadow: inset -1px 0 shade (@dark_bg_color, 0.9);
 }
 
 .primary-toolbar .linked .button:last-child,
 .primary-toolbar .button.raised.linked:last-child,
-.primary-toolbar .raised.linked .button:last-child {
+.primary-toolbar .raised.linked .button:last-child,
+.menubar.toolbar .linked .button:last-child,
+.menubar.toolbar .button.raised.linked:last-child,
+.menubar.toolbar .raised.linked .button:last-child,
+.header-bar .linked .button:last-child,
+.header-bar .button.raised.linked:last-child,
+.header-bar .raised.linked .button:last-child {
     box-shadow: inset 1px 0 shade (@dark_bg_color, 1.4)
 }
 
 .primary-toolbar .linked .button:active,
 .primary-toolbar .button.raised.linked:active,
-.primary-toolbar .raised.linked .button:active {
+.primary-toolbar .raised.linked .button:active,
+.menubar.toolbar .linked .button:active,
+.menubar.toolbar .button.raised.linked:active,
+.menubar.toolbar .raised.linked .button:active,
+.header-bar .linked .button:active,
+.header-bar .button.raised.linked:active,
+.header-bar .raised.linked .button:active {
     box-shadow: inset 1px 0 shade (@dark_bg_color, 0.9);
 }
 
 .primary-toolbar .linked .button:insensitive,
 .primary-toolbar .button.raised.linked:insensitive,
-.primary-toolbar .raised.linked .button:insensitive {
+.primary-toolbar .raised.linked .button:insensitive,
+.menubar.toolbar .linked .button:insensitive,
+.menubar.toolbar .button.raised.linked:insensitive,
+.menubar.toolbar .raised.linked .button:insensitive,
+.header-bar .linked .button:insensitive,
+.header-bar .button.raised.linked:insensitive,
+.header-bar .raised.linked .button:insensitive {
     box-shadow: inset -1px 0 shade (@dark_bg_color, 0.9);
 }
 
 .primary-toolbar .linked .button:backdrop:last-child,
 .primary-toolbar .button.raised.linked:backdrop:last-child,
-.primary-toolbar .raised.linked .button:backdrop:last-child {
+.primary-toolbar .raised.linked .button:backdrop:last-child,
+.menubar.toolbar .linked .button:backdrop:last-child,
+.menubar.toolbar .button.raised.linked:backdrop:last-child,
+.menubar.toolbar .raised.linked .button:backdrop:last-child,
+.header-bar .linked .button:backdrop:last-child,
+.header-bar .button.raised.linked:backdrop:last-child,
+.header-bar .raised.linked .button:backdrop:last-child {
     box-shadow: inset 1px 0 shade (@dark_bg_color, 1.2);
 }
 
 /*.primary-toolbar .linked .button:insensitive:backdrop,
 .primary-toolbar .button.raised.linked:insensitive:backdrop,
-.primary-toolbar .raised.linked .button:insensitive:backdrop {
+.primary-toolbar .raised.linked .button:insensitive:backdrop,
+.menubar.toolbar .linked .button:insensitive:backdrop,
+.menubar.toolbar .button.raised.linked:insensitive:backdrop,
+.menubar.toolbar .raised.linked .button:insensitive:backdrop,
+.header-bar .linked .button:insensitive:backdrop,
+.header-bar .button.raised.linked:insensitive:backdrop,
+.header-bar .raised.linked .button:insensitive:backdrop {
     box-shadow: inset -1px 0 @unfocused_insensitive_borders;
 }*/
 
@@ -448,7 +499,17 @@ GtkSwitch.slider:backdrop,
 .primary-toolbar .linked .button:only-child,
 .primary-toolbar .linked .button:active:only-child,
 .primary-toolbar .linked .button:active:hover:only-child,
-.primary-toolbar .linked .button:insensitive:only-child {
+.primary-toolbar .linked .button:insensitive:only-child,
+.menubar.toolbar .linked .entry:only-child,
+.menubar.toolbar .linked .button:only-child,
+.menubar.toolbar .linked .button:active:only-child,
+.menubar.toolbar .linked .button:active:hover:only-child,
+.menubar.toolbar .linked .button:insensitive:only-child,
+.header-bar .linked .entry:only-child,
+.header-bar .linked .button:only-child,
+.header-bar .linked .button:active:only-child,
+.header-bar .linked .button:active:hover:only-child,
+.header-bar .linked .button:insensitive:only-child {
     border-radius: 8px;
     box-shadow: none;
 }
@@ -575,6 +636,7 @@ column-header .button:hover:backdrop {
                                  to (shade (@bg_color, 0.9))) 1;
 }
 
+
 column-header:nth-child(last) .button {
     border-width: 0 0 1px 0;
 }
@@ -592,6 +654,7 @@ column-header:nth-child(last) .button {
 
 .content-view.view:selected,
 .content-view.view:active {
+    /*background-color: @selected_bg_color;*/
 }
 
 .content-view.view:insensitive {
@@ -611,10 +674,12 @@ GdMainIconView.content-view {
 }
 
 GtkIconView.content-view.check {
+    /*background-image: url("assets/grid-selection-unchecked.svg");*/
     background-color: transparent;
 }
 
 GtkIconView.content-view.check:active {
+    /*background-image: url("assets/grid-selection-checked.svg");*/
     background-color: transparent;
 }
 
@@ -643,16 +708,24 @@ GtkDrawingArea {
  * entry *
  *********/
 GtkComboBox.combobox-entry .button,
+.primary-toolbar GtkComboBox.combobox-entry .button,
+.menubar.toolbar GtkComboBox.combobox-entry .button,
+.header-bar GtkComboBox.combobox-entry .button,
 .entry {
     -GtkWidget-focus-line-width: 0;
+
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@base_color, 0.96)),
                                      to (@base_color));
     padding: 5px 7px;
+
     color: @text_color;
 }
 
 GtkComboBox.combobox-entry .button:backdrop,
+.primary-toolbar GtkComboBox.combobox-entry .button:backdrop,
+.menubar.toolbar GtkComboBox.combobox-entry .button:backdrop,
+.header-bar GtkComboBox.combobox-entry .button:backdrop,
 .entry:backdrop {
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (mix (shade (@base_color, 0.96), @bg_color, 0.5)),
@@ -663,6 +736,7 @@ GtkComboBox.combobox-entry .button:backdrop,
 .entry:selected,
 .entry:selected:focused {
     background-color: @selected_bg_color;
+
     color: @selected_fg_color;
 }
 
@@ -670,26 +744,39 @@ GtkComboBox.combobox-entry .button:backdrop,
 }
 
 GtkComboBox.combobox-entry .button:insensitive,
+.primary-toolbar GtkComboBox.combobox-entry .button:insensitive,
+.menubar.toolbar GtkComboBox.combobox-entry .button:insensitive,
+.header-bar GtkComboBox.combobox-entry .button:insensitive,
 .entry:insensitive {
     background-color: #f5f5f5;
     background-image: none;
+
     color: mix (@text_color, @base_color, 0.4);
 }
 
 GtkComboBox.combobox-entry .button:insensitive:backdrop,
+.primary-toolbar GtkComboBox.combobox-entry .button:insensitive:backdrop,
+.menubar.toolbar GtkComboBox.combobox-entry .button:insensitive:backdrop,
+.header-bar GtkComboBox.combobox-entry .button:insensitive:backdrop,
 .entry:insensitive:backdrop {
     background-color: mix (#f5f5f5, @bg_color, 0.5);
+
     color: mix (@text_color, @base_color, 0.4);
 }
 
 .primary-toolbar .entry.progressbar,
 .primary-toolbar .entry.progressbar,
+.menubar.toolbar .entry.progressbar,
+.menubar.toolbar .entry.progressbar,
+.header-bar .entry.progressbar,
+.header-bar .entry.progressbar,
 .entry.progressbar {
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@selected_bg_color, 0.8)),
                                      color-stop (0.1, shade (@selected_bg_color, 0.9)),
                                      to (shade (@selected_bg_color, 1.1)));
     border-width: 0;
+
     color: @selected_fg_color;
 }
 
@@ -704,7 +791,7 @@ GtkComboBox.combobox-entry .button:insensitive:backdrop,
  * frame *
  *********/
 .frame {
-    border-radius: 0px;
+    border-radius: 3px;
     border-width: 1px;
     border-style: solid;
     border-color: shade (@bg_color, 0.82);
@@ -728,7 +815,9 @@ GtkIconView.view.cell:selected:focused {
     border-width: 1px;
     border-color: shade (@selected_bg_color, 0.8);
     border-bottom-color: shade (@selected_bg_color, 0.7);
+
     color: @selected_fg_color;
+
     box-shadow: inset 1px 0 shade (@selected_bg_color, 1.05),
                 inset -1px 0 shade (@selected_bg_color, 1.05),
                 inset 0 1px shade (@selected_bg_color, 1.08),
@@ -760,9 +849,12 @@ GtkImage:insensitive {
                                      to (shade (@info_bg_color, 0.96)));
     border-style: solid;
     border-width: 1px;
+
     color: @info_fg_color;
+
     border-color: shade (@info_bg_color, 0.8);
     border-bottom-color: shade (@info_bg_color, 0.75);
+
     box-shadow: inset 1px 0 shade (@info_bg_color, 1.08),
                 inset -1px 0 shade (@info_bg_color, 1.08),
                 inset 0 1px shade (@info_bg_color, 1.1),
@@ -775,9 +867,12 @@ GtkImage:insensitive {
                                      to (shade (@warning_bg_color, 0.96)));
     border-style: solid;
     border-width: 1px;
+
     color: @warning_fg_color;
+
     border-color: shade (@warning_bg_color, 0.8);
     border-bottom-color: shade (@warning_bg_color, 0.75);
+
     box-shadow: inset 1px 0 shade (@warning_bg_color, 1.08),
                 inset -1px 0 shade (@warning_bg_color, 1.08),
                 inset 0 1px shade (@warning_bg_color, 1.1),
@@ -790,9 +885,12 @@ GtkImage:insensitive {
                                      to (shade (@question_bg_color, 0.96)));
     border-style: solid;
     border-width: 1px;
+
     color: @question_fg_color;
+
     border-color: shade (@question_bg_color, 0.8);
     border-bottom-color: shade (@question_bg_color, 0.75);
+
     box-shadow: inset 1px 0 shade (@question_bg_color, 1.08),
                 inset -1px 0 shade (@question_bg_color, 1.08),
                 inset 0 1px shade (@question_bg_color, 1.1),
@@ -805,9 +903,12 @@ GtkImage:insensitive {
                                      to (shade (@error_bg_color, 0.96)));
     border-style: solid;
     border-width: 1px;
+
     color: @error_fg_color;
+
     border-color: shade (@error_bg_color, 0.8);
     border-bottom-color: shade (@error_bg_color, 0.75);
+
     box-shadow: inset 1px 0 shade (@error_bg_color, 1.08),
                 inset -1px 0 shade (@error_bg_color, 1.08),
                 inset 0 1px shade (@error_bg_color, 1.1),
@@ -835,7 +936,7 @@ GtkMenuToolButton.menu,
 .header-bar .button .menu,
 .menu {
     background-image: none;
-    background-color: @base_color;
+    background-color: shade (@dark_bg_color, 1.08);
     border-bottom-color: shade (@dark_bg_color, 0.96);
     border-left-color: shade (@dark_bg_color, 0.8);
     border-right-color: shade (@dark_bg_color, 0.8);
@@ -908,7 +1009,7 @@ GtkComboBox .menu {
 .menubar {
     -GtkWidget-window-dragging: true;
 
-    background-color: @toolbar_base;
+    background-color: @dark_bg_color;
     background-image: none;
     border-width: 0;
 
@@ -928,7 +1029,9 @@ GtkComboBox .menu {
 .menubar .menuitem:hover {
     border-radius: 4px 4px 0 0;
     border-width: 1px 1px 0 1px;
-    background-color: @selected_bg;
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (@dark_bg_color, 1.38)),
+                                     to (shade (@dark_bg_color, 1.11)));
     /*box-shadow: inset 0 -1px shade (@dark_bg_color, 0.95);*/
     box-shadow: none;
 
@@ -958,7 +1061,6 @@ GtkComboBox .menu {
 
 /* Workaround for lp:949368 */
 GtkComboBox .menuitem * {
-    background-image: #ff0000;
     color: @fg_color;
 }
 
@@ -1110,6 +1212,8 @@ GtkComboBox .menu .menuitem *:insensitive {
     border-color: shade (@bg_color, 0.82);
     border-width: 1px;
     border-style: solid;
+    /*box-shadow: inset 0 1px shade (@bg_color, 1.1);*/
+    /*font-weight: 300;*/
 }
 
 .notebook tab {
@@ -1123,6 +1227,7 @@ GtkComboBox .menu .menuitem *:insensitive {
     border-color: transparent;
     border-width: 0;
     box-shadow: none;
+    /*color: shade (@fg_color, 1.2);*/
 }
 
 .notebook tab:active {
@@ -1131,10 +1236,13 @@ GtkComboBox .menu .menuitem *:insensitive {
     border-width: 1px;
     background-color: shade (@bg_color, 1.02);
     background-image: none;
+    /*box-shadow: inset 0 1px shade (@bg_color, 1.1);*/
+
     color: @fg_color;
 }
 
 .notebook tab GtkLabel {
+    /*padding: 1px;*/
     padding: 1px 1px 2px 1px;
 }
 
@@ -1229,9 +1337,9 @@ GtkProgressBar {
 .progressbar row:selected,
 .progressbar row:selected:focused {
     border-radius: 8px;
-    border-width: 1px;
+    border-width: 0px;
     background-image: none;
-    background-color: @progress_color;
+    background-color: #db6a3c;
     border-style: solid;
 }
 
@@ -1301,7 +1409,7 @@ GtkLevelBar.vertical {
     border-style: solid;
 
     border-color: @selected_bg_color;
-    background-color: @selected_bg_color;
+    background-color: #db6a3c;
 }
 
 .level-bar.indicator-continuous.fill-block {
@@ -1393,7 +1501,7 @@ GtkScale.vertical {
 }
 
 .scale.trough.highlight {
-    background-color: @progress_color;
+    background-color: #df784e;
     background-image: none;
     background-clip: content-box;
 }
@@ -1422,82 +1530,81 @@ GtkScale.mark {
     border-color: shade (@bg_color, 0.8);
 }
 
-/**************
- * Scrollbars *
- **************/
-
-.scrollbar {
-    -GtkRange-slider-width:     9;
-    -GtkRange-stepper-size:     0;
-    -GtkRange-stepper-spacing:  0;
-    -GtkRange-trough-border:    0;
-
+/*************
+ * scrollbar *
+ *************/
+.scrollbar,
+.scrollbar.vertical {
     -GtkScrollbar-has-backward-stepper: 0;
     -GtkScrollbar-has-forward-stepper: 0;
-    
-    -GtkScrollbar-min-slider-length: 30;	
+    -GtkRange-slider-width: 14;
+
+    border-radius: 20px;
+
+    border-image: none;
 }
 
+.scrollbar.trough,
 .scrollbar.trough.vertical {
-    border-radius:      0;
-	border-width:      0;
-    background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (shade (@bg_color, 1.00)),
-                                     to (shade (@bg_color, 1.10)));
-
-	-unico-outer-stroke-width: 			0;
-	-unico-inner-stroke-width:          0 0 0 0;
-	-unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-                                           from (shade (@bg_color, 0.96)),
-                                           to (shade (@bg_color, 0.96)));    
+    border-color: shade (@bg_color, 0.8);
 }
 
 .scrollbar.trough.horizontal {
-    border-radius:      0;
-	border-width:      0;
-    background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (shade (@bg_color, 1.00)),
-                                     to (shade (@bg_color, 1.10)));
-
-	-unico-outer-stroke-width: 			0;
-	-unico-inner-stroke-width:          0 0 0 0;
-    -unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
-                                           from (shade (@base_color, 0.96)),
-                                           to (shade (@base_color, 0.96))); 
 }
 
 .scrollbar.slider,
-.scrollbar.button {
-    border-width:              	0;
-    border-radius:              10px;
-	background-color:         alpha (#000, 0.25);
+.scrollbar.slider:hover,
+.scrollbar.button,
+.scrollbar.slider.vertical,
+.scrollbar.slider.vertical:hover,
+.scrollbar.button.vertical {
+    border-width: 1px;
+    border-style: solid;
+    border-color: shade (@bg_color, 0.86);
+    background-image: -gtk-gradient (linear, left top, right top,
+                                     from (shade (@button_bg_color, 1.08)),
+                                     color-stop (0.5, @button_bg_color),
+                                     to (shade (@button_bg_color, 0.94)));
+    box-shadow: inset 1px 0 shade (@bg_color, 1.1),
+                inset -1px 0 shade (@bg_color, 1.01),
+                inset 0 1px shade (@bg_color, 1.1),
+                inset 0 -1px shade (@bg_color, 1.1);
 }
 
-.scrollbar.slider:prelight {
-	background-color:         alpha (#000, 0.42);
+.scrollbar.slider.horizontal,
+.scrollbar.slider.horizontal:hover,
+.scrollbar.button.horizontal {
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (@button_bg_color, 1.08)),
+                                     color-stop (0.5, @button_bg_color),
+                                     to (shade (@button_bg_color, 0.94)));
+    box-shadow: inset 1px 0 shade (@bg_color, 1.1),
+                inset -1px 0 shade (@bg_color, 1.1),
+                inset 0 1px shade (@bg_color, 1.1),
+                inset 0 -1px shade (@bg_color, 1.01);
 }
 
-.scrollbar.slider:insensitive {
-    -GtkRange-slider-width: 0;
+.scrollbar.button,
+.scrollbar.button:insensitive {
 }
 
-.scrollbar.trough:insensitive {
-    -GtkRange-trough-border: 3;
+/* overlay scrollbar */
+OsThumb {
+    color: shade (@fg_color, 1.6);
 }
 
-/* overlay scrollbar */
 OsThumb:selected,
-OsScrollbar:selected {
+GtkScrollbar:selected {
     background-color: @selected_bg_color;
 }
 
 OsThumb:active,
-OsScrollbar:active {
+GtkScrollbar:active {
     background-color: shade (@bg_color, 0.6);
 }
 
 OsThumb:insensitive,
-OsScrollbar:insensitive {
+GtkScrollbar:insensitive {
     background-color: shade (@bg_color, 0.85);
 }
 
@@ -1566,26 +1673,30 @@ GtkComboBox .separator {
 }
 
 .menuitem.separator {
-	-GtkMenuItem-horizontal-padding: 0;
-	border: none;
-	color: @borders;
+    -GtkMenuItem-horizontal-padding: 0;
+    border: none;
+    color: @dark_bg_color;
 }
 
 GtkTreeMenu .menuitem.separator,
 .toolbar .primary-toolbar .menuitem.separator,
+.toolbar .menubar.toolbar .menuitem.separator,
+.toolbar .header-bar .menuitem.separator,
 GtkMenuToolButton .menuitem.separator,
 .primary-toolbar .button .menuitem.separator,
+.menubar.toolbar .button .menuitem.separator,
+.header-bar .button .menuitem.separator,
 .menuitem.separator {
-    border-color: shade (@bg_color, 0.99);
-    border-bottom-color: @combobox_color;
-    border-right-color: @bg_color;
+    border-color: shade (@dark_bg_color, 0.99);
+    border-bottom-color: alpha (shade (@dark_bg_color, 1.26), 0.5);
+    border-right-color: alpha (shade (@dark_bg_color, 1.26), 0.5);
 }
 
 .toolbar .menuitem.separator,
 GtkComboBox .menuitem.separator {
-    border-color: shade (@bg_color, 0.99);
-    border-bottom-color: @combobox_color;
-    border-right-color: @bg_color;
+    border-color: shade (@bg_color, 0.92);
+    border-bottom-color: alpha (shade (@bg_color, 1.26), 0.6);
+    border-right-color: alpha (shade (@bg_color, 1.26), 0.6);
 }
 
 /***********
@@ -1655,14 +1766,116 @@ GtkComboBox .menuitem.separator {
 /***********
  * spinner *
  ***********/
+@keyframes spinner {
+    0.00% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)); }
+
+    12.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)); }
+
+    25.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)); }
+
+    37.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)); }
+
+    50.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)); }
+
+    62.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)); }
+
+    75.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)); }
+
+    87.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)); }
+
+    100%  { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
+                              -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)); }
+}
+
+.spinner {
+    background-color: transparent;
+    background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
+                      -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent));
+    background-position: 14% 14%, 0% 50%, 14% 86%, 50% 100%, 86% 86%, 100% 50%, 86% 14%, 50% 0%;
+    background-size: 20% 20%;
+    background-repeat: no-repeat;
+}
+
 .menu.spinner,
 .primary-toolbar .spinner,
-.primary-toolbar .spinner {
+.primary-toolbar .spinner,
+.menubar.toolbar .spinner,
+.menubar.toolbar .spinner,
+.header-bar .spinner,
+.header-bar .spinner {
     color: @selected_bg_color;
 }
 
 .spinner:active {
-     transition: 750ms linear loop;
+    animation: spinner 1s infinite linear;
 }
 
 /*************
@@ -1725,6 +1938,529 @@ GtkTextView {
     background-color: @base_color;
 }
 
+/***********
+ * toolbar *
+ ***********/
+.toolbar {
+    border-style: none;
+    background-color: transparent;
+    padding: 1px;
+
+    color: @fg_color;
+    text-shadow: none;
+}
+
+.toolbar:backdrop {
+    color: @backdrop_fg_color;
+}
+
+.toolbar .button {
+    /*padding: 1px;*/
+    /*padding: 6px 8px;*/
+}
+
+/* primary-toolbar */
+.primary-toolbar,
+.primary-toolbar .toolbar,
+.primary-toolbar.toolbar,
+.menubar.toolbar,
+.header-bar {
+    -GtkWidget-window-dragging: true;
+
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (@dark_bg_color, 0.96)),
+                                     to (shade (@dark_bg_color, 1.4)));
+    border-bottom-color: shade (@dark_bg_color, 1.1);
+    border-top-color: shade (@dark_bg_color, 1.09);
+    border-style: solid;
+    border-width: 1px 0 1px 0;
+
+    color: @dark_fg_color;
+    text-shadow: 0 -1px shade (@dark_bg_color, 0.7);
+
+    box-shadow: inset 0 1px shade (@dark_bg_color, 0.94);
+}
+
+.primary-toolbar .toolbar:backdrop,
+.primary-toolbar.toolbar:backdrop,
+.menubar.toolbar .toolbar:backdrop,
+.menubar.toolbar.toolbar:backdrop,
+.header-bar:backdrop {
+    background-image: none;
+    background-color: @dark_bg_color;
+    box-shadow: none;
+    border-top-color: @dark_bg_color;
+    border-bottom-color: shade (@dark_bg_color, 0.9);
+
+    color: @backdrop_dark_fg_color;
+}
+
+.primary-toolbar :insensitive,
+.menubar.toolbar .toolbar :insensitive,
+.header-bar :insensitive {
+    text-shadow: 0 -1px shade (@dark_bg_color, 0.7);
+}
+
+.primary-toolbar GtkComboBox,
+.primary-toolbar .button,
+.menubar.toolbar GtkComboBox,
+.menubar.toolbar .button,
+.header-bar GtkComboBox,
+.header-bar .button {
+    background-color: transparent;
+    background-image: none;
+    border-color: transparent;
+    /*border-radius: 3px;*/
+    /*border-width: 1px;*/
+    /*padding: 3px;*/
+
+    color: @dark_fg_color;
+    text-shadow: 0 -1px shade (@dark_bg_color, 0.7);
+}
+
+.primary-toolbar GtkComboBox:backdrop,
+.primary-toolbar .button:backdrop,
+.menubar.toolbar GtkComboBox:backdrop,
+.menubar.toolbar .button:backdrop,
+.header-bar GtkComboBox:backdrop,
+.header-bar .button:backdrop {
+    color: @backdrop_dark_fg_color;
+    text-shadow: 0 -1px shade (@dark_bg_color, 0.9);
+}
+
+.primary-toolbar .raised .button,
+.primary-toolbar .raised.button,
+.primary-toolbar .button:hover,
+.primary-toolbar .button:active,
+.primary-toolbar .button:insensitive,
+.menubar.toolbar .raised .button,
+.menubar.toolbar .raised.button,
+.menubar.toolbar .button:hover,
+.menubar.toolbar .button:active,
+.menubar.toolbar .button:insensitive,
+.header-bar .raised .button,
+.header-bar .raised.button,
+.header-bar .button:hover,
+.header-bar .button:active,
+.header-bar .button:insensitive {
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (@dark_bg_color, 1.2)),
+                                     to (shade (@dark_bg_color, 1.1)));
+    /*border-width: 1px;*/
+}
+
+.primary-toolbar .raised .button:focus,
+.primary-toolbar .raised.button:focus,
+.primary-toolbar .button:hover:focus,
+.primary-toolbar .button:active:focus,
+.primary-toolbar .button:insensitive:focus,
+.menubar.toolbar .raised .button:focus,
+.menubar.toolbar .raised.button:focus,
+.menubar.toolbar .button:hover:focus,
+.menubar.toolbar .button:active:focus,
+.menubar.toolbar .button:insensitive:focus,
+.header-bar .raised .button:focus,
+.header-bar .raised.button:focus,
+.header-bar .button:hover:focus,
+.header-bar .button:active:focus,
+.header-bar .button:insensitive:focus {
+}
+
+.primary-toolbar GtkComboBox.combobox-entry .button,
+.menubar.toolbar GtkComboBox.combobox-entry .button,
+.header-bar GtkComboBox.combobox-entry .button {
+}
+
+.primary-toolbar GtkComboBox.combobox-entry .button,
+.primary-toolbar .raised .button,
+.primary-toolbar .raised.button,
+.primary-toolbar .button:hover,
+.menubar.toolbar GtkComboBox.combobox-entry .button,
+.menubar.toolbar .raised .button,
+.menubar.toolbar .raised.button,
+.menubar.toolbar .button:hover,
+.header-bar GtkComboBox.combobox-entry .button,
+.header-bar .raised .button,
+.header-bar .raised.button,
+.header-bar .button:hover {
+}
+
+.primary-toolbar .button:active,
+.menubar.toolbar .button:active,
+.header-bar .button:active {
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (@dark_bg_color, 0.9)),
+                                     to (shade (@dark_bg_color, 0.95)));
+
+    text-shadow: 0 -1px shade (@dark_bg_color, 0.6);
+}
+
+.primary-toolbar .button:active:hover,
+.menubar.toolbar .button:active:hover,
+.header-bar .button:active:hover {
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (@dark_bg_color, 0.95)),
+                                     to (shade (@dark_bg_color, 1.0)));
+}
+
+.primary-toolbar .button:active:insensitive,
+.primary-toolbar .button:insensitive,
+.menubar.toolbar .button:active:insensitive,
+.menubar.toolbar .button:insensitive,
+.header-bar .button:active:insensitive,
+.header-bar .button:insensitive {
+    text-shadow: none;
+}
+
+.primary-toolbar .button:insensitive,
+.menubar.toolbar .button:insensitive,
+.header-bar .button:insensitive {
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (@dark_bg_color, 1.01)),
+                                     to (shade (@dark_bg_color, 0.99)));
+}
+
+.primary-toolbar .button:active:insensitive,
+.menubar.toolbar .button:active:insensitive,
+.header-bar .button:active:insensitive {
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (@dark_bg_color, 0.94)),
+                                     to (shade (@dark_bg_color, 1.02)));
+}
+
+.primary-toolbar .entry,
+.primary-toolbar .entry:active,
+.primary-toolbar .entry:focused,
+.menubar.toolbar .entry,
+.menubar.toolbar .entry:active,
+.menubar.toolbar .entry:focused,
+.header-bar .entry,
+.header-bar .entry:active,
+.header-bar .entry:focused {
+    border-radius: 9px;
+
+/*    background-color: @dark_bg_color;
+    background-image: none;
+
+    background-clip: border-box;*/
+}
+
+.primary-toolbar GtkSeparatorToolItem,
+.primary-toolbar .separator,
+.primary-toolbar .separator:insensitive,
+.menubar.toolbar GtkSeparatorToolItem,
+.menubar.toolbar .separator,
+.menubar.toolbar .separator:insensitive,
+.header-bar GtkSeparatorToolItem,
+.header-bar .separator,
+.header-bar .separator:insensitive {
+    border-color: alpha (shade (@dark_bg_color, 0.94), 0.35);
+    border-bottom-color: alpha (shade (@dark_bg_color, 1.26), 0.5);
+    border-right-color: alpha (shade (@dark_bg_color, 1.26), 0.5);
+}
+
+/* inline-toolbar */
+.inline-toolbar.toolbar {
+    -GtkToolbar-button-relief: normal;
+
+    border-right-color: shade (@bg_color, 0.86);
+    border-bottom-color: shade (@bg_color, 0.88);
+    border-left-color: shade (@bg_color, 0.86);
+
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (#f2f1ef, 0.93)),
+                                     color-stop (0.08, #f2f1ef),
+                                     to (#ffffff));
+    border-width: 0 1px 1px 1px;
+    border-style: solid;
+    border-radius: 3px;
+    border-top-right-radius: 0;
+    border-top-left-radius: 0;
+    padding: 3px 4px 4px 4px;
+}
+
+.inline-toolbar.toolbar .button {
+    padding: 4px;
+
+    icon-shadow: 0 1px shade (@bg_color, 1.16);
+}
+
+.inline-toolbar.toolbar .button *:insensitive,
+.inline-toolbar.toolbar GtkToolButton .button:insensitive {
+}
+
+/* Middle button */
+.primary-toolbar .button.raised.linked,
+.primary-toolbar .button.raised.linked:active,
+.primary-toolbar .button.raised.linked:focus,
+.primary-toolbar .button.raised.linked:focus:active,
+.primary-toolbar .button.raised.linked:insensitive,
+.primary-toolbar .button.raised.linked:backdrop,
+.primary-toolbar .raised.linked .button,
+.primary-toolbar .raised.linked .button:active,
+.primary-toolbar .raised.linked .button:focus,
+.primary-toolbar .raised.linked .button:focus:active,
+.primary-toolbar .raised.linked .button:insensitive,
+.primary-toolbar .raised.linked .button:backdrop,
+.menubar.toolbar .linked .button,
+.menubar.toolbar .linked .button:active,
+.menubar.toolbar .linked .button:focus,
+.menubar.toolbar .linked .button:focus:active,
+.menubar.toolbar .linked .button:hover,
+.menubar.toolbar .linked .button:hover:active,
+.menubar.toolbar .linked .button:insensitive,
+.menubar.toolbar .linked .button:backdrop,
+.menubar.toolbar .linked .entry,
+.menubar.toolbar .linked .entry:active,
+.menubar.toolbar .linked .entry:focused,
+.menubar.toolbar .linked .entry:focused:active,
+.menubar.toolbar .linked .entry:insensitive,
+.menubar.toolbar .raised.linked .button,
+.menubar.toolbar .raised.linked .button:active,
+.menubar.toolbar .raised.linked .button:focus,
+.menubar.toolbar .raised.linked .button:focus:active,
+.menubar.toolbar .raised.linked .button:insensitive,
+.menubar.toolbar .raised.linked .button:backdrop,
+.header-bar .linked .button,
+.header-bar .linked .button:active,
+.header-bar .linked .button:focus,
+.header-bar .linked .button:focus:active,
+.header-bar .linked .button:insensitive,
+.header-bar .linked .button:backdrop,
+.header-bar .linked .entry,
+.header-bar .linked .entry:active,
+.header-bar .linked .entry:focused,
+.header-bar .linked .entry:focused:active,
+.header-bar .linked .entry:insensitive,
+.header-bar .raised.linked .button,
+.header-bar .raised.linked .button:active,
+.header-bar .raised.linked .button:focus,
+.header-bar .raised.linked .button:focus:active,
+.header-bar .raised.linked .button:insensitive,
+.header-bar .raised.linked .button:backdrop,
+.inline-toolbar.toolbar .button,
+.inline-toolbar.toolbar .button:active,
+.inline-toolbar.toolbar .button:focus,
+.inline-toolbar.toolbar .button:focus:active,
+.inline-toolbar.toolbar .button:insensitive,
+.inline-toolbar.toolbar .button:backdrop,
+.inline-toolbar.toolbar .button:backdrop:insensitive,
+.inline-toolbar.toolbar GtkToolButton .button,
+.inline-toolbar.toolbar GtkToolButton .button:active,
+.inline-toolbar.toolbar GtkToolButton .button:focus,
+.inline-toolbar.toolbar GtkToolButton .button:focus:active,
+.inline-toolbar.toolbar GtkToolButton .button:insensitive,
+.inline-toolbar.toolbar GtkToolButton .button:backdrop,
+.inline-toolbar.toolbar GtkToolButton .button:backdrop:insensitive {
+    border-right-width: 0;
+    border-left-width: 0;
+    border-image-width: 10px 0 10px 0;
+    border-radius: 0;
+}
+
+/* Leftmost button */
+.primary-toolbar .button.raised.linked:first-child,
+.primary-toolbar .button.raised.linked:active:first-child,
+.primary-toolbar .button.raised.linked:focus:first-child,
+.primary-toolbar .button.raised.linked:focus:active:first-child,
+.primary-toolbar .button.raised.linked:insensitive:first-child,
+.primary-toolbar .button.raised.linked:backdrop:first-child,
+.primary-toolbar .raised.linked .button:first-child,
+.primary-toolbar .raised.linked .button:active:first-child,
+.primary-toolbar .raised.linked .button:focus:first-child,
+.primary-toolbar .raised.linked .button:focus:active:first-child,
+.primary-toolbar .raised.linked .button:insensitive:first-child,
+.primary-toolbar .raised.linked .button:backdrop:first-child,
+.menubar.toolbar .linked .button:first-child,
+.menubar.toolbar .linked .button:active:first-child,
+.menubar.toolbar .linked .button:focus:first-child,
+.menubar.toolbar .linked .button:focus:active:first-child,
+.menubar.toolbar .linked .button:insensitive:first-child,
+.menubar.toolbar .linked .button:backdrop:first-child,
+.menubar.toolbar .linked .entry:first-child,
+.menubar.toolbar .linked .entry:active:first-child,
+.menubar.toolbar .linked .entry:focused:first-child,
+.menubar.toolbar .linked .entry:focused:active:first-child,
+.menubar.toolbar .linked .entry:insensitive:first-child,
+.menubar.toolbar .raised.linked .button:first-child,
+.menubar.toolbar .raised.linked .button:active:first-child,
+.menubar.toolbar .raised.linked .button:focus:first-child,
+.menubar.toolbar .raised.linked .button:focus:active:first-child,
+.menubar.toolbar .raised.linked .button:insensitive:first-child,
+.menubar.toolbar .raised.linked .button:backdrop:first-child,
+.header-bar .linked .linked .button:first-child,
+.header-bar .linked .button:active:first-child,
+.header-bar .linked .button:focus:first-child,
+.header-bar .linked .button:focus:active:first-child,
+.header-bar .linked .button:insensitive:first-child,
+.header-bar .linked .button:backdrop:first-child,
+.header-bar .linked .entry:first-child,
+.header-bar .linked .entry:active:first-child,
+.header-bar .linked .entry:focused:first-child,
+.header-bar .linked .entry:focused:active:first-child,
+.header-bar .linked .entry:insensitive:first-child,
+.header-bar .raised.linked .button:first-child,
+.header-bar .raised.linked .button:active:first-child,
+.header-bar .raised.linked .button:focus:first-child,
+.header-bar .raised.linked .button:focus:active:first-child,
+.header-bar .raised.linked .button:insensitive:first-child,
+.header-bar .raised.linked .button:backdrop:first-child,
+.inline-toolbar.toolbar .button:first-child,
+.inline-toolbar.toolbar .button:active:first-child,
+.inline-toolbar.toolbar .button:focus:first-child,
+.inline-toolbar.toolbar .button:focus:active:first-child,
+.inline-toolbar.toolbar .button:insensitive:first-child,
+.inline-toolbar.toolbar .button:backdrop:first-child,
+.inline-toolbar.toolbar .button:backdrop:insensitive:first-child,
+.inline-toolbar.toolbar GtkToolButton:first-child .button,
+.inline-toolbar.toolbar GtkToolButton:first-child .button:active,
+.inline-toolbar.toolbar GtkToolButton:first-child .button:focus,
+.inline-toolbar.toolbar GtkToolButton:first-child .button:focus:active,
+.inline-toolbar.toolbar GtkToolButton:first-child .button:insensitive,
+.inline-toolbar.toolbar GtkToolButton:first-child .button:backdrop,
+.inline-toolbar.toolbar GtkToolButton:first-child .button:backdrop:insensitive {
+    border-left-width: 1px;
+    border-right-width: 0;
+    border-image-width: 10px 0 10px 12px;
+    border-radius: 8px;
+    border-bottom-right-radius: 0;
+    border-top-right-radius: 0;
+}
+
+/* Rightmost button */
+.primary-toolbar .button.raised.linked:last-child,
+.primary-toolbar .button.raised.linked:active:last-child,
+.primary-toolbar .button.raised.linked:focus:last-child,
+.primary-toolbar .button.raised.linked:focus:active:last-child,
+.primary-toolbar .button.raised.linked:insensitive:last-child,
+.primary-toolbar .button.raised.linked:backdrop:last-child,
+.primary-toolbar .raised.linked .button:last-child,
+.primary-toolbar .raised.linked .button:active:last-child,
+.primary-toolbar .raised.linked .button:focus:last-child,
+.primary-toolbar .raised.linked .button:focus:active:last-child,
+.primary-toolbar .raised.linked .button:insensitive:last-child,
+.primary-toolbar .raised.linked .button:backdrop:last-child,
+.menubar.toolbar .linked .button:last-child,
+.menubar.toolbar .linked .button:active:last-child,
+.menubar.toolbar .linked .button:focus:last-child,
+.menubar.toolbar .linked .button:focus:active:last-child,
+.menubar.toolbar .linked .button:insensitive:last-child,
+.menubar.toolbar .linked .button:backdrop:last-child,
+.menubar.toolbar .linked .entry:last-child,
+.menubar.toolbar .linked .entry.active:last-child,
+.menubar.toolbar .linked .entry:focused:last-child,
+.menubar.toolbar .linked .entry:focused:active:last-child,
+.menubar.toolbar .linked .entry:insensitive:last-child,
+.menubar.toolbar .raised.linked .button:last-child,
+.menubar.toolbar .raised.linked .button:active:last-child,
+.menubar.toolbar .raised.linked .button:focus:last-child,
+.menubar.toolbar .raised.linked .button:focus:active:last-child,
+.menubar.toolbar .raised.linked .button:insensitive:last-child,
+.menubar.toolbar .raised.linked .button:backdrop:last-child,
+.header-bar .linked .button:last-child,
+.header-bar .linked .button:active:last-child,
+.header-bar .linked .button:focus:last-child,
+.header-bar .linked .button:focus:active:last-child,
+.header-bar .linked .button:insensitive:last-child,
+.header-bar .linked .button:backdrop:last-child,
+.header-bar .linked .entry:last-child,
+.header-bar .linked .entry.active:last-child,
+.header-bar .linked .entry:focused:last-child,
+.header-bar .linked .entry:focused:active:last-child,
+.header-bar .linked .entry:insensitive:last-child,
+.header-bar .raised.linked .button:last-child,
+.header-bar .raised.linked .button:active:last-child,
+.header-bar .raised.linked .button:focus:last-child,
+.header-bar .raised.linked .button:focus:active:last-child,
+.header-bar .raised.linked .button:insensitive:last-child,
+.header-bar .raised.linked .button:backdrop:last-child,
+.inline-toolbar.toolbar .button:last-child,
+.inline-toolbar.toolbar .button:active:last-child,
+.inline-toolbar.toolbar .button:focus:last-child,
+.inline-toolbar.toolbar .button:focus:active:last-child,
+.inline-toolbar.toolbar .button:insensitive:last-child,
+.inline-toolbar.toolbar .button:backdrop:last-child,
+.inline-toolbar.toolbar .button:backdrop:insensitive:last-child,
+.inline-toolbar.toolbar GtkToolButton:last-child .button,
+.inline-toolbar.toolbar GtkToolButton:last-child .button:active,
+.inline-toolbar.toolbar GtkToolButton:last-child .button:focus,
+.inline-toolbar.toolbar GtkToolButton:last-child .button:focus:active,
+.inline-toolbar.toolbar GtkToolButton:last-child .button:insensitive,
+.inline-toolbar.toolbar GtkToolButton:last-child .button:backdrop,
+.inline-toolbar.toolbar GtkToolButton:last-child .button:backdrop:insensitive {
+    border-left-width: 0;
+    border-right-width: 1px;
+    border-image-width: 10px 12px 10px 0;
+    border-radius: 8px;
+    border-bottom-left-radius: 0;
+    border-top-left-radius: 0;
+    /*box-shadow: inset 1px 0 shade (@bg_color, 0.84);*/
+}
+
+/* Single button */
+.primary-toolbar.toolbar .button:only-child,
+.primary-toolbar.toolbar .button:active:only-child,
+.primary-toolbar.toolbar .button:focus:only-child,
+.primary-toolbar.toolbar .button:focus:active:only-child,
+.primary-toolbar.toolbar .button:insensitive:only-child,
+.primary-toolbar.toolbar .button:backdrop:only-child,
+.primary-toolbar.toolbar .button:backdrop:insensitive:only-child,
+.primary-toolbar.toolbar GtkToolButton:only-child .button,
+.primary-toolbar.toolbar GtkToolButton:only-child .button:active,
+.primary-toolbar.toolbar GtkToolButton:only-child .button:focus,
+.primary-toolbar.toolbar GtkToolButton:only-child .button:focus:active,
+.primary-toolbar.toolbar GtkToolButton:only-child .button:insensitive,
+.primary-toolbar.toolbar GtkToolButton:only-child .button:backdrop,
+.primary-toolbar.toolbar GtkToolButton:only-child .button:backdrop:insensitive,
+.menubar.toolbar.toolbar .button:only-child,
+.menubar.toolbar.toolbar .button:active:only-child,
+.menubar.toolbar.toolbar .button:focus:only-child,
+.menubar.toolbar.toolbar .button:focus:active:only-child,
+.menubar.toolbar.toolbar .button:insensitive:only-child,
+.menubar.toolbar.toolbar .button:backdrop:only-child,
+.menubar.toolbar.toolbar .button:backdrop:insensitive:only-child,
+.menubar.toolbar.toolbar GtkToolButton:only-child .button,
+.menubar.toolbar.toolbar GtkToolButton:only-child .button:active,
+.menubar.toolbar.toolbar GtkToolButton:only-child .button:focus,
+.menubar.toolbar.toolbar GtkToolButton:only-child .button:focus:active,
+.menubar.toolbar.toolbar GtkToolButton:only-child .button:insensitive,
+.menubar.toolbar.toolbar GtkToolButton:only-child .button:backdrop,
+.menubar.toolbar.toolbar GtkToolButton:only-child .button:backdrop:insensitive,
+.header-bar .button:only-child,
+.header-bar .button:active:only-child,
+.header-bar .button:focus:only-child,
+.header-bar .button:focus:active:only-child,
+.header-bar .button:insensitive:only-child,
+.header-bar .button:backdrop:only-child,
+.header-bar .button:backdrop:insensitive:only-child,
+.header-bar GtkToolButton:only-child .button,
+.header-bar GtkToolButton:only-child .button:active,
+.header-bar GtkToolButton:only-child .button:focus,
+.header-bar GtkToolButton:only-child .button:focus:active,
+.header-bar GtkToolButton:only-child .button:insensitive,
+.header-bar GtkToolButton:only-child .button:backdrop,
+.header-bar GtkToolButton:only-child .button:backdrop:insensitive,
+.inline-toolbar.toolbar .button:only-child,
+.inline-toolbar.toolbar .button:active:only-child,
+.inline-toolbar.toolbar .button:focus:only-child,
+.inline-toolbar.toolbar .button:focus:active:only-child,
+.inline-toolbar.toolbar .button:insensitive:only-child,
+.inline-toolbar.toolbar .button:backdrop:only-child,
+.inline-toolbar.toolbar .button:backdrop:insensitive:only-child,
+.inline-toolbar.toolbar GtkToolButton:only-child .button,
+.inline-toolbar.toolbar GtkToolButton:only-child .button:active,
+.inline-toolbar.toolbar GtkToolButton:only-child .button:focus,
+.inline-toolbar.toolbar GtkToolButton:only-child .button:focus:active,
+.inline-toolbar.toolbar GtkToolButton:only-child .button:insensitive,
+.inline-toolbar.toolbar GtkToolButton:only-child .button:backdrop,
+.inline-toolbar.toolbar GtkToolButton:only-child .button:backdrop:insensitive {
+    border-right-width: 1px;
+    border-left-width: 1px;
+    border-image-width: 10px 12px 10px 12px;
+    border-radius: 8px;
+    /*box-shadow: none;*/
+}
+
 /***********
  * tooltip *
  ***********/
@@ -1736,6 +2472,7 @@ GtkTextView {
     border-radius: 5px;
     border-style: solid;
     border-width: 1px;
+
     color: @tooltip_fg_color;
 }
 
diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk.css b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk.css
index 9c9372d..98e8cfe 100644
--- a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk.css
+++ b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk.css
@@ -1,61 +1 @@
-/* default color scheme */
-@define-color bg_color #e0e0e0;
-@define-color fg_color #4c4c4c;
-@define-color base_color #ffffff;
-@define-color text_color #333333;
-@define-color selected_bg_color #8FB2CF;
-@define-color selected_fg_color #ffffff;
-@define-color tooltip_bg_color #333333;
-@define-color tooltip_fg_color #ffffff;
-
-/* misc colors used by gtk+ */
-@define-color info_fg_color rgb (181, 171, 156);
-@define-color info_bg_color rgb (252, 252, 189);
-@define-color warning_fg_color rgb (173, 120, 41);
-@define-color warning_bg_color rgb (250, 173, 61);
-@define-color question_fg_color rgb (97, 122, 214);
-@define-color question_bg_color rgb (138, 173, 212);
-@define-color error_fg_color rgb (166, 38, 38);
-@define-color error_bg_color rgb (237, 54, 54);
-@define-color link_color @selected_bg_color;
-@define-color error_color #cc0000;
-@define-color combobox_color #888888;
-@define-color progress_color #5591c3;
-
-/* theme common colors */
-@define-color button_bg_color shade (@bg_color, 1.02); /*shade (#cdcdcd, 1.08);*/
-@define-color notebook_button_bg_color shade (@bg_color, 1.02);
-@define-color button_insensitive_bg_color mix (@button_bg_color, @bg_color, 0.6);
-@define-color dark_bg_color #bcbcbc;
-@define-color dark_fg_color @fg_color;
-@define-color borders @dark_bg_color;
-@define-color transparent rgba (0, 0, 0, 0);
-
-@define-color backdrop_fg_color mix (@bg_color, @fg_color, 0.8);
-@define-color backdrop_text_color mix (@base_color, @text_color, 0.8);
-@define-color backdrop_dark_fg_color mix (@dark_bg_color, @dark_fg_color, 0.75);
-@define-color backdrop_selected_bg_color shade (@bg_color, 0.92);
-@define-color backdrop_selected_fg_color @fg_color;
-
-@define-color toolbar_base #e0e0e0;
-@define-color toolbar_final #bcbcbc;
-@define-color toolbar_border #ffffff;
-@define-color toolbar_bg_color			@toolbar_base;
-@define-color toolbar_fg_color			@fg_color;
-@define-color toolbar_textshadow_color		@bg_color;
-@define-color toolbar_bg_top_color		@toolbar_base;
-@define-color toolbar_bg_bottom_color		@toolbar_final;
-@define-color toolbar_border_top_color		@toolbar_base;
-@define-color toolbar_border_bottom_color	@toolbar_border;
-
-@import url("gtk-widgets-borders.css");
-@import url("gtk-widgets-borders-radiance.css");
-@import url("gtk-widgets-assets.css");
-@import url("gtk-widgets-assets-radiance.css");
-@import url("gtk-widgets.css");
-@import url("gtk-widgets-radiance.css");
-@import url("gtk-widgets-toolbar.css");
-
-@import url("apps/gnome-panel.css");
-@import url("apps/nautilus.css");
-@import url("apps/unity.css");
+@import url("gtk-main.css");
\ No newline at end of file
diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/settings.ini b/usr/share/themes/Lubuntu-default/gtk-3.0/settings.ini
index 8583723..9e73cbc 100644
--- a/usr/share/themes/Lubuntu-default/gtk-3.0/settings.ini
+++ b/usr/share/themes/Lubuntu-default/gtk-3.0/settings.ini
@@ -1,3 +1,3 @@
 [Settings]
-gtk-color-scheme = "base_color:#f7f7f7\nbg_color:#e0e0e0\ntooltip_bg_color:#666666\nselected_bg_color:#a2b8ca\ntext_color:#2c2c2c\nfg_color:#2c2c2c\ntooltip_fg_color:#ffffff\nselected_fg_color:#F5F5F5\nlink_color:#5590CC\nbg_color_dark:#c9c9c9\nfg_color_dark:#2c2c2c"
+gtk-color-scheme = "base_color:#ffffff\nbg_color:#f6f4f2\ntooltip_bg_color:#000000\nselected_bg_color:#f07746\ntext_color:#3C3C3C\nfg_color:#4c4c4c\ntooltip_fg_color:#ffffff\nselected_fg_color:#ffffff\nlink_color:#DD4814\nbg_color_dark:#3c3b37\nfg_color_dark:#dfdbd2"
 gtk-auto-mnemonics = 1