fix theme buttons

6 files changed, 17 insertions, 25 deletions

diff --git a/fvwm/.fvwm/config b/fvwm/.fvwm/config
index b1f8dd5..9ed2462 100644
--- a/fvwm/.fvwm/config
+++ b/fvwm/.fvwm/config
@@ -398,6 +398,7 @@ AddToMenu MenuThemes "Themes" Title
 + "Ef &Elea Dark" ChangeTheme 'ef-elea-dark' 'elea-dark' "(ef-themes-select 'ef-elea-dark)"
 + "Ef &Cyprus" ChangeTheme 'ef-cyprus' 'cyprus' "(ef-themes-select 'ef-cyprus)"
 + "Ef &Night" ChangeTheme 'ef-night' 'night' "(ef-themes-select 'ef-night)"
++ "Ef &Dream" ChangeTheme 'ef-dream' 'dream' "(ef-themes-select 'ef-dream)"
 + "Ef &Maris Dark" ChangeTheme 'ef-maris-dark' 'maris-dark' "(ef-themes-select 'ef-maris-dark)"
 + "Ef &Maris Light" ChangeTheme 'ef-maris-light' 'maris-light' "(ef-themes-select 'ef-maris-light)"
 + "Ef &Cherie" ChangeTheme 'ef-cherie' 'cherie' "(ef-themes-select 'ef-cherie)"
diff --git a/fvwm/.fvwm/themes/ef-autumn.sys b/fvwm/.fvwm/themes/ef-autumn.sys
index 59f9608..7798aaa 100644
--- a/fvwm/.fvwm/themes/ef-autumn.sys
+++ b/fvwm/.fvwm/themes/ef-autumn.sys
@@ -5,20 +5,17 @@ Colorset 2  fg #cfbcba, bg #0f0e06, hi, sh, Plain, NoShape
 Colorset 3  fg #0f0e06, bg #606060, hi #606060, sh #606060, Plain, NoShape
 Colorset 4  fg #0f0e06, bg #887c8a, hi #887c8a, sh #887c8a, Plain, NoShape
 Colorset 5  fg #cfbcba, bg #0f0e06, hi, sh, Plain, NoShape
-Colorset 6  fg #feeeca, bg #692a12, hi, sh, Plain, NoShape
+Colorset 6  fg #cfbcba, bg #265f4a, hi, sh, Plain, NoShape
 Colorset 7  fg red, bg #cfbcba, hi, sh, Plain, NoShape
-Colorset 8  fg #0f0e06, bg #887c8a, hi, sh, Plain, NoShape
+Colorset 8  fg #cfbcba, bg #692a12, hi, sh, Plain, NoShape
 Colorset 10 fg #cfbcba, bg #0f0e06, hi, sh, Plain, NoShape
 Colorset 11 fg #cfbcba, bg #692a12, hi #cfbcba, sh #cfbcba, Plain, NoShape
 Colorset 12 fg #cfbcba, bg #265f4a, hi, sh, Plain, NoShape
-Colorset 13 fg #cfbcba, bg #887c8a, hi, sh, Plain, NoShape
+Colorset 13 fg #cfbcba, bg #265f4a, hi, sh, Plain, NoShape
 Colorset 14 fg #cfbcba, bg #302a3a, hi #aaaaaa, sh #999999, Plain, NoShape
 # dock buttons
 Colorset 15 fg #cfbcba, bg #0f0e06, hi, sh, Plain, Noshape
 
-AddButtonStyle 6 InActive Pixmap minimize__000000.svg:20x20
-AddButtonStyle 4 InActive Pixmap maximize__000000.svg:20x20
-AddButtonStyle 2 InActive Pixmap close__000000.svg:20x20
-AddButtonStyle 6 Active Pixmap minimize__CFBCBA.svg:20x20
-AddButtonStyle 4 Active Pixmap maximize__CFBCBA.svg:20x20
-AddButtonStyle 2 Active Pixmap close__CFBCBA.svg:20x20
+AddButtonStyle 6 Pixmap minimize__CFBCBA.svg:20x20
+AddButtonStyle 4 Pixmap maximize__CFBCBA.svg:20x20
+AddButtonStyle 2 Pixmap close__CFBCBA.svg:20x20
diff --git a/fvwm/.fvwm/themes/ef-cyprus.sys b/fvwm/.fvwm/themes/ef-cyprus.sys
index fc456a9..f4a6ed1 100644
--- a/fvwm/.fvwm/themes/ef-cyprus.sys
+++ b/fvwm/.fvwm/themes/ef-cyprus.sys
@@ -15,9 +15,6 @@ Colorset 14 fg #ffffff, bg #8f6f4a, hi #aaaaaa, sh #999999, Plain, NoShape
 # dock buttons
 Colorset 15 fg #242521, bg #fcf7ef, hi, sh, Plain, Noshape
 
-AddButtonStyle 6 InActive Pixmap minimize__000000.svg:20x20
-AddButtonStyle 4 InActive Pixmap maximize__000000.svg:20x20
-AddButtonStyle 2 InActive Pixmap close__000000.svg:20x20
-AddButtonStyle 6 Active Pixmap minimize__CFBCBA.svg:20x20
-AddButtonStyle 4 Active Pixmap maximize__CFBCBA.svg:20x20
-AddButtonStyle 2 Active Pixmap close__CFBCBA.svg:20x20
+AddButtonStyle 6 Pixmap minimize__CFBCBA.svg:20x20
+AddButtonStyle 4 Pixmap maximize__CFBCBA.svg:20x20
+AddButtonStyle 2 Pixmap close__CFBCBA.svg:20x20
diff --git a/fvwm/.fvwm/themes/ef-dream.sys b/fvwm/.fvwm/themes/ef-dream.sys
index cf724aa..90494f6 100644
--- a/fvwm/.fvwm/themes/ef-dream.sys
+++ b/fvwm/.fvwm/themes/ef-dream.sys
@@ -4,14 +4,14 @@ Colorset 2  fg #efd5c5, bg #232025, hi, sh, Plain, NoShape
 Colorset 3  fg #232025, bg #8f8886, hi #8f8886, sh #8f8886, Plain, NoShape
 Colorset 4  fg #232025, bg #675072, hi #675072, sh #675072, Plain, NoShape
 Colorset 5  fg #efd5c5, bg #232025, hi, sh, Plain, NoShape
-Colorset 6  fg #efd5c5, bg #675072, hi, sh, Plain, NoShape
+Colorset 6  fg #efd5c5, bg #684d54, hi, sh, Plain, NoShape
 Colorset 7  fg #efd5c5, bg #efd5c5, hi, sh, Plain, NoShape
-Colorset 8  fg #232025, bg #efd5c5, hi, sh, Plain, NoShape
+Colorset 8  fg #efd5c5, bg #675072, hi, sh, Plain, NoShape
 Colorset 10 fg #efd5c5, bg #232025, hi, sh, Plain, NoShape
 Colorset 11 fg #efd5c5, bg #675072, hi #efd5c5, sh #efd5c5, Plain, NoShape
 Colorset 12 fg #efd5c5, bg #684d54, hi, sh, Plain, NoShape
 Colorset 13 fg #efd5c5, bg #684d54, hi, sh, Plain, NoShape
-Colorset 14 fg #efd5c5, bg #e3b0c0, hi #aaaaaa, sh #999999, Plain, NoShape
+Colorset 14 fg #232025, bg #a0a0cf, hi #aaaaaa, sh #999999, Plain, NoShape
 # dock buttons
 Colorset 15 fg #efd5c5, bg #232025, hi, sh, Plain, Noshape
 
diff --git a/fvwm/.fvwm/themes/ef-night.sys b/fvwm/.fvwm/themes/ef-night.sys
index a4d0ed8..5ba3b13 100644
--- a/fvwm/.fvwm/themes/ef-night.sys
+++ b/fvwm/.fvwm/themes/ef-night.sys
@@ -4,9 +4,9 @@ Colorset 2  fg #afbcbf, bg #000e17, hi, sh, Plain, NoShape
 Colorset 3  fg #000e17, bg #11141f, hi #11141f, sh #11141f, Plain, NoShape
 Colorset 4  fg #000e17, bg #003a7f, hi #003a7f, sh #003a7f, Plain, NoShape
 Colorset 5  fg #afbcbf, bg #000e17, hi, sh, Plain, NoShape
-Colorset 6  fg #afbcbf, bg #003a7f, hi, sh, Plain, NoShape
+Colorset 6  fg #afbcbf, bg #6f345a, hi, sh, Plain, NoShape
 Colorset 7  fg #afbcbf, bg #afbcbf, hi, sh, Plain, NoShape
-Colorset 8  fg #000e17, bg #afbcbf, hi, sh, Plain, NoShape
+Colorset 8  fg #afbcbf, bg #003a7f, hi, sh, Plain, NoShape
 Colorset 10 fg #afbcbf, bg #000e17, hi, sh, Plain, NoShape
 Colorset 11 fg #afbcbf, bg #003a7f, hi #afbcbf, sh #afbcbf, Plain, NoShape
 Colorset 12 fg #afbcbf, bg #6f345a, hi, sh, Plain, NoShape
diff --git a/fvwm/.fvwm/themes/modus-operandi.sys b/fvwm/.fvwm/themes/modus-operandi.sys
index 666a577..218609e 100644
--- a/fvwm/.fvwm/themes/modus-operandi.sys
+++ b/fvwm/.fvwm/themes/modus-operandi.sys
@@ -6,9 +6,9 @@ Colorset 2  fg #000000, bg #ffffff, hi, sh, Plain, NoShape
 Colorset 3  fg #ffffff, bg #595959, hi #595959, sh #595959, Plain, NoShape
 Colorset 4  fg #ffffff, bg #c8c8c8, hi #c8c8c8, sh #c8c8c8, Plain, NoShape
 Colorset 5  fg #000000, bg #ffffff, hi, sh, Plain, NoShape
-Colorset 6  fg #000000, bg #c8c8c8, hi, sh, Plain, NoShape
+Colorset 6  fg #000000, bg #b2e4dc, hi, sh, Plain, NoShape
 Colorset 7  fg #000000, bg #000000, hi, sh, Plain, NoShape
-Colorset 8  fg #ffffff, bg #000000, hi, sh, Plain, NoShape
+Colorset 8  fg #000000, bg #c8c8c8, hi, sh, Plain, NoShape
 Colorset 10 fg #000000, bg #ffffff, hi, sh, Plain, NoShape
 Colorset 11 fg #000000, bg #c8c8c8, hi #000000, sh #000000, Plain, NoShape
 Colorset 12 fg #000000, bg #b2e4dc, hi, sh, Plain, NoShape
@@ -17,9 +17,6 @@ Colorset 14 fg #ffffff, bg #005077, hi #aaaaaa, sh #999999, Plain, NoShape
 # dock buttons
 Colorset 15 fg #000000, bg #ffffff, hi, sh, Plain, Noshape
 
-AddButtonStyle 6 Inactive Pixmap minimize__CFBCBA.svg:20x20
-AddButtonStyle 4 Inactive Pixmap maximize__CFBCBA.svg:20x20
-AddButtonStyle 2 Inactive Pixmap close__CFBCBA.svg:20x20
 AddButtonStyle 6 Pixmap minimize__000000.svg:20x20
 AddButtonStyle 4 Pixmap maximize__000000.svg:20x20
 AddButtonStyle 2 Pixmap close__000000.svg:20x20
\ No newline at end of file