From 4cc21af2287d2bd839d525020f619b547c9c4952 Mon Sep 17 00:00:00 2001
From: kojima <kojima>
Date: Wed, 14 Apr 1999 00:22:38 +0000
Subject: [PATCH] style file updates, gradiented clip arrows

---
 ChangeLog                             |  2 +
 WindowMaker/Defaults/WindowMaker.in   |  2 +-
 WindowMaker/Styles/Autumn.style       |  9 ++++-
 WindowMaker/Styles/Black.style        |  2 +
 WindowMaker/Styles/BlackTexture.style | 16 +++++---
 WindowMaker/Styles/Blue.style         | 34 +++++++++-------
 WindowMaker/Styles/BlueDawn.style     | 11 ++++++
 WindowMaker/Styles/BlueishGreen.style |  7 ++++
 WindowMaker/Styles/Brown.style        | 31 +++++++++------
 WindowMaker/Styles/Chumbo.style       | 31 +++++++++------
 WindowMaker/Styles/Copper.style       | 31 +++++++++------
 WindowMaker/Styles/DarkBlue.style     |  6 ++-
 WindowMaker/Styles/DarkRed.style      | 32 +++++++++------
 WindowMaker/Styles/Fire.style         |  8 ++++
 WindowMaker/Styles/Food.style         | 30 ++++++++------
 WindowMaker/Styles/Golden.style       |  4 ++
 WindowMaker/Styles/Green.style        |  4 ++
 WindowMaker/Styles/GreyBlue.style     | 32 +++++++++------
 WindowMaker/Styles/Gtk.style          | 33 ++++++++++------
 WindowMaker/Styles/LightBlue.style    | 30 ++++++++------
 WindowMaker/Styles/Pastel.style       | 30 ++++++++------
 WindowMaker/Styles/Purple.style       | 30 ++++++++------
 WindowMaker/Styles/Red.style          | 32 +++++++++------
 WindowMaker/Styles/RednBlue.style     |  8 ++++
 WindowMaker/Styles/Summer.style       |  9 ++++-
 WindowMaker/Styles/Traditional.style  | 41 ++++++++++----------
 WindowMaker/Styles/VioletBlue.style   | 11 +++++-
 src/defaults.c                        | 56 ++++++++++++++++++---------
 src/dock.c                            | 29 ++++++++++----
 src/framewin.c                        |  8 ++--
 src/icon.c                            |  5 ++-
 src/screen.h                          |  6 ++-
 src/superfluous.c                     | 34 ++++++++++++----
 src/wconfig.h.in                      |  6 ++-
 src/window.c                          |  5 ++-
 util/setstyle.c                       | 10 ++---
 36 files changed, 458 insertions(+), 217 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 496ad6d9..7f16f2d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,8 @@ Changes since version 0.52.0:
 - applied windoze cycle patch from  Paul Warren <pdw@ferret.lmh.ox.ac.uk>
 - changed initscript and exitscript execution from fork()/exec() to system()
 - added ResizebarBack and added appropriate backwards compat. hacks in setstyle
+- applied ]d's patch to allow DEMATERIALIZE_ICON over windows
+- made clip arrows gradiented
 
 Changes since version 0.51.2:
 .............................
diff --git a/WindowMaker/Defaults/WindowMaker.in b/WindowMaker/Defaults/WindowMaker.in
index b81c0985..a14b16a6 100644
--- a/WindowMaker/Defaults/WindowMaker.in
+++ b/WindowMaker/Defaults/WindowMaker.in
@@ -1,5 +1,5 @@
 {
-  WindozeCycling = YES;
+  WindozeCycling = NO;
   PopupSwitchMenu = NO;
   MenuStyle = normal;
   DisableMiniwindows = NO;
diff --git a/WindowMaker/Styles/Autumn.style b/WindowMaker/Styles/Autumn.style
index 1453b346..22789480 100644
--- a/WindowMaker/Styles/Autumn.style
+++ b/WindowMaker/Styles/Autumn.style
@@ -1,16 +1,23 @@
 {
+  TitleJustify = center;
   HighlightColor = white;
   HighlightTextColor = black;
-  TitleJustify = center;
+  ClipTitleColor = white;
+  CClipTitleColor = gray20;
   FTitleColor = white;
   PTitleColor = gray;
   UTitleColor = white;
   FTitleBack = (hgradient, darkred, black);
   PTitleBack = (hgradient, indianred, black);
   UTitleBack = (hgradient, peru, black);
+  ResizebarBack = (hgradient, peru, black);
   MenuTitleColor = white;
   MenuTextColor = white;
   MenuDisabledColor = gray80;
   MenuTitleBack = (hgradient, firebrick, black);
   MenuTextBack = (hgradient, peru, black);
+  IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
+  IconTitleColor = white;
+  IconTitleBack = "#8b0000";
+  MenuStyle = normal;
 }
diff --git a/WindowMaker/Styles/Black.style b/WindowMaker/Styles/Black.style
index 293bb5ad..11ba20e0 100644
--- a/WindowMaker/Styles/Black.style
+++ b/WindowMaker/Styles/Black.style
@@ -16,4 +16,6 @@
   MenuTitleBack = (hgradient, "rgb:30/32/3e", black);
   MenuTextBack = (hgradient, "rgb:50/5a/5e", "rgb:20/2a/2e");
   IconBack = (mdgradient, gray40, "rgb:50/5a/5e", "rgb:30/32/3e", "rgb:20/2a/2e");
+  IconTitleColor = white;
+  IconTitleBack = "#20202e";
 }
diff --git a/WindowMaker/Styles/BlackTexture.style b/WindowMaker/Styles/BlackTexture.style
index c829a3b2..0e5595b6 100644
--- a/WindowMaker/Styles/BlackTexture.style
+++ b/WindowMaker/Styles/BlackTexture.style
@@ -7,13 +7,17 @@
   FTitleColor = white;
   PTitleColor = white;
   UTitleColor = gray20;
-  FTitleBack = (thgradient, "BlueImage.jpeg", 140, "rgb:30/32/3e", black);
-  PTitleBack = (thgradient,"BlueImage.jpeg",140,"rgb:70/72/7e","rgb:45/47/4e");
-  UTitleBack = (thgradient,"BlueImage.jpeg", 100,white,"rgb:9e/94/80");
+  FTitleBack = (thgradient, BlueImage.jpeg, 140, "rgb:30/32/3e", black);
+  PTitleBack = (thgradient, BlueImage.jpeg, 140, "rgb:70/72/7e", "rgb:45/47/4e");
+  UTitleBack = (thgradient, BlueImage.jpeg, 100, white, "rgb:9e/94/80");
+  ResizebarBack = (thgradient, BlueImage.jpeg, 100, white, "rgb:9e/94/80");
   MenuTitleColor = white;
   MenuTextColor = white;
   MenuDisabledColor = gray60;
-  MenuTitleBack = (thgradient, "BlueImage.jpeg", 140, "rgb:30/32/3e", black);
-  MenuTextBack = (thgradient,"BlueImage.jpeg",140,"rgb:50/5a/5e","rgb:20/2a/2e");
-  IconBack = (tdgradient, "BlueImage.jpeg", 140, "rgb:30/32/3e", black);
+  MenuTitleBack = (thgradient, BlueImage.jpeg, 140, "rgb:30/32/3e", black);
+  MenuTextBack = (thgradient, BlueImage.jpeg, 140, "rgb:50/5a/5e", "rgb:20/2a/2e");
+  IconBack = (tdgradient, BlueImage.jpeg, 140, "rgb:30/32/3e", black);
+  IconTitleColor = white;
+  IconTitleBack = "#20202e";
+  MenuStyle = normal;
 }
diff --git a/WindowMaker/Styles/Blue.style b/WindowMaker/Styles/Blue.style
index d2305eca..43e37d9b 100644
--- a/WindowMaker/Styles/Blue.style
+++ b/WindowMaker/Styles/Blue.style
@@ -1,15 +1,23 @@
 {
-FTitleColor = "white";
-PTitleColor = "white";
-UTitleColor = "gray20";
-MenuTitleColor = "white";
-MenuDisabledColor = "gray40";
-MenuTextColor = "black";
-FTitleBack = (hgradient, "rgb:00/00/10", "rgb:20/20/70");
-UTitleBack = (hgradient, "rgb:90/90/90", "rgb:c0/c0/c0");
-PTitleBack = (hgradient, "rgb:50/50/50", "rgb:80/80/80");
-MenuTitleBack = (hgradient, "rgb:20/20/70", "rgb:00/00/20");
-MenuTextBack = (hgradient, "rgb:c0/c0/c0", "rgb:90/90/90");
-IconTitleBack = "#101040";
-IconTitleColor = white;
+  TitleJustify = center;
+  HighlightColor = white;
+  HighlightTextColor = black;
+  ClipTitleColor = white;
+  CClipTitleColor = gray20;
+  FTitleColor = white;
+  PTitleColor = white;
+  UTitleColor = gray20;
+  FTitleBack = (hgradient, "rgb:00/00/10", "rgb:20/20/70");
+  PTitleBack = (hgradient, "rgb:50/50/50", "rgb:80/80/80");
+  UTitleBack = (hgradient, "rgb:90/90/90", "rgb:c0/c0/c0");
+  ResizebarBack = (hgradient, "rgb:90/90/90", "rgb:c0/c0/c0");
+  MenuTitleColor = white;
+  MenuTextColor = black;
+  MenuDisabledColor = gray40;
+  MenuTitleBack = (hgradient, "rgb:20/20/70", "rgb:00/00/20");
+  MenuTextBack = (hgradient, "rgb:c0/c0/c0", "rgb:90/90/90");
+  IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
+  IconTitleColor = white;
+  IconTitleBack = "#101040";
+  MenuStyle = normal;
 }
diff --git a/WindowMaker/Styles/BlueDawn.style b/WindowMaker/Styles/BlueDawn.style
index f091f743..d77d07f8 100644
--- a/WindowMaker/Styles/BlueDawn.style
+++ b/WindowMaker/Styles/BlueDawn.style
@@ -24,6 +24,14 @@
     "rgb:28/3c/49",
     "rgb:28/45/50"
   );
+  ResizebarBack = (
+    mhgradient,
+    "rgb:18/2c/41",
+    "rgb:18/2c/41",
+    "rgb:08/18/38",
+    "rgb:28/3c/49",
+    "rgb:28/45/50"
+  );
   MenuTitleColor = white;
   MenuTextColor = black;
   MenuDisabledColor = gray;
@@ -42,4 +50,7 @@
     "rgb:96/d7/e7"
   );
   IconBack = (mdgradient, "rgb:18/34/54", "rgb:28/45/69", "rgb:08/24/20");
+  IconTitleColor = white;
+  IconTitleBack = "rgb:18/2c/70";
+  MenuStyle = normal;
 }
diff --git a/WindowMaker/Styles/BlueishGreen.style b/WindowMaker/Styles/BlueishGreen.style
index 2ea1ce4c..5f263f5b 100644
--- a/WindowMaker/Styles/BlueishGreen.style
+++ b/WindowMaker/Styles/BlueishGreen.style
@@ -2,15 +2,22 @@
   TitleJustify = center;
   HighlightColor = lightgoldenrod1;
   HighlightTextColor = black;
+  ClipTitleColor = "rgb:79/96/cf";
+  CClipTitleColor = "rgb:61/61/61";
   FTitleColor = white;
   PTitleColor = gray;
   UTitleColor = white;
   FTitleBack = (hgradient, darkturquoise, "rgb:00/41/42");
   PTitleBack = (hgradient, deepskyblue2, deepskyblue4);
   UTitleBack = (hgradient, deepskyblue4, black);
+  ResizebarBack = (hgradient, deepskyblue4, black);
   MenuTitleColor = white;
   MenuTextColor = black;
   MenuDisabledColor = gray30;
   MenuTitleBack = (hgradient, deepskyblue4, black);
   MenuTextBack = (hgradient, darkturquoise, "rgb:00/41/42");
+  IconBack = (mdgradient, "rgb:18/34/54", "rgb:28/45/69", "rgb:08/24/20");
+  IconTitleColor = white;
+  IconTitleBack = "#00888a";
+  MenuStyle = normal;
 }
diff --git a/WindowMaker/Styles/Brown.style b/WindowMaker/Styles/Brown.style
index 17df4dbf..e13a457c 100644
--- a/WindowMaker/Styles/Brown.style
+++ b/WindowMaker/Styles/Brown.style
@@ -1,16 +1,23 @@
 {
+  TitleJustify = center;
   HighlightColor = white;
   HighlightTextColor = black;
-
-FTitleColor = "white";
-PTitleColor = "gray";
-UTitleColor = "gray";
-MenuTitleColor = "white";
-MenuDisabledColor = "gray60";
-MenuTextColor = "white";
-FTitleBack = (vgradient, "rgb:ae/9e/a6", "rgb:61/51/59");
-UTitleBack = (vgradient, "rgb:51/61/76", "rgb:0a/0a/20");
-PTitleBack = (vgradient, "rgb:76/61/76", "rgb:20/0a/20");
-MenuTitleBack = (hgradient, "rgb:ae/9e/a6", "rgb:61/51/59");
-MenuTextBack = (hgradient, "rgb:49/71/86", "rgb:08/10/30");
+  ClipTitleColor = "rgb:79/96/cf";
+  CClipTitleColor = "rgb:61/61/61";
+  FTitleColor = white;
+  PTitleColor = gray;
+  UTitleColor = gray;
+  FTitleBack = (vgradient, "rgb:ae/9e/a6", "rgb:61/51/59");
+  PTitleBack = (vgradient, "rgb:76/61/76", "rgb:20/0a/20");
+  UTitleBack = (vgradient, "rgb:51/61/76", "rgb:0a/0a/20");
+  ResizebarBack = (solid, "#2d354b");
+  MenuTitleColor = white;
+  MenuTextColor = white;
+  MenuDisabledColor = gray60;
+  MenuTitleBack = (hgradient, "rgb:ae/9e/a6", "rgb:61/51/59");
+  MenuTextBack = (hgradient, "rgb:49/71/86", "rgb:08/10/30");
+  IconBack = (mdgradient, "rgb:18/34/54", "rgb:28/45/69", "rgb:08/24/20");
+  IconTitleColor = white;
+  IconTitleBack = "#88777f";
+  MenuStyle = normal;
 }
diff --git a/WindowMaker/Styles/Chumbo.style b/WindowMaker/Styles/Chumbo.style
index e18b79ea..8b4912d1 100644
--- a/WindowMaker/Styles/Chumbo.style
+++ b/WindowMaker/Styles/Chumbo.style
@@ -1,16 +1,23 @@
 {
+  TitleJustify = center;
   HighlightColor = white;
   HighlightTextColor = black;
-
-FTitleColor = "white";
-PTitleColor = "white";
-UTitleColor = "gray";
-MenuTitleColor = "white";
-MenuDisabledColor = "gray60";
-MenuTextColor = "white";
-FTitleBack = (hgradient, "rgb:79/a2/cf", "rgb:20/34/41");
-UTitleBack = (hgradient, "rgb:59/6d/8e", "rgb:00/00/00");
-PTitleBack = (hgradient, "rgb:70/82/af", "rgb:00/00/00");
-MenuTitleBack = (hgradient, "rgb:79/a2/cf", "rgb:20/34/41");
-MenuTextBack = (hgradient, "rgb:59/6d/8e", "rgb:00/00/00");
+  ClipTitleColor = "rgb:79/96/cf";
+  CClipTitleColor = "rgb:61/61/61";
+  FTitleColor = white;
+  PTitleColor = white;
+  UTitleColor = gray;
+  FTitleBack = (hgradient, "rgb:79/a2/cf", "rgb:20/34/41");
+  PTitleBack = (hgradient, "rgb:70/82/af", "rgb:00/00/00");
+  UTitleBack = (hgradient, "rgb:59/6d/8e", "rgb:00/00/00");
+  ResizebarBack = (hgradient, "rgb:59/6d/8e", "rgb:00/00/00");
+  MenuTitleColor = white;
+  MenuTextColor = white;
+  MenuDisabledColor = gray60;
+  MenuTitleBack = (hgradient, "rgb:79/a2/cf", "rgb:20/34/41");
+  MenuTextBack = (hgradient, "rgb:59/6d/8e", "rgb:00/00/00");
+  IconBack = (mdgradient, "rgb:18/34/54", "rgb:28/45/69", "rgb:08/24/20");
+  IconTitleColor = white;
+  IconTitleBack = "#4c6b88";
+  MenuStyle = normal;
 }
diff --git a/WindowMaker/Styles/Copper.style b/WindowMaker/Styles/Copper.style
index c1ac92f9..7298b49a 100644
--- a/WindowMaker/Styles/Copper.style
+++ b/WindowMaker/Styles/Copper.style
@@ -1,16 +1,23 @@
 {
+  TitleJustify = center;
   HighlightColor = white;
   HighlightTextColor = black;
-
-FTitleColor = "white";
-PTitleColor = "white";
-UTitleColor = "gray";
-MenuTitleColor = "white";
-MenuDisabledColor = "gray60";
-MenuTextColor = "white";
-FTitleBack = (dgradient, "rgb:90/69/8e", "rgb:18/00/00");
-UTitleBack = (dgradient, "rgb:59/6d/8e", "rgb:00/00/00");
-PTitleBack = (dgradient, "rgb:50/29/4e", "rgb:00/00/00");
-MenuTitleBack = (dgradient, "rgb:90/69/8e", "rgb:18/00/00");
-MenuTextBack = (dgradient, "rgb:38/10/10", "rgb:8e/59/7e");
+  ClipTitleColor = "rgb:79/96/cf";
+  CClipTitleColor = "rgb:61/61/61";
+  FTitleColor = white;
+  PTitleColor = white;
+  UTitleColor = gray;
+  FTitleBack = (dgradient, "rgb:90/69/8e", "rgb:18/00/00");
+  PTitleBack = (dgradient, "rgb:50/29/4e", "rgb:00/00/00");
+  UTitleBack = (dgradient, "rgb:59/6d/8e", "rgb:00/00/00");
+  ResizebarBack = (dgradient, "rgb:59/6d/8e", "rgb:00/00/00");
+  MenuTitleColor = white;
+  MenuTextColor = white;
+  MenuDisabledColor = gray60;
+  MenuTitleBack = (dgradient, "rgb:90/69/8e", "rgb:18/00/00");
+  MenuTextBack = (dgradient, "rgb:38/10/10", "rgb:8e/59/7e");
+  IconBack = (mdgradient, "rgb:18/34/54", "rgb:28/45/69", "rgb:08/24/20");
+  IconTitleColor = white;
+  IconTitleBack = "#543447";
+  MenuStyle = normal;
 }
diff --git a/WindowMaker/Styles/DarkBlue.style b/WindowMaker/Styles/DarkBlue.style
index 45fcea51..e5d82a69 100644
--- a/WindowMaker/Styles/DarkBlue.style
+++ b/WindowMaker/Styles/DarkBlue.style
@@ -9,11 +9,15 @@
   UTitleColor = gray60;
   FTitleBack = (hgradient, "rgb:18/38/59", black);
   PTitleBack = (hgradient, "rgb:18/38/59", black);
-  UTitleBack = (hgradient, "rgb:38/58/79", "rgb:30/40/50");
+  UTitleBack = (hgradient, "rgb:38/58/79", "rgb:26/36/46");
+  ResizebarBack = (hgradient, "rgb:38/58/79", "rgb:26/36/46");
   MenuTitleColor = white;
   MenuTextColor = white;
   MenuDisabledColor = "rgb:61/61/61";
   MenuTitleBack = (hgradient, "rgb:08/24/38", black);
   MenuTextBack = (hgradient, "rgb:18/38/59", "rgb:00/14/28");
   IconBack = (mdgradient, "rgb:61/51/59", "rgb:38/58/79", black, "rgb:18/38/59");
+  IconTitleColor = white;
+  IconTitleBack = "#0c1c2c";
+  MenuStyle = normal;
 }
diff --git a/WindowMaker/Styles/DarkRed.style b/WindowMaker/Styles/DarkRed.style
index 6bde6094..a391895f 100644
--- a/WindowMaker/Styles/DarkRed.style
+++ b/WindowMaker/Styles/DarkRed.style
@@ -1,13 +1,23 @@
 {
-FTitleColor = "white";
-PTitleColor = "white";
-UTitleColor = "gray20";
-MenuTitleColor = "white";
-MenuDisabledColor = "gray40";
-MenuTextColor = "black";
-FTitleBack = (dgradient, "rgb:21/00/05", "rgb:90/00/30");
-UTitleBack = (dgradient, "rgb:90/90/90", "rgb:c0/c0/c0");
-PTitleBack = (dgradient, "rgb:51/50/55", "rgb:80/80/80");
-MenuTitleBack = (dgradient, "rgb:90/00/30", "rgb:21/00/05");
-MenuTextBack = (dgradient, "rgb:b0/b0/b0", "rgb:60/60/60");
+  TitleJustify = center;
+  HighlightColor = white;
+  HighlightTextColor = black;
+  ClipTitleColor = white;
+  CClipTitleColor = gray40;
+  FTitleColor = white;
+  PTitleColor = white;
+  UTitleColor = gray20;
+  FTitleBack = (dgradient, "rgb:21/00/05", "rgb:90/00/30");
+  PTitleBack = (dgradient, "rgb:51/50/55", "rgb:80/80/80");
+  UTitleBack = (dgradient, "rgb:90/90/90", "rgb:c0/c0/c0");
+  ResizebarBack = (dgradient, "rgb:90/90/90", "rgb:c0/c0/c0");
+  MenuTitleColor = white;
+  MenuTextColor = black;
+  MenuDisabledColor = gray40;
+  MenuTitleBack = (dgradient, "rgb:90/00/30", "rgb:21/00/05");
+  MenuTextBack = (dgradient, "rgb:b0/b0/b0", "rgb:60/60/60");
+  IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
+  IconTitleColor = white;
+  IconTitleBack = white;
+  MenuStyle = normal;
 }
diff --git a/WindowMaker/Styles/Fire.style b/WindowMaker/Styles/Fire.style
index 4f00d78b..5f345803 100644
--- a/WindowMaker/Styles/Fire.style
+++ b/WindowMaker/Styles/Fire.style
@@ -1,6 +1,9 @@
 {
+  TitleJustify = center;
   HighlightColor = white;
   HighlightTextColor = black;
+  ClipTitleColor = white;
+  CClipTitleColor = gray20;
   FTitleColor = black;
   PTitleColor = white;
   UTitleColor = gray20;
@@ -27,6 +30,7 @@
   );
   PTitleBack = (hgradient, "rgb:50/50/50", "rgb:80/80/80");
   UTitleBack = (hgradient, "rgb:90/90/90", "rgb:d0/d0/d0");
+  ResizebarBack = (solid, "#b0b0b0");
   MenuTitleColor = black;
   MenuTextColor = black;
   MenuDisabledColor = gray40;
@@ -52,4 +56,8 @@
     white
   );
   MenuTextBack = (hgradient, "rgb:d0/d0/d0", "rgb:80/80/80");
+  IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
+  IconTitleColor = black;
+  IconTitleBack = white;
+  MenuStyle = normal;
 }
diff --git a/WindowMaker/Styles/Food.style b/WindowMaker/Styles/Food.style
index bbc54322..b30965ab 100644
--- a/WindowMaker/Styles/Food.style
+++ b/WindowMaker/Styles/Food.style
@@ -1,15 +1,23 @@
 {
+  TitleJustify = center;
   HighlightColor = white;
   HighlightTextColor = black;
-FTitleColor = "gray30";
-PTitleColor = "white";
-UTitleColor = "gray";
-MenuTitleColor = "gray30";
-MenuDisabledColor = "gray60";
-MenuTextColor = "white";
-FTitleBack = (hgradient, "orange2", "orange4");
-UTitleBack = (hgradient, "salmon2", "salmon4");
-PTitleBack = (hgradient, "lightsalmon2", "lightsalmon4");
-MenuTitleBack = (hgradient, "orange2", "orange4");
-MenuTextBack = (hgradient, "tomato2", "tomato4");
+  ClipTitleColor = white;
+  CClipTitleColor = gray20;
+  FTitleColor = gray30;
+  PTitleColor = white;
+  UTitleColor = gray;
+  FTitleBack = (hgradient, orange2, orange4);
+  PTitleBack = (hgradient, lightsalmon2, lightsalmon4);
+  UTitleBack = (hgradient, salmon2, salmon4);
+  ResizebarBack = (hgradient, salmon2, salmon4);
+  MenuTitleColor = gray30;
+  MenuTextColor = white;
+  MenuDisabledColor = gray60;
+  MenuTitleBack = (hgradient, orange2, orange4);
+  MenuTextBack = (hgradient, tomato2, tomato4);
+  IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
+  IconTitleColor = gray30;
+  IconTitleBack = "#bd7a00";
+  MenuStyle = normal;
 }
diff --git a/WindowMaker/Styles/Golden.style b/WindowMaker/Styles/Golden.style
index a731cbf5..1b0df673 100644
--- a/WindowMaker/Styles/Golden.style
+++ b/WindowMaker/Styles/Golden.style
@@ -16,10 +16,14 @@
   );
   PTitleBack = (dgradient, "rgb:64/42/20", "rgb:ca/a8/86");
   UTitleBack = (dgradient, "rgb:90/90/90", "rgb:b0/b0/b0");
+  ResizebarBack = (dgradient, "rgb:90/90/90", "rgb:b0/b0/b0");
   MenuTitleColor = white;
   MenuTextColor = black;
   MenuDisabledColor = gray40;
   MenuTitleBack = (dgradient, "rgb:ba/98/76", "rgb:54/32/10");
   MenuTextBack = (dgradient, "rgb:b0/b0/b0", "rgb:70/70/70");
   IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
+  IconTitleColor = white;
+  IconTitleBack = "rgb:ba/98/76";
+  MenuStyle = normal;
 }
diff --git a/WindowMaker/Styles/Green.style b/WindowMaker/Styles/Green.style
index 2bc804d6..9ce79b7f 100644
--- a/WindowMaker/Styles/Green.style
+++ b/WindowMaker/Styles/Green.style
@@ -10,10 +10,14 @@
   FTitleBack = (dgradient, "rgb:28/48/48", "rgb:08/20/20");
   PTitleBack = (hgradient, "rgb:50/50/50", "rgb:80/80/80");
   UTitleBack = (dgradient, "rgb:90/90/90", "rgb:b0/b0/b5");
+  ResizebarBack = (solid, "#a0a0a3");
   MenuTitleColor = white;
   MenuTextColor = black;
   MenuDisabledColor = gray40;
   MenuTitleBack = (hgradient, "rgb:28/48/48", "rgb:08/20/20");
   MenuTextBack = (dgradient, "rgb:b0/b0/b0", "rgb:70/70/70");
   IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
+  IconTitleColor = white;
+  IconTitleBack = "#183434";
+  MenuStyle = normal;
 }
diff --git a/WindowMaker/Styles/GreyBlue.style b/WindowMaker/Styles/GreyBlue.style
index 869a9259..1e5ef57d 100644
--- a/WindowMaker/Styles/GreyBlue.style
+++ b/WindowMaker/Styles/GreyBlue.style
@@ -1,13 +1,23 @@
 {
-FTitleColor = "white";
-PTitleColor = "white";
-UTitleColor = "gray20";
-MenuTitleColor = "white";
-MenuDisabledColor = "gray40";
-MenuTextColor = "black";
-MenuTitleBack = (dgradient, "rgb:00/00/10", "rgb:20/20/70");
-UTitleBack = (dgradient, "rgb:70/70/70", "rgb:b0/b0/b0");
-PTitleBack = (dgradient, "rgb:50/50/50", "rgb:80/80/80");
-FTitleBack = (dgradient, "rgb:20/20/70", "rgb:00/00/20");
-MenuTextBack = (dgradient, "rgb:70/70/70", "rgb:b0/b0/b0");
+  TitleJustify = center;
+  HighlightColor = white;
+  HighlightTextColor = black;
+  ClipTitleColor = white;
+  CClipTitleColor = gray20;
+  FTitleColor = white;
+  PTitleColor = white;
+  UTitleColor = gray20;
+  FTitleBack = (dgradient, "rgb:20/20/70", "rgb:00/00/20");
+  PTitleBack = (dgradient, "rgb:50/50/50", "rgb:80/80/80");
+  UTitleBack = (dgradient, "rgb:70/70/70", "rgb:b0/b0/b0");
+  ResizebarBack = (dgradient, "rgb:70/70/70", "rgb:b0/b0/b0");
+  MenuTitleColor = white;
+  MenuTextColor = black;
+  MenuDisabledColor = gray40;
+  MenuTitleBack = (dgradient, "rgb:00/00/10", "rgb:20/20/70");
+  MenuTextBack = (dgradient, "rgb:70/70/70", "rgb:b0/b0/b0");
+  IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
+  IconTitleColor = white;
+  IconTitleBack = "#101048";
+  MenuStyle = normal;
 }
diff --git a/WindowMaker/Styles/Gtk.style b/WindowMaker/Styles/Gtk.style
index a692d109..a198d859 100644
--- a/WindowMaker/Styles/Gtk.style
+++ b/WindowMaker/Styles/Gtk.style
@@ -1,14 +1,23 @@
 {
-HighlightColor = blue;
-HighlightTextColor = white;
-FTitleColor = white;
-PTitleColor = black;
-UTitleColor = darkblue;
-FTitleBack = (solid, darkblue);
-PTitleBack = (solid, "rgb:d5/d6/d5");
-UTitleBack = (solid, "rgb:d5/d6/d5");
-MenuTitleBack = (solid, darkblue);
-MenuTextBack = (solid, "rgb:d5/d6/d5");
-MenuTextColor = black;
-MenuTitleColor = white;
+  TitleJustify = center;
+  HighlightColor = blue;
+  HighlightTextColor = white;
+  ClipTitleColor = white;
+  CClipTitleColor = gray20;
+  FTitleColor = white;
+  PTitleColor = black;
+  UTitleColor = darkblue;
+  FTitleBack = (solid, darkblue);
+  PTitleBack = (solid, "rgb:d5/d6/d5");
+  UTitleBack = (solid, "rgb:d5/d6/d5");
+  ResizebarBack = (solid, "rgb:d5/d6/d5");
+  MenuTitleColor = white;
+  MenuTextColor = black;
+  MenuDisabledColor = gray40;
+  MenuTitleBack = (solid, darkblue);
+  MenuTextBack = (solid, "rgb:d5/d6/d5");
+  IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
+  IconTitleColor = white;
+  IconTitleBack = darkblue;
+  MenuStyle = normal;
 }
diff --git a/WindowMaker/Styles/LightBlue.style b/WindowMaker/Styles/LightBlue.style
index 42d2c477..57694d3d 100644
--- a/WindowMaker/Styles/LightBlue.style
+++ b/WindowMaker/Styles/LightBlue.style
@@ -1,15 +1,23 @@
 {
+  TitleJustify = center;
   HighlightColor = white;
   HighlightTextColor = black;
-FTitleColor = white;
-PTitleColor = "white";
-UTitleColor = "black";
-MenuTitleColor = white;
-MenuDisabledColor = "gray40";
-MenuTextColor = "black";
-FTitleBack = (hgradient, "rgb:41/8a/ef", "rgb:20/49/8e");
-UTitleBack = (hgradient, lightskyblue1, lightskyblue4);
-PTitleBack = (hgradient, "rgb:41/eb/ef", "rgb:28/92/79");
-MenuTitleBack = (hgradient, "rgb:41/8a/ef", "rgb:20/49/8e");
-MenuTextBack = (hgradient, lightskyblue1, lightskyblue4);
+  ClipTitleColor = white;
+  CClipTitleColor = gray20;
+  FTitleColor = white;
+  PTitleColor = white;
+  UTitleColor = black;
+  FTitleBack = (hgradient, "rgb:41/8a/ef", "rgb:20/49/8e");
+  PTitleBack = (hgradient, "rgb:41/eb/ef", "rgb:28/92/79");
+  UTitleBack = (hgradient, lightskyblue1, lightskyblue4);
+  ResizebarBack = (hgradient, lightskyblue1, lightskyblue4);
+  MenuTitleColor = white;
+  MenuTextColor = black;
+  MenuDisabledColor = gray40;
+  MenuTitleBack = (hgradient, "rgb:41/8a/ef", "rgb:20/49/8e");
+  MenuTextBack = (hgradient, lightskyblue1, lightskyblue4);
+  IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
+  IconTitleColor = white;
+  IconTitleBack = "#3069bf";
+  MenuStyle = normal;
 }
diff --git a/WindowMaker/Styles/Pastel.style b/WindowMaker/Styles/Pastel.style
index b6aea8d7..b31ab1b9 100644
--- a/WindowMaker/Styles/Pastel.style
+++ b/WindowMaker/Styles/Pastel.style
@@ -1,15 +1,23 @@
 {
+  TitleJustify = center;
   HighlightColor = white;
   HighlightTextColor = black;
-FTitleColor = "gray30";
-PTitleColor = "white";
-UTitleColor = "gray30";
-MenuTitleColor = "gray30";
-MenuDisabledColor = "gray50";
-MenuTextColor = "gray30";
-FTitleBack = (hgradient, "PaleTurquoise3", "PaleTurquoise4");
-UTitleBack = (hgradient, "cornsilk2", "cornsilk4");
-PTitleBack = (hgradient, "slategray2", "slategray4");
-MenuTitleBack = (hgradient, "lightyellow2", "lightyellow4");
-MenuTextBack = (hgradient, "slategray2", "slategray4");
+  ClipTitleColor = white;
+  CClipTitleColor = gray20;
+  FTitleColor = gray30;
+  PTitleColor = white;
+  UTitleColor = gray30;
+  FTitleBack = (hgradient, PaleTurquoise3, PaleTurquoise4);
+  PTitleBack = (hgradient, pink, pink4);
+  UTitleBack = (hgradient, cornsilk2, cornsilk4);
+  ResizebarBack = (hgradient, cornsilk2, cornsilk4);
+  MenuTitleColor = gray30;
+  MenuTextColor = gray30;
+  MenuDisabledColor = gray50;
+  MenuTitleBack = (hgradient, lightyellow2, lightyellow4);
+  MenuTextBack = (hgradient, slategray2, slategray4);
+  IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
+  IconTitleColor = gray30;
+  IconTitleBack = "#7eacac";
+  MenuStyle = normal;
 }
diff --git a/WindowMaker/Styles/Purple.style b/WindowMaker/Styles/Purple.style
index c82100a0..4991ceb9 100644
--- a/WindowMaker/Styles/Purple.style
+++ b/WindowMaker/Styles/Purple.style
@@ -1,15 +1,23 @@
 {
+  TitleJustify = center;
   HighlightColor = white;
   HighlightTextColor = black;
-FTitleColor = "white";
-PTitleColor = "gray";
-UTitleColor = "gray";
-MenuTitleColor = "white";
-MenuDisabledColor = "gray60";
-MenuTextColor = "white";
-FTitleBack = (hgradient, "mediumpurple2", "rgb:43/33/64");
-UTitleBack = (hgradient, "mediumpurple4", "black");
-PTitleBack = (hgradient, "mediumpurple3", mediumpurple4);
-MenuTitleBack = (hgradient, "mediumpurple2", "rgb:43/33/64");
-MenuTextBack = (hgradient, "mediumpurple4", "black");
+  ClipTitleColor = white;
+  CClipTitleColor = gray20;
+  FTitleColor = white;
+  PTitleColor = gray;
+  UTitleColor = gray;
+  FTitleBack = (hgradient, mediumpurple2, "rgb:43/33/64");
+  PTitleBack = (hgradient, mediumpurple3, mediumpurple4);
+  UTitleBack = (hgradient, mediumpurple4, black);
+  ResizebarBack = (hgradient, mediumpurple4, black);
+  MenuTitleColor = white;
+  MenuTextColor = white;
+  MenuDisabledColor = gray60;
+  MenuTitleBack = (hgradient, mediumpurple2, "rgb:43/33/64");
+  MenuTextBack = (hgradient, mediumpurple4, black);
+  IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
+  IconTitleColor = white;
+  IconTitleBack = "#7156a9";
+  MenuStyle = normal;
 }
diff --git a/WindowMaker/Styles/Red.style b/WindowMaker/Styles/Red.style
index b7b5200b..7d373689 100644
--- a/WindowMaker/Styles/Red.style
+++ b/WindowMaker/Styles/Red.style
@@ -1,13 +1,23 @@
 {
-FTitleColor = "white";
-PTitleColor = "white";
-UTitleColor = "black";
-MenuTitleColor = "white";
-MenuDisabledColor = "gray40";
-MenuTextColor = "black";
-FTitleBack = (hgradient, "rgb:21/00/05", "rgb:90/00/30");
-UTitleBack = (hgradient, "rgb:90/90/90", "rgb:c0/c0/c0");
-PTitleBack = (hgradient, "rgb:51/50/55", "rgb:80/80/80");
-MenuTitleBack = (hgradient, "rgb:90/00/30", "rgb:21/00/05");
-MenuTextBack = (hgradient, "rgb:c0/c0/c0", "rgb:90/90/90");
+  TitleJustify = center;
+  HighlightColor = white;
+  HighlightTextColor = black;
+  ClipTitleColor = white;
+  CClipTitleColor = gray20;
+  FTitleColor = white;
+  PTitleColor = white;
+  UTitleColor = black;
+  FTitleBack = (hgradient, "rgb:21/00/05", "rgb:90/00/30");
+  PTitleBack = (hgradient, "rgb:51/50/55", "rgb:80/80/80");
+  UTitleBack = (hgradient, "rgb:90/90/90", "rgb:c0/c0/c0");
+  ResizebarBack = (hgradient, "rgb:90/90/90", "rgb:c0/c0/c0");
+  MenuTitleColor = white;
+  MenuTextColor = black;
+  MenuDisabledColor = gray40;
+  MenuTitleBack = (hgradient, "rgb:90/00/30", "rgb:21/00/05");
+  MenuTextBack = (hgradient, "rgb:c0/c0/c0", "rgb:90/90/90");
+  IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
+  IconTitleColor = white;
+  IconTitleBack = "#58001a";
+  MenuStyle = normal;
 }
diff --git a/WindowMaker/Styles/RednBlue.style b/WindowMaker/Styles/RednBlue.style
index b4f9dc11..b0789736 100644
--- a/WindowMaker/Styles/RednBlue.style
+++ b/WindowMaker/Styles/RednBlue.style
@@ -1,15 +1,23 @@
 {
+  TitleJustify = center;
   HighlightColor = white;
   HighlightTextColor = black;
+  ClipTitleColor = white;
+  CClipTitleColor = gray20;
   FTitleColor = white;
   PTitleColor = white;
   UTitleColor = gray;
   FTitleBack = (hgradient, "rgb:96/24/49", "rgb:30/00/10");
   PTitleBack = (hgradient, "rgb:49/71/86", "rgb:19/41/56");
   UTitleBack = (hgradient, "rgb:30/51/8e", "rgb:00/0c/00");
+  ResizebarBack = (hgradient, "rgb:30/51/8e", "rgb:00/0c/00");
   MenuTitleColor = white;
   MenuTextColor = white;
   MenuDisabledColor = "rgb:61/61/61";
   MenuTitleBack = (hgradient, "rgb:96/24/49", "rgb:30/00/10");
   MenuTextBack = (hgradient, "rgb:30/51/8e", "rgb:00/0c/00");
+  IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
+  IconTitleColor = white;
+  IconTitleBack = "#63122c";
+  MenuStyle = normal;
 }
diff --git a/WindowMaker/Styles/Summer.style b/WindowMaker/Styles/Summer.style
index ab94b648..e72d8cf1 100644
--- a/WindowMaker/Styles/Summer.style
+++ b/WindowMaker/Styles/Summer.style
@@ -1,16 +1,23 @@
 {
+  TitleJustify = center;
   HighlightColor = white;
   HighlightTextColor = black;
-  TitleJustify = center;
+  ClipTitleColor = white;
+  CClipTitleColor = gray20;
   FTitleColor = "rgb:83/83/56";
   PTitleColor = white;
   UTitleColor = white;
   FTitleBack = (hgradient, "rgb:ff/ff/87", "rgb:c7/c7/69");
   PTitleBack = (hgradient, seagreen2, seagreen4);
   UTitleBack = (hgradient, "rgb:b5/b5/ef", "rgb:73/73/99");
+  ResizebarBack = (hgradient, "rgb:b5/b5/ef", "rgb:73/73/99");
   MenuTitleColor = "rgb:83/83/56";
   MenuTextColor = white;
   MenuDisabledColor = gray30;
   MenuTitleBack = (hgradient, "rgb:ff/ff/87", "rgb:c7/c7/69");
   MenuTextBack = (hgradient, "rgb:b5/b5/ef", "rgb:73/73/99");
+  IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
+  IconTitleColor = "rgb:83/83/56";
+  IconTitleBack = "#e3e378";
+  MenuStyle = normal;
 }
diff --git a/WindowMaker/Styles/Traditional.style b/WindowMaker/Styles/Traditional.style
index 127c066b..0be434ae 100644
--- a/WindowMaker/Styles/Traditional.style
+++ b/WindowMaker/Styles/Traditional.style
@@ -1,22 +1,23 @@
 {
-FTitleColor = "white";
-PTitleColor = "white";
-UTitleColor = "black";
-MenuTitleColor = "white";
-MenuDisabledColor = "gray40";
-MenuTextColor = "black";
-MenuTextBack = (solid, "rgb:aa/aa/aa");
-FTitleBack = (solid, black);
-UTitleBack = (solid, "rgb:aa/aa/aa");
-PTitleBack = (solid, gray40);
-MenuTitleBack = (solid, black);
-MenuTextBack = (solid, "rgb:aa/aa/aa");
-HighlightColor = white;
-HighlightTextColor = black;
-TitleJustify = center;
-ClipTitleColor = white;
-CClipTitleColor = gray20;
-IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
-IconTitleColor = white;
-IconTitleBack = black;
+  TitleJustify = center;
+  HighlightColor = white;
+  HighlightTextColor = black;
+  ClipTitleColor = white;
+  CClipTitleColor = gray20;
+  FTitleColor = white;
+  PTitleColor = white;
+  UTitleColor = black;
+  FTitleBack = (solid, black);
+  PTitleBack = (solid, gray40);
+  UTitleBack = (solid, "rgb:aa/aa/aa");
+  ResizebarBack = (solid, "rgb:aa/aa/aa");
+  MenuTitleColor = white;
+  MenuTextColor = black;
+  MenuDisabledColor = gray40;
+  MenuTitleBack = (solid, black);
+  MenuTextBack = (solid, "rgb:aa/aa/aa");
+  IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
+  IconTitleColor = white;
+  IconTitleBack = black;
+  MenuStyle = normal;
 }
diff --git a/WindowMaker/Styles/VioletBlue.style b/WindowMaker/Styles/VioletBlue.style
index 87742181..68897106 100644
--- a/WindowMaker/Styles/VioletBlue.style
+++ b/WindowMaker/Styles/VioletBlue.style
@@ -1,16 +1,23 @@
 {
   TitleJustify = center;
+  HighlightColor = white;
+  HighlightTextColor = black;
+  ClipTitleColor = white;
+  CClipTitleColor = gray20;
   FTitleColor = white;
   PTitleColor = gray;
   UTitleColor = white;
   FTitleBack = (dgradient, black, mediumorchid4);
   PTitleBack = (dgradient, mediumorchid4, dodgerblue3);
   UTitleBack = (dgradient, black, dodgerblue4);
+  ResizebarBack = (dgradient, black, dodgerblue4);
   MenuTitleColor = white;
   MenuTextColor = white;
   MenuDisabledColor = gray60;
   MenuTitleBack = (dgradient, black, mediumorchid4);
   MenuTextBack = (dgradient, black, dodgerblue4);
-  HighlightColor = white;
-  HighlightTextColor = black;
+  IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
+  IconTitleColor = white;
+  IconTitleBack = "#3d1b45";
+  MenuStyle = normal;
 }
diff --git a/src/defaults.c b/src/defaults.c
index d019f045..9e3068a2 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -200,15 +200,14 @@ static int updateUsableArea();
 #define REFRESH_MENU_TITLE_COLOR	(1<<6)
 #define REFRESH_WINDOW_TITLE_COLOR (1<<7)
 #define REFRESH_WINDOW_FONT	(1<<8)
-#define REFRESH_FORE_COLOR	(1<<9)
-#define REFRESH_ICON_TILE	(1<<10)
-#define REFRESH_ICON_FONT	(1<<11)
-#define REFRESH_WORKSPACE_BACK	(1<<12)
+#define REFRESH_ICON_TILE	(1<<9)
+#define REFRESH_ICON_FONT	(1<<10)
+#define REFRESH_WORKSPACE_BACK	(1<<11)
 
-#define REFRESH_BUTTON_IMAGES   (1<<13)
+#define REFRESH_BUTTON_IMAGES   (1<<12)
 
-#define REFRESH_ICON_TITLE_COLOR (1<<14)
-#define REFRESH_ICON_TITLE_BACK (1<<15)
+#define REFRESH_ICON_TITLE_COLOR (1<<13)
+#define REFRESH_ICON_TITLE_BACK (1<<14)
 
 
 
@@ -2106,8 +2105,7 @@ static int
 getColor(WScreen *scr, WDefaultEntry *entry, proplist_t value, void *addr, 
 	 void **ret)
 {
-    static unsigned long pixel;    
-    XColor color;
+    static XColor color;
     char *val;
     int second_pass=0;
 
@@ -2127,14 +2125,15 @@ again:
         }
         return False;
     }
-    
-    pixel = color.pixel;
-    
+
     if (ret)
-      *ret = &pixel;
+      *ret = &color;
     
+    assert(addr==NULL);
+    /*
     if (addr)
       *(unsigned long*)addr = pixel;
+     */
     
     return True;
 }
@@ -2281,7 +2280,7 @@ getRImages(WScreen *scr, WDefaultEntry *entry, proplist_t value,
 static int
 setJustify(WScreen *scr, WDefaultEntry *entry, WTexture **texture, void *foo)
 {
-    return REFRESH_FORE_COLOR;
+    return REFRESH_WINDOW_TITLE_COLOR;
 }
 
 
@@ -2515,7 +2514,7 @@ setHightlight(WScreen *scr, WDefaultEntry *entry, XColor *color, void *foo)
     
     scr->select_pixel = color->pixel;
 
-    return REFRESH_FORE_COLOR;
+    return REFRESH_MENU_COLOR;
 }
 
 
@@ -2529,7 +2528,7 @@ setHightlightText(WScreen *scr, WDefaultEntry *entry, XColor *color, void *foo)
     
     scr->select_text_pixel = color->pixel;
 
-    return REFRESH_FORE_COLOR;
+    return REFRESH_MENU_COLOR;
 }
 
 
@@ -2540,10 +2539,29 @@ setClipTitleColor(WScreen *scr, WDefaultEntry *entry, XColor *color, long index)
 	scr->clip_title_pixel[index]!=scr->black_pixel) {
 	wFreeColor(scr, scr->clip_title_pixel[index]);
     }
-    
     scr->clip_title_pixel[index] = color->pixel;
 
-    return REFRESH_FORE_COLOR;
+    if (index == CLIP_NORMAL) {
+	RImage *image;
+	RColor color1, color2;
+	int pt = CLIP_BUTTON_SIZE*wPreferences.icon_size/64;
+	int as = pt - 15; /* 15 = 5+5+5 */
+	
+	FREE_PIXMAP(scr->clip_arrow_gradient);
+
+	color1.red = (color->red >> 8)*6/10;
+	color1.green = (color->green >> 8)*6/10;
+	color1.blue = (color->blue >> 8)*6/10;
+
+	color2.red = WMIN((color->red >> 8)*20/10, 255);
+	color2.green = WMIN((color->green >> 8)*20/10, 255);
+	color2.blue = WMIN((color->blue >> 8)*20/10, 255);
+
+	image = RRenderGradient(as+1, as+1, &color1, &color2, RDiagonalGradient);
+	RConvertImage(scr->rcontext, image, &scr->clip_arrow_gradient);
+	RDestroyImage(image);
+    }
+    return REFRESH_ICON_TITLE_COLOR;
 }
 
 
@@ -2650,7 +2668,7 @@ setMenuDisabledColor(WScreen *scr, WDefaultEntry *entry, XColor *color, void *fo
     }
     XChangeGC(dpy, scr->disabled_menu_entry_gc, gcm, &gcv);
 
-    return REFRESH_FORE_COLOR;
+    return REFRESH_MENU_COLOR;
 #undef gcm
 }
 
diff --git a/src/dock.c b/src/dock.c
index 8805dfde..0cc562ec 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -65,8 +65,6 @@
 #define CLIP_IDLE         0
 #define CLIP_FORWARD      2
 
-#define CLIP_BUTTON_SIZE  23
-
 
 /**** Global variables ****/
 
@@ -319,7 +317,8 @@ paintClipButtons(WAppIcon *clipIcon, Bool lpushed, Bool rpushed)
     int pt = CLIP_BUTTON_SIZE*ICON_SIZE/64;
     int tp = ICON_SIZE - pt;
     int as = pt - 15; /* 15 = 5+5+5 */
-
+    GC gc;
+    Bool collapsed = clipIcon->dock->collapsed;
 
     if (rpushed) {
 	p[0].x = tp+1;
@@ -341,6 +340,14 @@ paintClipButtons(WAppIcon *clipIcon, Bool lpushed, Bool rpushed)
 	XFillPolygon(dpy, win, scr->draw_gc, p, 3, Convex, CoordModeOrigin);
 	XSetForeground(dpy, scr->draw_gc, scr->black_pixel);
     }
+    if (collapsed) {
+	gc = scr->clip_title_gc;
+    } else {
+	XSetFillStyle(dpy, scr->copy_gc, FillTiled);
+	XSetTile(dpy, scr->copy_gc, scr->clip_arrow_gradient);
+	XSetClipMask(dpy, scr->copy_gc, None);
+	gc = scr->copy_gc;
+    }
 
     p[0].x = p[3].x = ICON_SIZE-6-as;
     p[0].y = p[3].y = 5;
@@ -352,8 +359,11 @@ paintClipButtons(WAppIcon *clipIcon, Bool lpushed, Bool rpushed)
         XFillPolygon(dpy, win, scr->draw_gc, p, 3, Convex, CoordModeOrigin);
         XDrawLines(dpy, win, scr->draw_gc, p, 4, CoordModeOrigin);
     } else {
-	XFillPolygon(dpy, win, scr->clip_title_gc, p,3,Convex,CoordModeOrigin);
-        XDrawLines(dpy, win, scr->clip_title_gc, p,4,CoordModeOrigin);
+	if (!collapsed)
+	    XSetTSOrigin(dpy, gc, ICON_SIZE-6-as, 5);
+
+	XFillPolygon(dpy, win, gc, p,3,Convex,CoordModeOrigin);
+        XDrawLines(dpy, win, gc, p,4,CoordModeOrigin);
     }
 
     p[0].x = p[3].x = 5;
@@ -366,9 +376,14 @@ paintClipButtons(WAppIcon *clipIcon, Bool lpushed, Bool rpushed)
 	XFillPolygon(dpy, win, scr->draw_gc, p, 3, Convex, CoordModeOrigin);
         XDrawLines(dpy, win, scr->draw_gc, p, 4, CoordModeOrigin);
     } else {
-        XFillPolygon(dpy, win, scr->clip_title_gc, p,3,Convex,CoordModeOrigin);
-        XDrawLines(dpy, win, scr->clip_title_gc, p,4,CoordModeOrigin);
+	if (!collapsed)
+	    XSetTSOrigin(dpy, gc, 5, ICON_SIZE-6-as);
+	
+        XFillPolygon(dpy, win, gc, p,3,Convex,CoordModeOrigin);
+        XDrawLines(dpy, win, gc, p,4,CoordModeOrigin);
     }
+    if (!collapsed)
+	XSetFillStyle(dpy, scr->copy_gc, FillSolid);
 }
 
 
diff --git a/src/framewin.c b/src/framewin.c
index efd45c94..801a72c2 100644
--- a/src/framewin.c
+++ b/src/framewin.c
@@ -576,13 +576,13 @@ renderResizebarTexture(WScreen *scr, WTexture *texture, int width, int height,
     ROperateLine(img, RSubtractOperation, 0, 0, width-1, 0, &dark);
     ROperateLine(img, RAddOperation, 0, 1, width-1, 1, &light);
 
-    ROperateLine(img, RSubtractOperation, cwidth, 2, cwidth, height, &dark);
-    ROperateLine(img, RAddOperation, cwidth+1, 2, cwidth+1, height, &light);
+    ROperateLine(img, RSubtractOperation, cwidth, 2, cwidth, height-1, &dark);
+    ROperateLine(img, RAddOperation, cwidth+1, 2, cwidth+1, height-1, &light);
 
     ROperateLine(img, RSubtractOperation, width-cwidth-2, 2, width-cwidth-2,
-		 height, &dark);
+		 height-1, &dark);
     ROperateLine(img, RAddOperation, width-cwidth-1, 2, width-cwidth-1, 
-		 height, &light);
+		 height-1, &light);
 
     if (!RConvertImage(scr->rcontext, img, pmap)) {
 	wwarning(_("error rendering image: %s"), RMessageForError(RErrorCode));
diff --git a/src/icon.c b/src/icon.c
index 1d058139..d55d8a95 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -80,7 +80,8 @@ appearanceObserver(void *self, WMNotification *notif)
 
     /* so that the appicon expose handlers will paint the appicon specific 
      * stuff */
-    XClearArea(dpy, icon->core->window, 0, 0, 1, 1, True);
+    XClearArea(dpy, icon->core->window, 0, 0, icon->core->width, 
+	       icon->core->height, True);
 }
 
 
@@ -237,6 +238,8 @@ wIconCreateWithIconFile(WScreen *scr, char *iconfile, int tile)
     
     wIconUpdate(icon);
 
+    WMAddNotificationObserver(appearanceObserver, icon, 
+			      WNIconAppearanceSettingsChanged, icon);
     WMAddNotificationObserver(tileObserver, icon, 
 			      WNIconTileSettingsChanged, icon);
 
diff --git a/src/screen.h b/src/screen.h
index f7ac61cd..3df2a1a9 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -236,8 +236,10 @@ typedef struct _WScreen {
     unsigned int geometry_display_width;
     unsigned int geometry_display_height;
     int keymove_tick;
-    
-    struct RContext *rcontext;
+
+    Pixmap clip_arrow_gradient;
+
+    struct RContext *rcontext;	       /* wrlib context */
     
     WMScreen *wmscreen;		       /* for widget library */
     
diff --git a/src/superfluous.c b/src/superfluous.c
index 40c0b8f6..e9d78894 100644
--- a/src/superfluous.c
+++ b/src/superfluous.c
@@ -72,8 +72,11 @@ DoKaboom(WScreen *scr, Window win, int x, int y)
     RImage *image;
     Pixmap pixmap;
     XImage *ximage;
+    GC gc;
+    XGCValues gcv;
     int i;
     int w, h;
+	int run;
 
     h = w = wPreferences.icon_size;
     if (x < 0 || x + w > scr->scr_width || y < 0 || y + h > scr->scr_height)
@@ -83,6 +86,7 @@ DoKaboom(WScreen *scr, Window win, int x, int y)
     if (!icon)
 	return;
 
+    XGrabServer(dpy);
     XUnmapWindow(dpy, win);
     XSync(dpy, False);
 
@@ -94,27 +98,43 @@ DoKaboom(WScreen *scr, Window win, int x, int y)
 	return;
     }
 
-    XSetClipMask(dpy, scr->copy_gc, None);
+    gcv.foreground = scr->white_pixel;
+    gcv.background = scr->black_pixel;
+    gcv.graphics_exposures = False;
+    gcv.subwindow_mode = IncludeInferiors;
+    gc = XCreateGC(dpy, scr->w_win, GCForeground|GCBackground|GCSubwindowMode
+		   |GCGraphicsExposures, &gcv);
 
-    for (i=0; i<DEMATERIALIZE_STEPS; i++) {
+	/*
+    XSetClipMask(dpy, scr->copy_gc, None);
+	*/
+
+    for (i=0,run=0; i<DEMATERIALIZE_STEPS; i++) {
 	XEvent foo;
-	if (XCheckTypedEvent(dpy, ButtonPress, &foo)) {
+	if (!run && XCheckTypedEvent(dpy, ButtonPress, &foo)) {
+	    run=1;
 	    XPutBackEvent(dpy, &foo);
-	    XClearWindow(dpy, scr->root_win);
-	    break;
+	    /*
+	     XClearWindow(dpy, scr->root_win);
+	     break;
+	     */
 	}
 	image = RCloneImage(back);
 	RCombineImagesWithOpaqueness(image, icon, 
 		     (DEMATERIALIZE_STEPS-1-i)*256/(DEMATERIALIZE_STEPS+2));
 	RConvertImage(scr->rcontext, image, &pixmap);
-	XCopyArea(dpy, pixmap, scr->root_win, scr->copy_gc, 0, 0, w, h, x, y);
+	XCopyArea(dpy, pixmap, scr->root_win, gc, 0, 0, w, h, x, y);
 	XFreePixmap(dpy, pixmap);
 	XFlush(dpy);
-	wusleep(1000);
+	if(!run) wusleep(1000);
     }
+	/*
     XClearArea(dpy, scr->root_win, x, y, w, h, False);
+	*/
     XFlush(dpy);
 
+    XUngrabServer(dpy);
+    XFreeGC(dpy, gc);
     RDestroyImage(icon);
     RDestroyImage(back);
 }
diff --git a/src/wconfig.h.in b/src/wconfig.h.in
index 5cebfe32..43bf8ce0 100644
--- a/src/wconfig.h.in
+++ b/src/wconfig.h.in
@@ -48,8 +48,9 @@
 /* 
  * #define to enable WindozeCycling.  Set WindozeCycling = YES in 
  * your WindowMaker config file
+ * WARNING: this still has some bugs
  */
-#define WEENDOZE_CYCLE
+#undef WEENDOZE_CYCLE
 
 
 /* undefine ANIMATIONS if you don't want animations for iconification,
@@ -423,6 +424,9 @@
 /* Vicinity in which an icon can be attached to the clip */
 #define CLIP_ATTACH_VICINITY	1
 
+#define CLIP_BUTTON_SIZE  23
+
+
 /* The amount of space (in multiples of the icon size)
  * a docked icon must be dragged out to detach it */
 #define DOCK_DETTACH_THRESHOLD	3
diff --git a/src/window.c b/src/window.c
index a6410da7..697f9538 100644
--- a/src/window.c
+++ b/src/window.c
@@ -137,7 +137,7 @@ appearanceObserver(void *self, WMNotification *notif)
     WWindow *wwin = (WWindow*)self;
     int flags = (int)WMGetNotificationClientData(notif);
 
-    if (!wwin->frame || !wwin->frame->titlebar)
+    if (!wwin->frame || (!wwin->frame->titlebar && !wwin->frame->resizebar))
 	return;
 
     if (flags & WFontSettings) {
@@ -147,6 +147,9 @@ appearanceObserver(void *self, WMNotification *notif)
 	wwin->frame->flags.need_texture_remake = 1;
     }
     if (flags & (WTextureSettings | WColorSettings)) {
+	if (wwin->frame->titlebar)
+	    XClearWindow(dpy, wwin->frame->titlebar->window);
+
 	wFrameWindowPaint(wwin->frame);
     }
 }
diff --git a/util/setstyle.c b/util/setstyle.c
index 8877a67e..5995659d 100644
--- a/util/setstyle.c
+++ b/util/setstyle.c
@@ -168,12 +168,12 @@ getColor(proplist_t texture)
 	    XParseColor(dpy, DefaultColormap(dpy, DefaultScreen(dpy)), 
 			PLGetString(c1), &color1);
 	    XParseColor(dpy, DefaultColormap(dpy, DefaultScreen(dpy)),
-			PLGetString(c1), &color2);
-	    
+			PLGetString(c2), &color2);
+
 	    sprintf(buffer, "#%02x%02x%02x", 
-		    (color1.red+color2.red)>>3,
-		    (color1.green+color2.green)>>3,
-		    (color1.blue+color2.blue)>>3);
+		    (color1.red+color2.red)>>9,
+		    (color1.green+color2.green)>>9,
+		    (color1.blue+color2.blue)>>9);
 	    value = PLMakeString(buffer);	    
 	}
     } else if (strcasecmp(str, "mdgradient")==0