diff --git a/kwin/kwin4_effect_energize_a/config.ui b/kwin/kwin4_effect_energize_a/config.ui
index 56ad8db..f5a89ed 100755
--- a/kwin/kwin4_effect_energize_a/config.ui
+++ b/kwin/kwin4_effect_energize_a/config.ui
@@ -35,12 +35,9 @@
     </widget>
    </item>
    <item row="1" column="1">
-    <widget class="KColorCombo" name="kcfg_Color">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
+    <widget class="KColorButton" name="kcfg_Color">
+     <property name="alphaChannelEnabled">
+      <bool>true</bool>
      </property>
     </widget>
    </item>
@@ -87,9 +84,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>KColorCombo</class>
-   <extends>QComboBox</extends>
-   <header>kcolorcombo.h</header>
+   <class>KColorButton</class>
+   <extends>QPushButton</extends>
+   <header>kcolorbutton.h</header>
   </customwidget>
  </customwidgets>
  <resources />
diff --git a/kwin/kwin4_effect_energize_b/config.ui b/kwin/kwin4_effect_energize_b/config.ui
index 56ad8db..f5a89ed 100755
--- a/kwin/kwin4_effect_energize_b/config.ui
+++ b/kwin/kwin4_effect_energize_b/config.ui
@@ -35,12 +35,9 @@
     </widget>
    </item>
    <item row="1" column="1">
-    <widget class="KColorCombo" name="kcfg_Color">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
+    <widget class="KColorButton" name="kcfg_Color">
+     <property name="alphaChannelEnabled">
+      <bool>true</bool>
      </property>
     </widget>
    </item>
@@ -87,9 +84,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>KColorCombo</class>
-   <extends>QComboBox</extends>
-   <header>kcolorcombo.h</header>
+   <class>KColorButton</class>
+   <extends>QPushButton</extends>
+   <header>kcolorbutton.h</header>
   </customwidget>
  </customwidgets>
  <resources />
diff --git a/kwin/kwin4_effect_hexagon/config.ui b/kwin/kwin4_effect_hexagon/config.ui
index 56ad8db..3fa647c 100755
--- a/kwin/kwin4_effect_hexagon/config.ui
+++ b/kwin/kwin4_effect_hexagon/config.ui
@@ -11,53 +11,27 @@
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>Duration:</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
    <item row="1" column="0">
     <widget class="QLabel" name="label_2">
      <property name="text">
-      <string>Color:</string>
+      <string>Line Color:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
-     <property name="buddy">
-      <cstring>kcfg_Color</cstring>
+    </widget>
+   </item>
+   <item row="4" column="1">
+    <widget class="QDoubleSpinBox" name="kcfg_LineWidth">
+     <property name="minimum">
+      <double>1.000000000000000</double>
+     </property>
+     <property name="maximum">
+      <double>5.000000000000000</double>
      </property>
     </widget>
    </item>
-   <item row="1" column="1">
-    <widget class="KColorCombo" name="kcfg_Color">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="label_3">
-     <property name="text">
-      <string>Scale:</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-     <property name="buddy">
-      <cstring>kcfg_Color</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1">
+   <item row="3" column="1">
     <widget class="QDoubleSpinBox" name="kcfg_Scale">
      <property name="minimum">
       <double>0.100000000000000</double>
@@ -83,13 +57,74 @@
      </property>
     </widget>
    </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="label_4">
+     <property name="text">
+      <string>Glow Color:</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0">
+    <widget class="QLabel" name="label_5">
+     <property name="text">
+      <string>Line Width:</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Duration:</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>Scale:</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="1">
+    <widget class="QCheckBox" name="kcfg_AdditiveBlending">
+     <property name="text">
+      <string>Additive Blending</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="KColorButton" name="kcfg_GlowColor">
+     <property name="alphaChannelEnabled">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="KColorButton" name="kcfg_LineColor">
+     <property name="alphaChannelEnabled">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
-   <class>KColorCombo</class>
-   <extends>QComboBox</extends>
-   <header>kcolorcombo.h</header>
+   <class>KColorButton</class>
+   <extends>QPushButton</extends>
+   <header>kcolorbutton.h</header>
   </customwidget>
  </customwidgets>
  <resources />
diff --git a/kwin/kwin4_effect_hexagon/onSettingsChanged.js b/kwin/kwin4_effect_hexagon/onSettingsChanged.js
index f0740d7..b7a8b20 100644
--- a/kwin/kwin4_effect_hexagon/onSettingsChanged.js
+++ b/kwin/kwin4_effect_hexagon/onSettingsChanged.js
@@ -2,9 +2,8 @@
 // The code below is called whenever the user changes something in the configuration of
 // the effect.
 
-effect.setUniform(this.shader, 'uDuration', this.duration * 0.001);
 effect.setUniform(this.shader, 'uAdditiveBlending',
-                  effect.readConfig('AdditiveBlending', true));
+                  effect.readConfig('AdditiveBlending', true) ? 1.0 : 0.0);
 effect.setUniform(this.shader, 'uScale', effect.readConfig('Scale', 1.0));
 effect.setUniform(this.shader, 'uLineWidth', effect.readConfig('LineWidth', 1.0));
 effect.setUniform(this.shader, 'uGlowColor', effect.readConfig('GlowColor', 'white'));
diff --git a/kwin/kwin4_effect_tv/config.ui b/kwin/kwin4_effect_tv/config.ui
index 9bf4e82..573ef84 100755
--- a/kwin/kwin4_effect_tv/config.ui
+++ b/kwin/kwin4_effect_tv/config.ui
@@ -28,12 +28,9 @@
     </widget>
    </item>
    <item row="1" column="1">
-    <widget class="KColorCombo" name="kcfg_Color">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
+    <widget class="KColorButton" name="kcfg_Color">
+     <property name="alphaChannelEnabled">
+      <bool>true</bool>
      </property>
     </widget>
    </item>
@@ -64,9 +61,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>KColorCombo</class>
-   <extends>QComboBox</extends>
-   <header>kcolorcombo.h</header>
+   <class>KColorButton</class>
+   <extends>QPushButton</extends>
+   <header>kcolorbutton.h</header>
   </customwidget>
  </customwidgets>
  <resources />