diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/apps/gnome-panel.css b/usr/share/themes/Lubuntu-default/gtk-3.0/apps/gnome-panel.css
new file mode 100644
index 0000000..6538eba
--- /dev/null
+++ b/usr/share/themes/Lubuntu-default/gtk-3.0/apps/gnome-panel.css
@@ -0,0 +1,97 @@
+/* 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;
+}
diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/apps/nautilus.css b/usr/share/themes/Lubuntu-default/gtk-3.0/apps/nautilus.css
new file mode 100644
index 0000000..55b04f7
--- /dev/null
+++ b/usr/share/themes/Lubuntu-default/gtk-3.0/apps/nautilus.css
@@ -0,0 +1,157 @@
+@define-color cluebar_color shade (mix (@bg_color, @base_color, 0.5), 0.95);
+
+NautilusWindow * {
+    -GtkPaned-handle-size: 1;
+}
+
+NautilusDesktopWindow GtkWidget {
+    background-color: @transparent;
+}
+
+.nautilus-canvas-item {
+    border-radius: 4px;
+}
+
+/* desktop mode */
+.nautilus-desktop.nautilus-canvas-item {
+    color: @bg_color;
+    text-shadow: 1px 1px alpha (#000000, 0.8);
+}
+
+.nautilus-desktop.nautilus-canvas-item:active {
+    background-image: none;
+    background-color: alpha (@bg_color, 0.84);
+
+    color: @fg_color;
+}
+
+.nautilus-desktop.nautilus-canvas-item:selected {
+    background-image: none;
+    background-color: alpha (@selected_bg_color, 0.84);
+
+    color: @selected_fg_color;
+}
+
+.nautilus-desktop.nautilus-canvas-item:active,
+.nautilus-desktop.nautilus-canvas-item:prelight,
+.nautilus-desktop.nautilus-canvas-item:selected {
+    text-shadow: none;
+}
+
+/* browser window */
+NautilusTrashBar.info,
+NautilusXContentBar.info,
+NautilusSearchBar.info,
+NautilusQueryEditor.info {
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (@cluebar_color, 1.02)),
+                                     to (shade (@cluebar_color, 0.98)));
+    background-color: @cluebar_color;
+    border-bottom-color: shade (@cluebar_color, 0.92);
+    border-radius: 0;
+    border-style: solid;
+    border-width: 0px 0px 1px 0px;
+
+    box-shadow: inset -1px 0px shade (@cluebar_color, 1.02),
+                inset 1px 0px shade (@cluebar_color, 1.02),
+                inset 0 1px shade (@cluebar_color, 1.04),
+                inset 0 -1px shade (@cluebar_color, 1.01);
+}
+
+NautilusTrashBar.info:backdrop,
+NautilusXContentBar.info:backdrop,
+NautilusSearchBar.info:backdrop,
+NautilusQueryEditor.info:backdrop {
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (@cluebar_color, 1.01)),
+                                     to (shade (@cluebar_color, 0.99)));
+    background-color: @cluebar_color;
+    border-bottom-color: shade (@cluebar_color, 0.92);
+
+    box-shadow: inset -1px 0px shade (@cluebar_color, 1.01),
+                inset 1px 0px shade (@cluebar_color, 1.01),
+                inset 0 1px shade (@cluebar_color, 1.02),
+                inset 0 -1px shade (@cluebar_color, 1.0);
+}
+
+NautilusSearchBar .entry {
+}
+
+.nautilus-cluebar-label {
+    font: bold;
+    text-shadow: 0 1px shade (@cluebar_color, 1.06);
+}
+
+.nautilus-cluebar-label:backdrop {
+    color: mix (@fg_color, @cluebar_color, 0.2);
+    text-shadow: 0 1px shade (@cluebar_color, 1.02);
+}
+
+#nautilus-search-button *:active,
+#nautilus-search-button *:active:prelight {
+    color: @dark_fg_color;
+}
+
+NautilusFloatingBar {
+    background-color: @info_bg_color;
+    border-radius: 3px 3px 0 0;
+    border-style: solid;
+    border-width: 1px;
+    border-color: darker (@info_bg_color);
+}
+
+NautilusFloatingBar .button {
+    -GtkButton-image-spacing: 0;
+    -GtkButton-inner-border: 0;
+}
+
+/* sidebar */
+NautilusWindow .sidebar,
+NautilusWindow .sidebar .view {
+    background-color: shade (@bg_color, 0.95);
+
+    /*background-color: @bg_color;*/
+
+    color: @fg_color;
+    text-shadow: 0 1px shade (shade (@bg_color, 0.95), 1.04); 
+}
+
+NautilusWindow .sidebar .frame {
+    border-width: 1px 0 0 0;
+    border-style: solid;
+    border-color: shade (@bg_color, 0.86);
+    border-radius: 0;
+}
+
+NautilusWindow .sidebar:backdrop,
+NautilusWindow .sidebar .view:backdrop {
+    color: mix (@fg_color, shade (@bg_color, 0.95), 0.2);
+    text-shadow: 0 1px shade (shade (@bg_color, 0.95), 1.02); 
+}
+
+NautilusWindow .sidebar row:selected {
+    color: @selected_fg_color;
+    text-shadow: 0 1px shade (@selected_bg_color, 0.8); 
+}
+
+NautilusWindow .sidebar row:selected:backdrop {
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (shade (@bg_color, 0.95), 0.94)),
+                                     to (shade (shade (@bg_color, 0.95), 0.86)));
+    border-top-color: shade (shade (@bg_color, 0.95), 0.88);
+
+    color: @fg_color;
+    text-shadow: 0 1px shade (shade (@bg_color, 0.95), 0.96); 
+}
+
+NautilusWindow .pane-separator {
+    background-color: shade (shade (@bg_color, 0.95), 0.94);
+    border-color: @dark_bg_color;
+    border-style: solid;
+    border-width: 0;
+    box-shadow: none;
+}
+
+NautilusWindow .pane-separator:backdrop {
+    background-color: shade (shade (@bg_color, 0.95), 0.96);
+}
diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/apps/unity.css b/usr/share/themes/Lubuntu-default/gtk-3.0/apps/unity.css
new file mode 100644
index 0000000..5ff6bce
--- /dev/null
+++ b/usr/share/themes/Lubuntu-default/gtk-3.0/apps/unity.css
@@ -0,0 +1,38 @@
+UnityPanelWidget,
+.unity-panel {
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (@dark_bg_color, 1.3)),
+                                     to (shade (@dark_bg_color, 1.0)));
+    border-top-color: shade (@dark_bg_color, 1.4);
+    border-style: solid;
+    border-width: 1px 0 0 0;
+
+    color: @dark_fg_color;
+    text-shadow: 0 1px shade (@dark_bg_color, 1.1);
+}
+
+.unity-panel.menubar,
+.unity-panel .menubar {
+}
+
+.unity-panel.menuitem,
+.unity-panel .menuitem {
+    border-width: 1px 1px 0 1px;
+
+    icon-shadow: 0 1px shade (@dark_bg_color, 1.06);
+}
+
+.unity-panel.menubar.menuitem:hover,
+.unity-panel.menubar .menuitem *:hover {
+    border-radius: 7px 7px 0 0;
+    border-width: 1px 1px 0 1px;
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (@dark_bg_color, 1.5)),
+                                     to (shade (@dark_bg_color, 1.02)));
+    border-image: url("../assets/radiance-menubaritem.png") 8 10 1 10 / 8px 10px 1px 10px stretch;
+    /*box-shadow: inset 0 -1px shade (@dark_bg_color, 0.95);*/
+    box-shadow: none;
+
+    color: @fg_color;
+    text-shadow: 0 1px shade (@dark_bg_color, 1.1);
+}
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 f143fac..42553d3 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
@@ -827,35 +827,47 @@ GtkLabel:insensitive {
  ********/
 GtkTreeMenu.menu,
 .toolbar .primary-toolbar .menu,
+.toolbar .menubar.toolbar .menu,
+.toolbar .header-bar .menu,
 GtkMenuToolButton.menu,
 .primary-toolbar .button .menu,
+.menubar.toolbar .button .menu,
+.header-bar .button .menu,
 .menu {
     background-image: none;
-    background-color: @bg_color;
-    border-bottom-color: @combobox_color;
-    border-left-color:@combobox_color;
-    border-right-color: @combobox_color;
-    border-top-color: @combobox_color;
-    border-color: shade (@bg_color, 0.66);
+    background-color: @base_color;
+    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);
+    border-top-color: shade (@dark_bg_color, 0.96);
     padding: 0;
     border-width: 1px;
     border-style: solid;
+
     color: @dark_fg_color;
+
+    box-shadow: inset 0 1px shade (@dark_bg_color, 1.18),
+                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);
 }
 
 .toolbar .menu,
 GtkComboBox .menu {
     background-image: none;
     background-color: @bg_color;
-    border-bottom-color: @combobox_color;
-    border-left-color:@combobox_color;
-    border-right-color: @combobox_color;
-    border-top-color: @combobox_color;
-    border-color: shade (@bg_color, 0.66);
-    border-width: 0px;
+    border-bottom-color: shade (@bg_color, 0.66);
+    border-left-color: shade (@bg_color, 0.7);
+    border-right-color: shade (@bg_color, 0.7);
+    border-top-color: shade (@bg_color, 0.8);
     border-style: solid;
     padding: 0;
-    color: @dark_fg_color;
+
+    color: @fg_color;
+
+    box-shadow: inset -1px 0 shade (@bg_color, 1.18),
+                inset 1px 0 shade (@bg_color, 1.18),
+                inset 0 1px shade (@bg_color, 1.18);
 }
 
 .menu:selected {
@@ -866,12 +878,28 @@ GtkComboBox .menu {
 .menu.button:active,
 .menu.button:active:insensitive,
 .menu.button:insensitive,
-.menu.button {
+.menu.button
+/*.primary-toolbar .menu.button:hover,
+.primary-toolbar .menu.button:active,
+.primary-toolbar .menu.button:active:insensitive,
+.primary-toolbar .menu.button:insensitive,
+.primary-toolbar .menu.button,
+.menubar.toolbar .menu.button:hover,
+.menubar.toolbar .menu.button:active,
+.menubar.toolbar .menu.button:active:insensitive,
+.menubar.toolbar .menu.button:insensitive,
+.menubar.toolbar .menu.button,
+.header-bar .menu.button:hover,
+.header-bar .menu.button:active,
+.header-bar .menu.button:active:insensitive,
+.header-bar .menu.button:insensitive,
+.header-bar .menu.button */
+{
     background-color: shade (@dark_bg_color, 1.08);
     background-image: none;
     border-radius: 0;
     border-style: none;
-    border-width: 0px;
+    border-width: 1px;
 }
 
 /***********
@@ -879,9 +907,11 @@ GtkComboBox .menu {
  ***********/
 .menubar {
     -GtkWidget-window-dragging: true;
-    background-color: @bg_color;
+
+    background-color: @toolbar_base;
     background-image: none;
     border-width: 0;
+
     color: @dark_fg_color;
     text-shadow: 0 -1px shade (@dark_bg_color, 0.6);
 }
@@ -894,45 +924,32 @@ GtkComboBox .menu {
 /***************
  * menubaritem *
  ***************/
-.menubar.menuitem,
-.menubar .menuitem {
-	border-width: 1px;
-	padding: 3px 5px 3px 5px;
-}
-
 .menubar.menuitem:hover,
 .menubar .menuitem:hover {
-    border-style: solid;
     border-radius: 4px 4px 0 0;
-    border-width: 0px;
-    background-image: none;
-    border-image: -gtk-gradient (linear, left top, left bottom,
-                                 from (shade (@selected_bg_color, 0.7)),
-                                 to (shade (@selected_bg_color, 0.7))) 1;
-    background-color: @selected_bg_color;
+    border-width: 1px 1px 0 1px;
+    background-color: @selected_bg;
+    /*box-shadow: inset 0 -1px shade (@dark_bg_color, 0.95);*/
     box-shadow: none;
-    color: @selected_fg_color;
+
+    color: shade (@dark_fg_color, 1.1);
     text-shadow: 0 -1px shade (@dark_bg_color, 0.7);
 }
 
 /************
  * menuitem *
  ************/
+/*.menuitem {
+    color: @fg_color;
+}*/
+
 .menuitem {
+    -GtkMenuItem-horizontal-padding: 0;
+    background: transparent;
     border-radius: 0;
-    border-style: none;
-    border-width: 1px;
-    padding: 3px 6px 3px 6px;
-    text-shadow: none;
-}
+    padding: 3px 5px 3px 5px;
 
-/* Workaround for lp:1186631 */
-.menuitem:active {
-	color: @selected_fg_color2;
-	padding: 3px 6px 3px 6px;
-	border-width:  0px 1px 1px 0px;
-	border-radius: 0px;
-	border-style: none;   
+    text-shadow: none;
 }
 
 .menuitem {
@@ -941,6 +958,7 @@ GtkComboBox .menu {
 
 /* Workaround for lp:949368 */
 GtkComboBox .menuitem * {
+    background-image: #ff0000;
     color: @fg_color;
 }
 
@@ -950,7 +968,7 @@ GtkComboBox .menuitem *:hover {
 
 .menuitem:hover,
 .menu .menuitem:hover {
-    border-radius: 0px;
+    border-radius: 0;
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@selected_bg_color, 1.1)),
                                      to (shade (@selected_bg_color, 0.9)));
@@ -977,14 +995,28 @@ GtkComboBox .menuitem *:hover {
     box-shadow: none;
 }
 
+/*.menuitem:insensitive,
+.menuitem *:insensitive {
+    color: mix (@fg_color, @bg_color, 0.5);
+    text-shadow: 0 1px shade (@bg_color, 1.14);
+}
+*/
 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);
@@ -1009,6 +1041,7 @@ GtkComboBox .menu .menuitem *:insensitive {
     border-style: solid;
     border-width: 0;
     padding: 0;
+
     color: @dark_fg_color;
 }
 
@@ -1017,10 +1050,16 @@ GtkComboBox .menu .menuitem *:insensitive {
     background-image: none;
 }
 
+.menuitem GtkCalendar:inconsistent {
+    color: shade (@bg_color, 0.6);
+}
+
 .menuitem .entry {
     background-color: shade (@dark_bg_color, 1.3);
     background-image: none;
+
     color: @dark_fg_color;
+
     border-image: -gtk-gradient (linear, left top, left bottom,
                                  from (shade (@dark_bg_color, 0.75)),
                                  to (shade (@dark_bg_color, 0.9))) 1;
@@ -1028,6 +1067,11 @@ GtkComboBox .menu .menuitem *:insensitive {
 }
 
 .primary-toolbar GtkScale.trough,
+.primary-toolbar GtkScale.trough:backdrop,
+.menubar.toolbar GtkScale.trough,
+.menubar.toolbar GtkScale.trough:backdrop,
+.header-bar GtkScale.trough,
+.header-bar GtkScale.trough:backdrop,
 .menuitem GtkScale.trough {
     background-color: @dark_bg_color;
     background-image: none;
@@ -1050,6 +1094,10 @@ GtkComboBox .menu .menuitem *:insensitive {
     text-shadow: 0 -1px shade (@dark_bg_color, 0.7);
 }
 
+.menuitem > GtkBox > GtkImage + GtkLabel {
+    padding-left: 6px;
+}
+
 /************
  * notebook *
  ************/
@@ -1160,7 +1208,7 @@ GtkComboBox .menu .menuitem *:insensitive {
  *************************/
 GtkScale,
 GtkProgressBar {
-    border-radius: 10px;
+    border-radius: 8px;
     border-width: 0px;
     padding: 1px;
 }
@@ -1181,9 +1229,9 @@ GtkProgressBar {
 .progressbar row:selected,
 .progressbar row:selected:focused {
     border-radius: 8px;
-    border-width: 0px;
+    border-width: 1px;
     background-image: none;
-    background-color: @link_color;
+    background-color: @progress_color;
     border-style: solid;
 }
 
@@ -1197,7 +1245,7 @@ GtkProgressBar {
     border-radius: 8px;
     border-width: 0px;
     background-image: none;
-    background-color: @toolbar_final;
+    background-color: #b0b0b0;
 }
 
 .scale.highlight.left:insensitive {
@@ -1222,6 +1270,7 @@ GtkProgressBar {
                                      to (#e8e8e8));
     border-style: solid;
     border-width: 1px;
+
     color: @text_color;
 }
 
@@ -1250,8 +1299,9 @@ GtkLevelBar.vertical {
 .level-bar.fill-block {
     border-width: 1px;
     border-style: solid;
+
     border-color: @selected_bg_color;
-    background-color: @link_color;
+    background-color: @selected_bg_color;
 }
 
 .level-bar.indicator-continuous.fill-block {
@@ -1276,6 +1326,28 @@ GtkLevelBar.vertical {
     margin: 1px 0;
 }
 
+/* discrete indicator border rounding,
+   uncomment when :nth-child will be working
+   on the widget
+
+.level-bar.indicator-discrete.fill-block.horizontal:first-child {
+    border-radius: 2px 0 0 2px;
+}
+
+.level-bar.indicator-discrete.fill-block.horizontal:last-child {
+    border-radius: 0 2px 2px 0;
+}
+
+.level-bar.indicator-discrete.fill-block.vertical:first-child {
+    border-radius: 2px 2px 0 0;
+}
+
+.level-bar.indicator-discrete.fill-block.vertical:last-child {
+    border-radius: 0 0 2px 2px;
+}
+
+*/
+
 .level-bar.fill-block.level-high {
     border-color: shade(@success_color, 0.85);
     background-image: linear-gradient(to bottom,
@@ -1321,8 +1393,9 @@ GtkScale.vertical {
 }
 
 .scale.trough.highlight {
-    background-color: @link_color;
+    background-color: @progress_color;
     background-image: none;
+    background-clip: content-box;
 }
 
 .scale.trough.highlight:insensitive {
@@ -1337,6 +1410,7 @@ GtkScale.vertical {
 .scale.trough.highlight:backdrop {
     background-color: #dcdcdc;
     background-image: none;
+    /*background-clip: padding-box;*/
 }
 
 
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 4ced46d..9c9372d 100644
--- a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk.css
+++ b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk.css
@@ -1,12 +1,12 @@
 /* default color scheme */
 @define-color bg_color #e0e0e0;
-@define-color fg_color #333;
-@define-color base_color #fff;
-@define-color text_color #333;
+@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 #fff;
-@define-color tooltip_bg_color #333;
-@define-color tooltip_fg_color #fff;
+@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);
@@ -17,15 +17,15 @@
 @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 #5590CC;
+@define-color link_color @selected_bg_color;
 @define-color error_color #cc0000;
-@define-color combobox_color #888;
+@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_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 @bg_color;	*/
 @define-color dark_bg_color #bcbcbc;
 @define-color dark_fg_color @fg_color;
 @define-color borders @dark_bg_color;
@@ -39,8 +39,8 @@
 
 @define-color toolbar_base #e0e0e0;
 @define-color toolbar_final #bcbcbc;
-@define-color toolbar_border #fff;
-@define-color toolbar_bg_color			@bg_color;
+@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;
@@ -55,3 +55,7 @@
 @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");