- re-merge with last ubuntu theme

- fix and "lubuntize" headerbars
- improve padding in toolbars
- improve some borders
- fix some colour definitions

src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/gtk-lubuntu.css

@@ -61,6 +61,23 @@
     box-shadow: inset 0 0px shade (@dark_bg_color, 0.94);
 }
 
+
+/*************************
+ *  header bars		 *
+ *************************/
+
+.header-bar {
+    padding: 5px;
+    border-width: 0 0 1px;
+    border-style: solid;
+    border-color: shade(@toolbar_bg_color, 0.7);
+    background-image: linear-gradient(to bottom,
+                                      shade(@toolbar_bg_color, 1.00),
+                                      shade(@toolbar_bg_color, 0.90)
+                                      );
+}
+
+
 /*************************
  * progressbar and scale *
  *************************/
@@ -138,6 +155,10 @@ GtkMenuToolButton.menu .menuitem *:insensitive,
     text-shadow: none;
 }
 
+.menubar.menuitem:hover,
+.menubar .menuitem:hover {
+    border-color: #9CB8B8;
+}
 
 /*************
  * Scrollbar *

src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/gtk-widgets-radiance.css

@@ -95,6 +95,12 @@
     text-shadow: 0 1px shade (@bg_color, 1.14);
 }
 
+/* for the playback menu item in the sound menu */
+.menu .spinner,
+.menu .spinner:hover {
+    color: @selected_bg_color;
+}
+
 /* primary-toolbar */
 .primary-toolbar,
 .primary-toolbar .toolbar,
@@ -146,4 +152,4 @@
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@dark_bg_color, 1.03)),
                                      to (shade (@dark_bg_color, 0.96)));
-}
+}

src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/gtk-widgets.css

@@ -83,6 +83,10 @@ GtkWindow:backdrop {
     color: @backdrop_fg_color;
 }
 
+GtkEventBox {
+    background-color: @bg_color;
+}
+
 /*********
  * arrow *
  *********/
@@ -231,27 +235,6 @@ GtkSwitch.slider:backdrop,
 .button.default:insensitive {
 }
 */
-/* Middle button */
-.primary-toolbar .linked .entry,
-.primary-toolbar .linked .button,
-.primary-toolbar .linked .button:active,
-.primary-toolbar .linked .button:active:hover,
-.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;
-
-    border-radius: 0;
-}
 
 /* Set up shadows and hilights for button visual separation */
 .linked .button,
@@ -313,12 +296,17 @@ GtkSwitch.slider:backdrop,
 
 /* Middle button */
 .linked .entry,
+.linked .entry:active,
+.linked .entry:focus,
+.linked .entry:focus:active,
 .linked .button,
 .linked .button:active,
 .linked .button:active:hover,
 .linked .button:focus,
 .linked .button:focus:active,
-.linked .button:insensitive {
+.linked .button:insensitive,
+.linked .button:backdrop,
+.linked .button:active:backdrop {
     border-right-width: 0;
     border-left-width: 0;
     border-image-width: 10px 0 10px 0;
@@ -327,12 +315,17 @@ GtkSwitch.slider:backdrop,
 
 /* Leftmost button */
 .linked .entry:first-child,
+.linked .entry:active:first-child,
+.linked .entry:focus:first-child,
+.linked .entry:focus:active:first-child,
 .linked .button:first-child,
 .linked .button:active:first-child,
 .linked .button:active:hover:first-child,
 .linked .button:focus:first-child,
 .linked .button:focus:active:first-child,
-.linked .button:insensitive:first-child {
+.linked .button:insensitive:first-child,
+.linked .button:backdrop:first-child,
+.linked .button:active:backdrop:first-child {
     border-width: 1px;
     border-right-width: 0;
     border-image-width: 10px 0 10px 12px;
@@ -343,12 +336,17 @@ GtkSwitch.slider:backdrop,
 
 /* Rightmost button */
 .linked .entry:last-child,
+.linked .entry:active:last-child,
+.linked .entry:focus:last-child,
+.linked .entry:focus:active:last-child,
 .linked .button:last-child,
 .linked .button:active:last-child,
 .linked .button:active:hover:last-child,
 .linked .button:focus:last-child,
 .linked .button:focus:active:last-child,
-.linked .button:insensitive:last-child {
+.linked .button:insensitive:last-child,
+.linked .button:backdrop:last-child,
+.linked .button:active:backdrop:last-child {
     border-width: 1px;
     border-left-width: 0;
     border-image-width: 10px 12px 10px 0;
@@ -359,17 +357,22 @@ GtkSwitch.slider:backdrop,
 
 /* Linked single button */
 .linked .entry:only-child,
+.linked .entry:active:only-child,
+.linked .entry:focus:only-child,
+.linked .entry:focus:active:only-child,
 .linked .button:only-child,
 .linked .button:active:only-child,
 .linked .button:active:hover:only-child,
 .linked .button:focus:only-child,
 .linked .button:focus:active:only-child,
-.linked .button:insensitive:only-child {
+.linked .button:insensitive:only-child,
+.linked .button:backdrop:only-child,
+.linked .button:active:backdrop:only-child {
     border-right-width: 1px;
     border-left-width: 1px;
     border-image-width: 10px 12px 10px 12px;
     border-radius: 8px;
-}f
+}
 
 /* Set up shadows and hilights for button visual separation */
 .primary-toolbar .linked .button,
@@ -760,6 +763,11 @@ GtkComboBox.combobox-entry .button:insensitive:backdrop,
 /************
  * iconview *
  ************/
+.view {
+    background-color: @base_color;
+    color: @text_color;
+}
+
 GtkIconView.view.cell:selected,
 GtkIconView.view.cell:selected:focused {
     background-image: -gtk-gradient (linear, left top, left bottom,
@@ -915,6 +923,8 @@ GtkMenuToolButton.menu,
                 inset 0 -1px shade (@dark_bg_color, 1.18),
                 inset -1px 0 shade (@dark_bg_color, 1.16),
                 inset 1px 0 shade (@dark_bg_color, 1.18);
+
+    margin: 1px;
 }
 
 .toolbar .menu,
@@ -1461,7 +1471,7 @@ GtkScale {
 }
 
 GtkScale.vertical {
-    -GtkScale-slider-length: s3;
+    -GtkScale-slider-length: 13;
 }
 
 .scale.slider {
@@ -1829,7 +1839,8 @@ GtkComboBox .menuitem.separator {
     background-repeat: no-repeat;
 }
 
-.menu.spinner,
+.menu .spinner,
+.menu .spinner:hover,
 .primary-toolbar .spinner,
 .primary-toolbar .spinner,
 .menubar.toolbar .spinner,
@@ -1837,6 +1848,8 @@ GtkComboBox .menuitem.separator {
 .header-bar .spinner,
 .header-bar .spinner {
     color: @selected_bg_color;
+    border: none;
+    box-shadow: none;
 }
 
 .spinner:active {
@@ -1905,7 +1918,6 @@ GtkTextView {
  ***********/
 .toolbar {
     border-style: none;
-    background-color: transparent;
     padding: 1px;
 
     color: @fg_color;
@@ -2054,23 +2066,6 @@ GtkTextView {
                                      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,
@@ -2116,54 +2111,6 @@ GtkTextView {
 }
 
 /* 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,
@@ -2185,52 +2132,6 @@ GtkTextView {
 }
 
 /* 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,
@@ -2254,52 +2155,6 @@ GtkTextView {
 }
 
 /* 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,
@@ -2324,48 +2179,6 @@ GtkTextView {
 }
 
 /* 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,
@@ -2387,6 +2200,18 @@ GtkTextView {
     /*box-shadow: none;*/
 }
 
+
+.header-bar {
+    padding: 5px;
+    border-width: 0 0 1px;
+    border-style: solid;
+    border-color: shade(@toolbar_bg_color, 0.7);
+    background-image: linear-gradient(to bottom,
+                                      shade(@toolbar_bg_color, 1.00),
+                                      shade(@toolbar_bg_color, 0.90)
+                                      );
+}
+
 /***********
  * tooltip *
  ***********/

src/usr/share/themes/Lubuntu-dark-panel/gtk-3.0/settings.ini

@@ -1,3 +1,4 @@
 [Settings]
 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
+gtk-alternative-sort-arrows = true

src/usr/share/themes/Lubuntu-default/gtk-3.0/apps/gnome-panel.css

@@ -1,97 +0,0 @@
-/* Fallback Mode Panel */
-PanelWidget :backdrop,
-PanelApplet :backdrop,
-PanelToplevel :backdrop,
-PanelWidget,
-PanelApplet,
-PanelToplevel {
-    border-image: none;
-
-    color: @dark_fg_color;
-}
-
-PanelWidget,
-PanelApplet,
-PanelToplevel {
-    background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (shade (@dark_bg_color, 1.15)),
-                                     to (shade (@dark_bg_color, 0.95)));
-}
-
-PanelApplet {
-    border-width: 0;
-}
-
-PanelSeparator:backdrop,
-PanelSeparator {
-    border-width: 0;
-    background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (shade (@dark_bg_color, 1.15)),
-                                     to (shade (@dark_bg_color, 0.95)));
-
-    color: @dark_fg_color;
-}
-
-.gnome-panel-menu-bar,
-PanelApplet > GtkMenuBar.menubar,
-PanelApplet > GtkMenuBar.menubar.menuitem,
-PanelMenuBar.menubar,
-PanelMenuBar.menubar.menuitem {
-    -PanelMenuBar-icon-visible: true;
-    background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (shade (@dark_bg_color, 1.15)),
-                                     to (shade (@dark_bg_color, 0.95)));
-}
-
-PanelAppletFrame { 
-    background-color: @dark_bg_color;
-    background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (shade (@dark_bg_color, 1.15)),
-                                     to (shade (@dark_bg_color, 0.95)));
-    border-width: 0;
-}
-
-PanelApplet .button:backdrop,
-PanelApplet .button {
-    -GtkButton-inner-border: 2;
-
-    border-image: none;
-    background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (shade (@dark_bg_color, 1.15)),
-                                     to (shade (@dark_bg_color, 0.95)));    
-    border-color: alpha (shade (@dark_bg_color, 0.9), 0.6);
-    border-left-color: alpha (shade (@dark_bg_color, 1.2), 0.6);
-    border-radius: 0;
-    border-width: 0 1px 0 1px;
-
-    text-shadow: none;
-}
-
-PanelApplet .button:active:prelight:backdrop,
-PanelApplet .button:active:prelight,
-PanelApplet .button:active:backdrop,
-PanelApplet .button:active  {
-    border-image: none;
-    background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (shade (@dark_bg_color, 0.7)),
-                                     to (shade (@dark_bg_color, 0.8))); 
-    border-color: shade (@dark_bg_color, 0.7);
-}
-
-PanelApplet .button:prelight:backdrop,
-PanelApplet .button:prelight {
-    border-image: none;
-    background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (shade (@dark_bg_color, 1.3)),
-                                     to (shade (@dark_bg_color, 1.1))); 
-    border-color: alpha (shade (@dark_bg_color, 0.9), 0.6);
-    border-left-color: alpha (shade (@dark_bg_color, 1.2), 0.8);
-}
-
-ClockBox {
-    text-shadow: 0 1px shade (@dark_bg_color, 1.08);
-}
-
-WnckPager, WnckTasklist {
-    background-color: @dark_bg_color;
-}

src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-lubuntu.css

@@ -61,6 +61,23 @@
     box-shadow: inset 0 0px shade (@dark_bg_color, 0.94);
 }
 
+
+/*************************
+ *  header bars		 *
+ *************************/
+
+.header-bar {
+    padding: 5px;
+    border-width: 0 0 1px;
+    border-style: solid;
+    border-color: shade(@toolbar_bg_color, 0.7);
+    background-image: linear-gradient(to bottom,
+                                      shade(@toolbar_bg_color, 1.00),
+                                      shade(@toolbar_bg_color, 0.90)
+                                      );
+}
+
+
 /*************************
  * progressbar and scale *
  *************************/
@@ -138,6 +155,10 @@ GtkMenuToolButton.menu .menuitem *:insensitive,
     text-shadow: none;
 }
 
+.menubar.menuitem:hover,
+.menubar .menuitem:hover {
+    border-color: #9CB8B8;
+}
 
 /*************
  * Scrollbar *

src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-radiance.css

@@ -95,6 +95,12 @@
     text-shadow: 0 1px shade (@bg_color, 1.14);
 }
 
+/* for the playback menu item in the sound menu */
+.menu .spinner,
+.menu .spinner:hover {
+    color: @selected_bg_color;
+}
+
 /* primary-toolbar */
 .primary-toolbar,
 .primary-toolbar .toolbar,
@@ -146,4 +152,4 @@
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@dark_bg_color, 1.03)),
                                      to (shade (@dark_bg_color, 0.96)));
-}
+}

src/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets.css

@@ -83,6 +83,10 @@ GtkWindow:backdrop {
     color: @backdrop_fg_color;
 }
 
+GtkEventBox {
+    background-color: @bg_color;
+}
+
 /*********
  * arrow *
  *********/
@@ -231,27 +235,6 @@ GtkSwitch.slider:backdrop,
 .button.default:insensitive {
 }
 */
-/* Middle button */
-.primary-toolbar .linked .entry,
-.primary-toolbar .linked .button,
-.primary-toolbar .linked .button:active,
-.primary-toolbar .linked .button:active:hover,
-.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;
-
-    border-radius: 0;
-}
 
 /* Set up shadows and hilights for button visual separation */
 .linked .button,
@@ -313,12 +296,17 @@ GtkSwitch.slider:backdrop,
 
 /* Middle button */
 .linked .entry,
+.linked .entry:active,
+.linked .entry:focus,
+.linked .entry:focus:active,
 .linked .button,
 .linked .button:active,
 .linked .button:active:hover,
 .linked .button:focus,
 .linked .button:focus:active,
-.linked .button:insensitive {
+.linked .button:insensitive,
+.linked .button:backdrop,
+.linked .button:active:backdrop {
     border-right-width: 0;
     border-left-width: 0;
     border-image-width: 10px 0 10px 0;
@@ -327,12 +315,17 @@ GtkSwitch.slider:backdrop,
 
 /* Leftmost button */
 .linked .entry:first-child,
+.linked .entry:active:first-child,
+.linked .entry:focus:first-child,
+.linked .entry:focus:active:first-child,
 .linked .button:first-child,
 .linked .button:active:first-child,
 .linked .button:active:hover:first-child,
 .linked .button:focus:first-child,
 .linked .button:focus:active:first-child,
-.linked .button:insensitive:first-child {
+.linked .button:insensitive:first-child,
+.linked .button:backdrop:first-child,
+.linked .button:active:backdrop:first-child {
     border-width: 1px;
     border-right-width: 0;
     border-image-width: 10px 0 10px 12px;
@@ -343,12 +336,17 @@ GtkSwitch.slider:backdrop,
 
 /* Rightmost button */
 .linked .entry:last-child,
+.linked .entry:active:last-child,
+.linked .entry:focus:last-child,
+.linked .entry:focus:active:last-child,
 .linked .button:last-child,
 .linked .button:active:last-child,
 .linked .button:active:hover:last-child,
 .linked .button:focus:last-child,
 .linked .button:focus:active:last-child,
-.linked .button:insensitive:last-child {
+.linked .button:insensitive:last-child,
+.linked .button:backdrop:last-child,
+.linked .button:active:backdrop:last-child {
     border-width: 1px;
     border-left-width: 0;
     border-image-width: 10px 12px 10px 0;
@@ -359,17 +357,22 @@ GtkSwitch.slider:backdrop,
 
 /* Linked single button */
 .linked .entry:only-child,
+.linked .entry:active:only-child,
+.linked .entry:focus:only-child,
+.linked .entry:focus:active:only-child,
 .linked .button:only-child,
 .linked .button:active:only-child,
 .linked .button:active:hover:only-child,
 .linked .button:focus:only-child,
 .linked .button:focus:active:only-child,
-.linked .button:insensitive:only-child {
+.linked .button:insensitive:only-child,
+.linked .button:backdrop:only-child,
+.linked .button:active:backdrop:only-child {
     border-right-width: 1px;
     border-left-width: 1px;
     border-image-width: 10px 12px 10px 12px;
     border-radius: 8px;
-}f
+}
 
 /* Set up shadows and hilights for button visual separation */
 .primary-toolbar .linked .button,
@@ -760,6 +763,11 @@ GtkComboBox.combobox-entry .button:insensitive:backdrop,
 /************
  * iconview *
  ************/
+.view {
+    background-color: @base_color;
+    color: @text_color;
+}
+
 GtkIconView.view.cell:selected,
 GtkIconView.view.cell:selected:focused {
     background-image: -gtk-gradient (linear, left top, left bottom,
@@ -915,6 +923,8 @@ GtkMenuToolButton.menu,
                 inset 0 -1px shade (@dark_bg_color, 1.18),
                 inset -1px 0 shade (@dark_bg_color, 1.16),
                 inset 1px 0 shade (@dark_bg_color, 1.18);
+
+    margin: 1px;
 }
 
 .toolbar .menu,
@@ -1829,7 +1839,8 @@ GtkComboBox .menuitem.separator {
     background-repeat: no-repeat;
 }
 
-.menu.spinner,
+.menu .spinner,
+.menu .spinner:hover,
 .primary-toolbar .spinner,
 .primary-toolbar .spinner,
 .menubar.toolbar .spinner,
@@ -1837,6 +1848,8 @@ GtkComboBox .menuitem.separator {
 .header-bar .spinner,
 .header-bar .spinner {
     color: @selected_bg_color;
+    border: none;
+    box-shadow: none;
 }
 
 .spinner:active {
@@ -1905,7 +1918,6 @@ GtkTextView {
  ***********/
 .toolbar {
     border-style: none;
-    background-color: transparent;
     padding: 1px;
 
     color: @fg_color;
@@ -2054,23 +2066,6 @@ GtkTextView {
                                      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,
@@ -2116,54 +2111,6 @@ GtkTextView {
 }
 
 /* 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,
@@ -2185,52 +2132,6 @@ GtkTextView {
 }
 
 /* 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,
@@ -2254,52 +2155,6 @@ GtkTextView {
 }
 
 /* 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,
@@ -2324,48 +2179,6 @@ GtkTextView {
 }
 
 /* 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,
@@ -2387,6 +2200,18 @@ GtkTextView {
     /*box-shadow: none;*/
 }
 
+
+.header-bar {
+    padding: 5px;
+    border-width: 0 0 1px;
+    border-style: solid;
+    border-color: shade(@toolbar_bg_color, 0.7);
+    background-image: linear-gradient(to bottom,
+                                      shade(@toolbar_bg_color, 1.00),
+                                      shade(@toolbar_bg_color, 0.90)
+                                      );
+}
+
 /***********
  * tooltip *
  ***********/

src/usr/share/themes/Lubuntu-default/gtk-3.0/settings.ini

@@ -1,3 +1,4 @@
 [Settings]
 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
+gtk-alternative-sort-arrows = true