Merge branch 'dev'

14 files changed, 245 insertions, 326 deletions

diff --git a/gtk-3.0/applications.css b/gtk-3.0/applications.css
index 488662f..6f0aa25 100644
--- a/gtk-3.0/applications.css
+++ b/gtk-3.0/applications.css
@@ -194,4 +194,3 @@ UnityPanelWidget,
 	                  color-stop (0.50, @menubar_menuitem_hover_gradient_c),
 	                  to (@menubar_menuitem_hover_gradient_d));
 }
-
diff --git a/gtk-3.0/gtk-variant.css b/gtk-3.0/gtk-variant.css
deleted file mode 100644
index c19bf98..0000000
--- a/gtk-3.0/gtk-variant.css
+++ /dev/null
@@ -1,46 +0,0 @@
-/***********************************************************************
- * This section can be modified to create color variants of the theme. *
- ***********************************************************************/
-
-/****************
- * color scheme *
- ****************/
-
-@define-color theme_base_color #ffffff;
-
-@define-color theme_bg_color #edeceb;
-@define-color theme_fg_color #000000;
-
-@define-color theme_selected_bg_color #86abd9;
-@define-color theme_selected_fg_color #ffffff;
-
-@define-color theme_tooltip_bg_color #f5f5b5;
-@define-color theme_tooltip_fg_color #000000;
-
-@define-color theme_text_color #1a1a1a;
-
-@define-color link_color #0000ee;
-@define-color visited_link_color #551a8b;
-
-/*****************
- * error/warning *
- *****************/
-
-@define-color error_color #cc0000;
-
-@define-color warning_bg_color #faad3d;
-
-/***************
- * core colors *
- ***************/
-
-/* Core colors are only used in the current file, as bases for other
-   color declarations. */
-
-@define-color core_color_a #a4c2e8; /* Core color for blue widgets in Clearlooks-Phenix. */
-@define-color core_color_b #edeceb; /* Core color for gray widgets in Clearlooks-Phenix. */
-
-/********************************************
- * End of configuration for color variants. *
- ********************************************/
-
diff --git a/gtk-3.0/gtk-widgets-img.css b/gtk-3.0/gtk-widgets-img.css
index eeff857..968ac5d 100644
--- a/gtk-3.0/gtk-widgets-img.css
+++ b/gtk-3.0/gtk-widgets-img.css
@@ -34,9 +34,9 @@ GtkSwitch.slider:insensitive {
 	background-image: url("img/resize-grip.png");
 }
 
-/***************
+/*************
  * Scrollbar *
- ***************/
+ *************/
 
 .scrollbar.slider {
 	background-repeat: no-repeat;
@@ -94,109 +94,127 @@ GtkSwitch.slider:insensitive {
 .check,
 .check row:selected,
 .check row:selected:focus {
-	background-image: url("img/checkbox-unchecked.png");
+	-gtk-icon-source: url("img/checkbox-unchecked.png");
 }
 
 .check:hover,
 .check row:selected:hover,
 .check row:selected:focus:hover {
-	background-image: url("img/checkbox-unchecked-hover.png");
+	-gtk-icon-source: url("img/checkbox-unchecked-hover.png");
 }
 
 .check:insensitive,
 .check row:selected:insensitive,
 .check row:selected:focus:insensitive {
-	background-image: url("img/checkbox-unchecked-insensitive.png");
+	-gtk-icon-source: url("img/checkbox-unchecked-insensitive.png");
 }
 
+.check:checked,
+.check row:selected:checked,
+.check row:selected:focus:checked,
 .check:active,
 .check row:selected:active,
 .check row:selected:focus:active {
-	background-image: url("img/checkbox-checked.png");
+	-gtk-icon-source: url("img/checkbox-checked.png");
 }
 
+.check:checked:hover,
+.check row:selected:checked:hover,
+.check row:selected:focus:checked:hover,
 .check:active:hover,
 .check row:selected:active:hover,
 .check row:selected:focus:active:hover {
-	background-image: url("img/checkbox-checked-hover.png");
+	-gtk-icon-source: url("img/checkbox-checked-hover.png");
 }
 
+.check:checked:insensitive,
+.check row:selected:checked:insensitive,
+.check row:selected:focus:checked:insensitive,
 .check:active:insensitive,
 .check row:selected:active:insensitive,
 .check row:selected:focus:active:insensitive {
-	background-image: url("img/checkbox-checked-insensitive.png");
+	-gtk-icon-source: url("img/checkbox-checked-insensitive.png");
 }
 
 .check:inconsistent,
 .check row:selected:inconsistent,
 .check row:selected:focus:inconsistent {
-	background-image: url("img/checkbox-mixed.png");
+	-gtk-icon-source: url("img/checkbox-mixed.png");
 }
 
 .check:inconsistent:hover,
 .check row:selected:inconsistent:hover,
 .check row:selected:focus:inconsistent:hover {
-	background-image: url("img/checkbox-mixed-hover.png");
+	-gtk-icon-source: url("img/checkbox-mixed-hover.png");
 }
 
 .check:inconsistent:insensitive,
 .check row:selected:inconsistent:insensitive,
 .check row:selected:focus:inconsistent:insensitive {
-	background-image: url("img/checkbox-mixed-insensitive.png");
+	-gtk-icon-source: url("img/checkbox-mixed-insensitive.png");
 }
 
 .radio,
 .radio row:selected,
 .radio row:selected:focus {
-	background-image: url("img/radio-unchecked.png");
+	-gtk-icon-source: url("img/radio-unchecked.png");
 }
 
 .radio:hover,
 .radio row:selected:hover,
 .radio row:selected:focus:hover {
-	background-image: url("img/radio-unchecked-hover.png");
+	-gtk-icon-source: url("img/radio-unchecked-hover.png");
 }
 
 .radio:insensitive,
 .radio row:selected:insensitive,
 .radio row:selected:focus:insensitive {
-	background-image: url("img/radio-unchecked-insensitive.png");
+	-gtk-icon-source: url("img/radio-unchecked-insensitive.png");
 }
 
+.radio:checked,
+.radio row:selected:checked,
+.radio row:selected:focus:checked,
 .radio:active,
 .radio row:selected:active,
 .radio row:selected:focus:active {
-	background-image: url("img/radio-checked.png");
+	-gtk-icon-source: url("img/radio-checked.png");
 }
 
+.radio:checked:hover,
+.radio row:selected:checked:hover,
+.radio row:selected:focus:checked:hover,
 .radio:active:hover,
 .radio row:selected:active:hover,
 .radio row:selected:focus:active:hover {
-	background-image: url("img/radio-checked-hover.png");
+	-gtk-icon-source: url("img/radio-checked-hover.png");
 }
 
+.radio:checked:insensitive,
+.radio row:selected:checked:insensitive,
+.radio row:selected:focus:checked:insensitive,
 .radio:active:insensitive,
 .radio row:selected:active:insensitive,
 .radio row:selected:focus:active:insensitive {
-	background-image: url("img/radio-checked-insensitive.png");
+	-gtk-icon-source: url("img/radio-checked-insensitive.png");
 }
 
 .radio:inconsistent,
 .radio row:selected:inconsistent,
 .radio row:selected:focus:inconsistent {
-	background-image: url("img/radio-mixed.png");
+	-gtk-icon-source: url("img/radio-mixed.png");
 }
 
 .radio:inconsistent:hover,
 .radio row:selected:inconsistent:hover,
 .radio row:selected:focus:inconsistent:hover {
-	background-image: url("img/radio-mixed-hover.png");
+	-gtk-icon-source: url("img/radio-mixed-hover.png");
 }
 
 .radio:inconsistent:insensitive,
 .radio row:selected:inconsistent:insensitive,
 .radio row:selected:focus:inconsistent:insensitive {
-	background-image: url("img/radio-mixed-insensitive.png");
+	-gtk-icon-source: url("img/radio-mixed-insensitive.png");
 }
 
 /*********************
@@ -283,81 +301,72 @@ GtkScale.scale-has-marks-below.slider.vertical:insensitive {
  *********/
 
 .menu .menuitem.check {
-	background-image: url("img/menuitem-checkbox.png");
-	background-repeat: no-repeat;
+	-gtk-icon-source: url("img/menuitem-checkbox.png");
 }
 
 .menu .menuitem.check:hover {
-	background-image: url("img/menuitem-checkbox-hover.png");
-	background-repeat: no-repeat;
+	-gtk-icon-source: url("img/menuitem-checkbox-hover.png");
 }
 
 .menu .menuitem.check:insensitive {
-	background-image: url("img/menuitem-checkbox-insensitive.png");
-	background-repeat: no-repeat;
+	-gtk-icon-source: url("img/menuitem-checkbox-insensitive.png");
 }
 
+.menu .menuitem.check:checked,
 .menu .menuitem.check:active {
-	background-image: url("img/menuitem-checkbox-checked.png");
-	background-repeat: no-repeat;
+	-gtk-icon-source: url("img/menuitem-checkbox-checked.png");
 }
 
+.menu .menuitem.check:checked:hover,
 .menu .menuitem.check:active:hover {
-	background-image: url("img/menuitem-checkbox-checked-hover.png");
-	background-repeat: no-repeat;
+	-gtk-icon-source: url("img/menuitem-checkbox-checked-hover.png");
 }
 
+.menu .menuitem.check:checked:insensitive,
 .menu .menuitem.check:active:insensitive {
-	background-image: url("img/menuitem-checkbox-checked-insensitive.png");
-	background-repeat: no-repeat;
+	-gtk-icon-source: url("img/menuitem-checkbox-checked-insensitive.png");
 }
 
 .menu .menuitem.check:inconsistent,
 .menu .menuitem.radio:inconsistent {
-	background-image: url("img/menuitem-checkbox-mixed.png");
-	background-repeat: no-repeat;
+	-gtk-icon-source: url("img/menuitem-checkbox-mixed.png");
 }
 
 .menu .menuitem.check:inconsistent:hover,
 .menu .menuitem.radio:inconsistent:hover {
-	background-image: url("img/menuitem-checkbox-mixed-hover.png");
-	background-repeat: no-repeat;
+	-gtk-icon-source: url("img/menuitem-checkbox-mixed-hover.png");
 }
 
 .menu .menuitem.check:inconsistent:insensitive,
 .menu .menuitem.radio:inconsistent:insensitive {
-	background-image: url("img/menuitem-checkbox-mixed-insensitive.png");
-	background-repeat: no-repeat;
+	-gtk-icon-source: url("img/menuitem-checkbox-mixed-insensitive.png");
 }
 
 .menu .menuitem.radio {
-	background-image: url("img/menuitem-radio.png");
-	background-repeat: no-repeat;
+	-gtk-icon-source: url("img/menuitem-radio.png");
 }
 
 .menu .menuitem.radio:hover {
-	background-image: url("img/menuitem-radio-hover.png");
-	background-repeat: no-repeat;
+	-gtk-icon-source: url("img/menuitem-radio-hover.png");
 }
 
 .menu .menuitem.radio:insensitive {
-	background-image: url("img/menuitem-radio-insensitive.png");
-	background-repeat: no-repeat;
+	-gtk-icon-source: url("img/menuitem-radio-insensitive.png");
 }
 
+.menu .menuitem.radio:checked,
 .menu .menuitem.radio:active {
-	background-image: url("img/menuitem-radio-checked.png");
-	background-repeat: no-repeat;
+	-gtk-icon-source: url("img/menuitem-radio-checked.png");
 }
 
+.menu .menuitem.radio:checked:hover,
 .menu .menuitem.radio:active:hover {
-	background-image: url("img/menuitem-radio-checked-hover.png");
-	background-repeat: no-repeat;
+	-gtk-icon-source: url("img/menuitem-radio-checked-hover.png");
 }
 
+.menu .menuitem.radio:checked:insensitive,
 .menu .menuitem.radio:active:insensitive {
-	background-image: url("img/menuitem-radio-checked-insensitive.png");
-	background-repeat: no-repeat;
+	-gtk-icon-source: url("img/menuitem-radio-checked-insensitive.png");
 }
 
 /*********
@@ -378,22 +387,26 @@ GtkScale.scale-has-marks-below.slider.vertical:insensitive {
 
 /* generic element borders */
 .entry,
-GtkComboBox.combobox-entry .entry,
-GtkComboBox.combobox-entry .button,
+.combobox-entry .entry,
+.combobox-entry .button,
 .button:active,
 .trough,
 .trough.highlight,
 GtkSwitch.trough,
 /* generic button borders */
 .button,
+.button.flat:active,
+.button.flat:hover,
+.menu-button:active,
 .titlebar .titlebutton:hover,
+.primary-toolbar .button:checked,
 .primary-toolbar .button.raised,
 .primary-toolbar .raised .button,
 .primary-toolbar GtkComboBox .button,
 /* primary toolbar - generic element borders */
 .primary-toolbar .entry,
-.primary-toolbar GtkComboBox.combobox-entry .entry,
-.primary-toolbar GtkComboBox.combobox-entry .button,
+.primary-toolbar .combobox-entry .entry,
+.primary-toolbar .combobox-entry .button,
 .primary-toolbar .button:active,
 .primary-toolbar .button.raised:active,
 .primary-toolbar .raised .button:active,
@@ -413,40 +426,15 @@ GtkSwitch.trough,
 }
 
 .primary-toolbar .entry,
-.primary-toolbar GtkComboBox.combobox-entry .entry {
+.primary-toolbar .combobox-entry .entry {
 	border-width: 1px 2px 2px;
 }
 
 .primary-toolbar .entry:focus,
-.primary-toolbar GtkComboBox.combobox-entry .entry:focus {
+.primary-toolbar .combobox-entry .entry:focus {
 	border-width: 1px 2px 2px;
 }
 
-/* linked buttons */
-/* Middle button */
-.linked .entry,
-.linked .button,
-.linked .button:active,
-.linked .button:active:hover,
-.linked .button:focus,
-.linked .button:focus:active,
-.linked .button:insensitive,
-/* Leftmost button */
-.linked .entry: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,
-/* Rightmost button */
-.linked .entry: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 single button */
 .linked .entry:only-child,
 .linked .button:only-child,
@@ -571,8 +559,8 @@ GtkSwitch.trough,
 
 /* generic insensitive element borders */
 GtkSwitch.trough:insensitive,
-GtkComboBox.combobox-entry .entry:insensitive,
-GtkComboBox.combobox-entry .button:insensitive,
+.combobox-entry .entry:insensitive,
+.combobox-entry .button:insensitive,
 .entry:insensitive,
 .button:insensitive,
 .trough row {
@@ -583,19 +571,27 @@ GtkComboBox.combobox-entry .button:insensitive,
 	border-color: transparent;
 }
 
+.menuitem.button.flat,
+.menuitem.button.flat:active,
+.button.flat,
+.button.flat:insensitive {
+    border-image: none;
+    background-image: none;
+}
+
 /* focused element borders */
 .entry:focus,
-GtkComboBox.combobox-entry .entry:focus,
+.combobox-entry .entry:focus,
+.button.flat:focus:active,
 .button:focus:active,
 .button.default:active,
 /* focused button borders */
-.button:focus,
+.button.flat:focus,
 .button.default,
 .primary-toolbar .entry:focus,
 .primary-toolbar .button:active:focus,
-.primary-toolbar .button:focus:hover,
-.primary-toolbar GtkComboBox.combobox-entry .entry:focus,
-.primary-toolbar GtkComboBox.combobox-entry .button:focus,
+.primary-toolbar .combobox-entry .entry:focus,
+.primary-toolbar .combobox-entry .button:focus,
 .primary-toolbar .button.raised:focus:active,
 .primary-toolbar .raised .button:focus:active,
 .primary-toolbar .button.raised.default:active,
@@ -613,15 +609,6 @@ GtkComboBox.combobox-entry .entry:focus,
 	border-color: transparent;
 }
 
-/* focused primary toolbar button borders */
-.primary-toolbar .button:focus {
-	border-image: url("img/border-focused-ptb.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
-	border-radius: 3px;
-	border-width: 1px 1px 2px 1px;
-	border-style: solid;
-	border-color: transparent;
-}
-
 /* focused switch trough borders */
 GtkSwitch.trough:active {
 	border-image: url("img/border-focused-switch.svg") 3 3 4 3 / 3px 3px 4px 3px stretch;
@@ -664,3 +651,61 @@ column-header:last-child .button:active:focus {
 	border-right: none;
 }
 
+/* Leftmost button */
+.linked .entry:first-child,
+.linked > GtkComboBox:first-child > .button:last-child,
+.linked > GtkComboBox:first-child > .button:active:last-child,
+.linked > GtkComboBox:first-child > .button:active:hover:last-child,
+.linked > GtkComboBox:first-child > .button:focus:last-child,
+.linked > GtkComboBox:first-child > .button:focus:active:last-child,
+.linked > GtkComboBox:first-child > .button:insensitive:last-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 {
+    border-image: none;
+    border-radius: 3px 0 0 3px;
+    border-color: @border_color;
+    border-width: 1px;
+    padding: 1px 2px;
+}
+
+/* Middle button */
+.linked .entry,
+.linked > GtkComboBox > .button:last-child,
+.linked > GtkComboBox > .button:active:last-child,
+.linked > GtkComboBox > .button:active:hover:last-child,
+.linked > GtkComboBox > .button:focus:last-child,
+.linked > GtkComboBox > .button:focus:active:last-child,
+.linked > GtkComboBox > .button:insensitive:last-child,
+.linked .button,
+.linked .button:active,
+.linked .button:active:hover,
+.linked .button:focus,
+.linked .button:focus:active,
+.linked .button:insensitive {
+    border-image: none;
+	border-radius: 0;
+    border-color: @border_color;
+    border-width: 1px 0;
+    padding: 1px 2px;
+}
+
+/* Rightmost button */
+.linked .entry:last-child,
+.linked > GtkComboBox:last-child > .button,
+.linked > GtkComboBox:last-child > .button: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 {
+    border-image: none;
+	border-radius: 0 3px 3px 0;
+    border-color: @border_color;
+    border-width: 1px;
+    padding: 1px 2px;
+}
diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css
index eb8cd38..73fd0ab 100644
--- a/gtk-3.0/gtk-widgets.css
+++ b/gtk-3.0/gtk-widgets.css
@@ -11,7 +11,7 @@
 	-GtkPaned-handle-size: 5;
 
 	-GtkCheckButton-indicator-size: 16;
-	-GtkCheckMenuItem-indicator-size: 12;
+	-GtkCheckMenuItem-indicator-size: 10;
 
 	-GtkScrolledWindow-scrollbar-spacing: 3;
 	-GtkScrolledWindow-scrollbars-within-bevel: 0;
@@ -43,7 +43,8 @@ GtkWindow {
 	color: @theme_fg_color;
 }
 
-* {
+.background {
+	color: @theme_fg_color;
 	background-color: @theme_bg_color;
 }
 
@@ -92,8 +93,23 @@ GtkGrid:insensitive {
  * Miscellaneous *
  *****************/
 
+@keyframes spin {
+	to {
+	    -gtk-icon-transform: rotate(1turn);
+	}
+}
+.spinner {
+	background-image: none;
+	background-color: blue;
+	opacity: 0;
+	-gtk-icon-source: -gtk-icontheme("process-working-symbolic");
+}
 .spinner:active {
-	transition: 750ms linear loop;
+	opacity: 1;
+	animation: spin 1s linear infinite;
+}
+.spinner:active:insensitive {
+	opacity: 0.5;
 }
 
 .floating-bar {
@@ -444,7 +460,7 @@ GtkScrolledWindow GtkViewport.frame {
 
 .button,
 .button.menuitem.menubar,
-GtkComboBox.combobox-entry .button {
+.combobox-entry .button {
 	padding: 1px 4px;
 }
 
@@ -480,7 +496,9 @@ GtkMenuToolButton *,
 
 .primary-toolbar .button *:active,
 .inline-toolbar .button *:active,
-.button *:active {
+.button *:active,
+.button *:active:focus,
+.button *:focus {
 	color: @button_active_text_color;
 }
 
@@ -543,8 +561,8 @@ GtkMenuToolButton *,
 .toolbar .raised .button:focus,
 .toolbar GtkComboBox .button,
 .toolbar GtkComboBox .button:focus,
-GtkComboBox.combobox-entry .button,
-.primary-toolbar GtkComboBox.combobox-entry .button,
+.combobox-entry .button,
+.primary-toolbar .combobox-entry .button,
 .titlebar .titlebutton:hover,
 GtkColorChooserWidget #add-color-button {
 	background-image: -gtk-gradient (linear,
@@ -558,8 +576,11 @@ GtkColorChooserWidget #add-color-button {
 }
 
 /* Pushed button background */
+.button:checked,
+.button:checked:hover,
 .button:active,
 .button:active:hover,
+.menuitem.button:hover,
 .spinbutton .button:active,
 .spinbutton .button:active:hover,
 .toolbar .button:active,
@@ -568,8 +589,8 @@ GtkColorChooserWidget #add-color-button {
 .toolbar .raised .button:active,
 .toolbar .button.raised:active:hover,
 .toolbar .raised .button:active:hover,
-.primary-toolbar GtkComboBox.combobox-entry .button:active,
-GtkComboBox.combobox-entry .button:active,
+.primary-toolbar .combobox-entry .button:active,
+.combobox-entry .button:active,
 .primary-toolbar .button:active,
 .primary-toolbar .button:active:hover,
 .primary-toolbar .button:focus:active,
@@ -610,8 +631,8 @@ GtkComboBox.combobox-entry .button:active,
 .toolbar .raised .button:hover,
 .toolbar GtkComboBox .button:hover,
 .primary-toolbar .button:hover,
-GtkComboBox.combobox-entry .button:hover,
-.primary-toolbar GtkComboBox.combobox-entry .button:hover,
+.combobox-entry .button:hover,
+.primary-toolbar .combobox-entry .button:hover,
 GtkColorChooserWidget #add-color-button:hover {
 	background-color: transparent;
 	background-image: linear-gradient(to bottom,
@@ -623,7 +644,7 @@ GtkColorChooserWidget #add-color-button:hover {
 /* Insensitive button background */
 .button:insensitive,
 .toolbar GtkComboBox .button:insensitive,
-GtkComboBox.combobox-entry .button:insensitive {
+.combobox-entry .button:insensitive {
 	background-image: linear-gradient(to bottom,
 	                  @button_insensitive_inner_border_color 1px,
 	                  @button_insensitive_gradient_a 2px,
@@ -647,24 +668,6 @@ GtkComboBox.combobox-entry .button:insensitive {
 	background-color: transparent;
 }
 
-/* Focused primary toolbar button background */
-.primary-toolbar .button:focus {
-	background-image: linear-gradient(to bottom,
-	                  @pt_button_focus_gradient_a,
-	                  @pt_button_focus_gradient_b 50%,
-	                  @pt_button_focus_gradient_c 50%,
-	                  @pt_button_focus_gradient_d);
-}
-
-/* Focused + prelit primary toolbar button background */
-.primary-toolbar .button:focus:hover {
-	background-image: linear-gradient(to bottom,
-	                  @pt_button_focus_hover_gradient_a,
-	                  @pt_button_focus_hover_gradient_b 50%,
-	                  @pt_button_focus_hover_gradient_c 50%,
-	                  @pt_button_focus_hover_gradient_d);
-}
-
 /*****************
  * Notebooks and *
  * tabs          *
@@ -672,9 +675,6 @@ GtkComboBox.combobox-entry .button:insensitive {
 
 .notebook {
 	padding: 0;
-	border-color: @border_color;
-	border-style: solid;
-	border-width: 1px;
 	background-clip: border-box;
 	background-color: @notebook_bg_color;
 	-GtkNotebook-tab-overlap: 2;
@@ -682,13 +682,18 @@ GtkComboBox.combobox-entry .button:insensitive {
 	-GtkNotebook-initial-gap: 0;
 }
 
+.notebook.header.frame {
+	border-width: 0;
+}
+
 .notebook GtkViewport {
-	background-color: @theme_base_color;
+	background-color: @theme_bg_color;
 }
 
 .notebook tab {
 	padding: 3px;
 	border-radius: 3px;
+	border-color: @border_color;
 	border-style: solid;
 	border-width: 1px;
 	background-color: transparent;
@@ -841,40 +846,40 @@ GtkComboBox .separator {
 	-GtkWidget-vertical-separator: 0;
 }
 
-GtkComboBox.combobox-entry .entry:first-child,
-GtkComboBox.combobox-entry .button:first-child {
+.combobox-entry .entry:first-child,
+.combobox-entry .button:first-child {
 	border-image-width: 3px 0 4px 3px;
 	border-radius: 3px 0 0 3px;
 	border-right-width: 0;
 }
 
-GtkComboBox.combobox-entry .entry:last-child,
-GtkComboBox.combobox-entry .button:last-child {
+.combobox-entry .entry:last-child,
+.combobox-entry .button:last-child {
 	border-image-width: 3px 3px 4px 0;
 	border-radius: 0 3px 3px 0;
 	border-left-width: 0;
 }
 
-GtkComboBox.combobox-entry .button:last-child {
+.combobox-entry .button:last-child {
 	border-image-width: 3px 3px 4px 2px;
 }
 
-.primary-toolbar GtkComboBox.combobox-entry .entry:first-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:first-child {
+.primary-toolbar .combobox-entry .entry:first-child,
+.primary-toolbar .combobox-entry .button:first-child {
 	border-image-width: 4px 0 4px 4px;
 	border-radius: 3px 0 0 3px;
 	border-right-width: 0;
 }
 
-.primary-toolbar GtkComboBox.combobox-entry .entry:last-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:last-child {
+.primary-toolbar .combobox-entry .entry:last-child,
+.primary-toolbar .combobox-entry .button:last-child {
 	border-image-width: 4px 4px 4px 0;
 	border-radius: 0 3px 3px 0;
 	border-left-width: 0;
 }
 
-GtkComboBox.combobox-entry .button *:active,
-GtkComboBox.combobox-entry .button *:active:hover {
+.combobox-entry .button *:active,
+.combobox-entry .button *:active:hover {
 	color: @theme_text_color;
 }
 
@@ -1023,22 +1028,6 @@ GtkComboBox .button *:hover {
 	color: @scrollbar_button_insensitive_color;
 }
 
-.scrollbar.button.top:insensitive {
-	border-bottom: none;
-}
-
-.scrollbar.button.bottom:insensitive {
-	border-top: none;
-}
-
-.scrollbar.button.left:insensitive {
-	border-right: none;
-}
-
-.scrollbar.button.right:insensitive {
-	border-left: none;
-}
-
 .scrollbar.slider {
 	background-color: @scrollbar_slider_bg_color;
 	background-image: none;
@@ -1167,6 +1156,7 @@ GtkTreeMenu .menuitem:hover,
 }
 
 GtkTreeMenu .menuitem *:hover,
+GtkComboBox .menuitem:hover *,
 .menu .menuitem:active,
 .menu .menuitem *:active,
 .menu .menuitem:hover,
@@ -1796,10 +1786,13 @@ GtkInfoBar:last-child,
 	font: Bold;
 }
 
+.titlebar :first-child {
+	padding: 5px 5px 6px 5px;
+}
+
 .titlebar .titlebutton {
 	background: none;
 	border-image: none;
-	padding: 5px 5px 6px 5px;
 }
 
 .window-frame {
@@ -1817,6 +1810,7 @@ GtkPopover {
 	border: 1px solid;
 	border-radius: 7px;
 	border-color: @border_color;
+	background-color: @theme_bg_color;
 	background-clip: border-box;
 }
 
diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css
index c916fc5..0694bde 100644
--- a/gtk-3.0/gtk.css
+++ b/gtk-3.0/gtk.css
@@ -1,8 +1,48 @@
-/******************
- * imports 1 of 2 *
- ******************/
+/***********************************************************************
+ * This section can be modified to create color variants of the theme. *
+ ***********************************************************************/
 
-@import url("gtk-variant.css");
+/****************
+ * color scheme *
+ ****************/
+
+@define-color theme_base_color #ffffff;
+
+@define-color theme_bg_color #edeceb;
+@define-color theme_fg_color #000000;
+
+@define-color theme_selected_bg_color #86abd9;
+@define-color theme_selected_fg_color #ffffff;
+
+@define-color theme_tooltip_bg_color #f5f5b5;
+@define-color theme_tooltip_fg_color #000000;
+
+@define-color theme_text_color #1a1a1a;
+
+@define-color link_color #0000ee;
+@define-color visited_link_color #551a8b;
+
+/*****************
+ * error/warning *
+ *****************/
+
+@define-color error_color #cc0000;
+
+@define-color warning_bg_color #faad3d;
+
+/***************
+ * core colors *
+ ***************/
+
+/* Core colors are only used in the current file, as bases for other
+   color declarations. */
+
+@define-color core_color_a #a4c2e8; /* Core color for blue widgets in Clearlooks-Phenix. */
+@define-color core_color_b #edeceb; /* Core color for gray widgets in Clearlooks-Phenix. */
+
+/********************************************
+ * End of configuration for color variants. *
+ ********************************************/
 
 /***********
  * general *
@@ -66,20 +106,6 @@
 @define-color button_active_insensitive_gradient_e shade(@core_color_b, 0.99);
 @define-color button_active_insensitive_gradient_f shade(@core_color_b, 0.96);
 
-/* primary toolbar focus */
-
-@define-color pt_button_focus_gradient_a mix(#fafafa, shade(@core_color_a, 1.09), 0.3);
-@define-color pt_button_focus_gradient_b mix(#ededed, shade(@core_color_a, 1.05), 0.3);
-@define-color pt_button_focus_gradient_c mix(#e8e8e8, shade(@core_color_a, 1.01), 0.25);
-@define-color pt_button_focus_gradient_d mix(#e8e8e8, shade(@core_color_a, 0.96), 0.3);
-
-/* primary toolbar focus hover */
-
-@define-color pt_button_focus_hover_gradient_a mix(#fcfcfc, shade(@core_color_a, 1.09), 0.15);
-@define-color pt_button_focus_hover_gradient_b mix(#fcfcfc, shade(@core_color_a, 1.05), 0.15);
-@define-color pt_button_focus_hover_gradient_c mix(#fcfcfc, shade(@core_color_a, 1.01), 0.2);
-@define-color pt_button_focus_hover_gradient_d mix(#e8e8e8, shade(@core_color_a, 0.96), 0.2);
-
 /*****************
  * color chooser *
  *****************/
@@ -387,11 +413,10 @@
 @define-color trough_gradient_a shade(@core_color_b, 0.81);
 @define-color trough_gradient_b shade(@core_color_b, 0.90);
 
-/******************
- * imports 2 of 2 *
- ******************/
+/***********
+ * imports *
+ ***********/
 
 @import url("gtk-widgets-img.css");
 @import url("gtk-widgets.css");
 @import url("applications.css");
-
diff --git a/gtk-3.0/img/border-focused-ptb.svg b/gtk-3.0/img/border-focused-ptb.svg
deleted file mode 100644
index b360734..0000000
--- a/gtk-3.0/img/border-focused-ptb.svg
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16px"
-   height="16px"
-   id="svg33222"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="border-focused-2.svg">
-  <defs
-     id="defs33224">
-    <linearGradient
-       id="linearGradient3837">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3839" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3841" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#8e8e8e"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="44.5625"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1280"
-     inkscape:window-height="949"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true"
-     inkscape:showpageshadow="false"
-     showborder="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2992"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata33227">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <rect
-       ry="2.5"
-       rx="2.5000005"
-       y="0.5"
-       x="0.5"
-       height="13.999999"
-       width="15"
-       id="rect17861"
-       style="color:#000000;fill:none;stroke:#869bb7;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       ry="1.5"
-       rx="1.5"
-       y="1.5"
-       x="1.5"
-       height="12"
-       width="13.000001"
-       id="rect17861-6"
-       style="color:#000000;fill:none;stroke:#cccccc;stroke-width:0.99999994000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.25" />
-  </g>
-</svg>
diff --git a/gtk-3.0/img/menuitem-checkbox-hover.png b/gtk-3.0/img/menuitem-checkbox-hover.png
index c41492f..4d8125b 100644
--- a/gtk-3.0/img/menuitem-checkbox-hover.png
+++ b/gtk-3.0/img/menuitem-checkbox-hover.png
diff --git a/gtk-3.0/img/menuitem-checkbox-insensitive.png b/gtk-3.0/img/menuitem-checkbox-insensitive.png
index 2f38796..7129b2d 100644
--- a/gtk-3.0/img/menuitem-checkbox-insensitive.png
+++ b/gtk-3.0/img/menuitem-checkbox-insensitive.png
diff --git a/gtk-3.0/img/menuitem-checkbox-mixed-insensitive.png b/gtk-3.0/img/menuitem-checkbox-mixed-insensitive.png
index 882b675..ec51e4e 100644
--- a/gtk-3.0/img/menuitem-checkbox-mixed-insensitive.png
+++ b/gtk-3.0/img/menuitem-checkbox-mixed-insensitive.png
diff --git a/gtk-3.0/img/menuitem-checkbox-mixed.png b/gtk-3.0/img/menuitem-checkbox-mixed.png
index 15b0520..a7b45a4 100644
--- a/gtk-3.0/img/menuitem-checkbox-mixed.png
+++ b/gtk-3.0/img/menuitem-checkbox-mixed.png
diff --git a/gtk-3.0/img/menuitem-checkbox.png b/gtk-3.0/img/menuitem-checkbox.png
index 69e491b..f7acdd5 100644
--- a/gtk-3.0/img/menuitem-checkbox.png
+++ b/gtk-3.0/img/menuitem-checkbox.png
diff --git a/gtk-3.0/img/menuitem-radio-checked-hover.png b/gtk-3.0/img/menuitem-radio-checked-hover.png
index 2b793e7..59b61ee 100644
--- a/gtk-3.0/img/menuitem-radio-checked-hover.png
+++ b/gtk-3.0/img/menuitem-radio-checked-hover.png
diff --git a/gtk-3.0/img/menuitem-radio-insensitive.png b/gtk-3.0/img/menuitem-radio-insensitive.png
index d94dfd5..0615692 100644
--- a/gtk-3.0/img/menuitem-radio-insensitive.png
+++ b/gtk-3.0/img/menuitem-radio-insensitive.png
diff --git a/gtk-3.0/img/menuitem-radio.png b/gtk-3.0/img/menuitem-radio.png
index aba5c76..1f588e9 100644
--- a/gtk-3.0/img/menuitem-radio.png
+++ b/gtk-3.0/img/menuitem-radio.png