upgrade to fvwm3

update fvwm3 window decor, new icons for window decor, change st and
emacs icon, add ef-elea-dark theme, maris light xresources

9 files changed, 71 insertions, 10 deletions

diff --git a/fvwm/.fvwm/themes/ef-arbutus.sys b/fvwm/.fvwm/themes/ef-arbutus.sys
index 46c2416..dca4aa7 100644
--- a/fvwm/.fvwm/themes/ef-arbutus.sys
+++ b/fvwm/.fvwm/themes/ef-arbutus.sys
@@ -13,4 +13,11 @@ Colorset 12 fg #393330, bg #afdeaf, hi, sh, Plain, NoShape
 Colorset 13 fg #393330, bg #afdeaf, hi, sh, Plain, NoShape
 Colorset 14 fg #6e678f, bg #f0d8cf, hi #aaaaaa, sh #999999, Plain, NoShape
 # dock buttons
-Colorset 15 fg #393330, bg #ffead8, hi, sh, Plain, Noshape
\ No newline at end of file
+Colorset 15 fg #393330, bg #ffead8, hi, sh, Plain, Noshape
+
+ButtonStyle All VGradient 20 #ccdfff #afbeff  -- UseTitleStyle Flat
+ButtonStyle 2 VGradient 20 #ffc2bf #ff8f88 -- UseTitleStyle Flat
+AddButtonStyle 1 MiniIcon
+AddButtonStyle 6 Pixmap minimize__393330.svg:20x20
+AddButtonStyle 4 Pixmap maximize__393330.svg:20x20
+AddButtonStyle 2 Pixmap close__393330.svg:20x20
\ No newline at end of file
diff --git a/fvwm/.fvwm/themes/ef-autumn.sys b/fvwm/.fvwm/themes/ef-autumn.sys
index 011c744..96b81fc 100644
--- a/fvwm/.fvwm/themes/ef-autumn.sys
+++ b/fvwm/.fvwm/themes/ef-autumn.sys
@@ -4,10 +4,10 @@ Colorset 1  fg #887c8a, bg #15140d, hi, sh, Plain, NoShape
 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 #0f0e06, bg #cfbcba, hi, sh, Plain, NoShape
+Colorset 5  fg #cfbcba, bg #0f0e06, hi, sh, Plain, NoShape
 Colorset 6  fg #feeeca, bg #692a12, hi, sh, Plain, NoShape
 Colorset 7  fg red, bg #cfbcba, hi, sh, Plain, NoShape
-Colorset 8  fg #cfbcba, bg #0f0e06, hi, sh, Plain, NoShape
+Colorset 8  fg #0f0e06, bg #887c8a, 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
diff --git a/fvwm/.fvwm/themes/ef-cherie.sys b/fvwm/.fvwm/themes/ef-cherie.sys
index 9cf004a..cee2e08 100644
--- a/fvwm/.fvwm/themes/ef-cherie.sys
+++ b/fvwm/.fvwm/themes/ef-cherie.sys
@@ -13,4 +13,11 @@ Colorset 12 fg #d3cfcf, bg #684d54, hi, sh, Plain, NoShape
 Colorset 13 fg #d3cfcf, bg #684d54, hi, sh, Plain, NoShape
 Colorset 14 fg #d3cfcf, bg #302a3a, hi #aaaaaa, sh #999999, Plain, NoShape
 # dock buttons
-Colorset 15 fg #d3cfcf, bg #190a0f, hi, sh, Plain, Noshape
\ No newline at end of file
+Colorset 15 fg #d3cfcf, bg #190a0f, hi, sh, Plain, Noshape
+
+ButtonStyle All VGradient 20 #2270cf #004065  -- UseTitleStyle Flat
+ButtonStyle 2 VGradient 20 #b02930 #72002a -- UseTitleStyle Flat
+AddButtonStyle 1 MiniIcon
+AddButtonStyle 6 Pixmap minimize__FFFFFF.svg:20x20
+AddButtonStyle 4 Pixmap maximize__FFFFFF.svg:20x20
+AddButtonStyle 2 Pixmap close__FFFFFF.svg:20x20
diff --git a/fvwm/.fvwm/themes/ef-cyprus.sys b/fvwm/.fvwm/themes/ef-cyprus.sys
index 7653d7f..f965134 100644
--- a/fvwm/.fvwm/themes/ef-cyprus.sys
+++ b/fvwm/.fvwm/themes/ef-cyprus.sys
@@ -11,6 +11,6 @@ Colorset 10 fg #242521, bg #fcf7ef, hi, sh, Plain, NoShape
 Colorset 11 fg #242521, bg #c0df6f, hi #242521, sh #242521, Plain, NoShape
 Colorset 12 fg #242521, bg #efc26f, hi, sh, Plain, NoShape
 Colorset 13 fg #242521, bg #efc26f, hi, sh, Plain, NoShape
-Colorset 14 fg #242521, bg #302a3a, hi #aaaaaa, sh #999999, Plain, NoShape
+Colorset 14 fg #ffffff, bg #8f6f4a, hi #aaaaaa, sh #999999, Plain, NoShape
 # dock buttons
 Colorset 15 fg #242521, bg #fcf7ef, hi, sh, Plain, Noshape
\ No newline at end of file
diff --git a/fvwm/.fvwm/themes/ef-elea-dark.sys b/fvwm/.fvwm/themes/ef-elea-dark.sys
new file mode 100644
index 0000000..8b1821e
--- /dev/null
+++ b/fvwm/.fvwm/themes/ef-elea-dark.sys
@@ -0,0 +1,17 @@
+#### Ef Elea Dark FVWM Colorsets
+Colorset 0  fg #eaf2ef, bg #222524, hi, sh, Plain, NoShape
+Colorset 1  fg #969faf, bg #3e4140, hi, sh, Plain, NoShape
+Colorset 2  fg #eaf2ef, bg #222524, hi, sh, Plain, NoShape
+Colorset 3  fg #222524, bg #969faf, hi #969faf, sh #969faf, Plain, NoShape
+Colorset 4  fg #222524, bg #35605d, hi #35605d, sh #35605d, Plain, NoShape
+Colorset 5  fg #eaf2ef, bg #222524, hi, sh, Plain, NoShape
+Colorset 6  fg #eaf2ef, bg #35605d, hi, sh, Plain, NoShape
+Colorset 7  fg #eaf2ef, bg #eaf2ef, hi, sh, Plain, NoShape
+Colorset 8  fg #222524, bg #eaf2ef, hi, sh, Plain, NoShape
+Colorset 10 fg #eaf2ef, bg #222524, hi, sh, Plain, NoShape
+Colorset 11 fg #eaf2ef, bg #35605d, hi #eaf2ef, sh #eaf2ef, Plain, NoShape
+Colorset 12 fg #eaf2ef, bg #894f7a, hi, sh, Plain, NoShape
+Colorset 13 fg #eaf2ef, bg #894f7a, hi, sh, Plain, NoShape
+Colorset 14 fg #eaf2ef, bg #5a4000, hi #aaaaaa, sh #999999, Plain, NoShape
+# dock buttons
+Colorset 15 fg #eaf2ef, bg #222524, hi, sh, Plain, Noshape
\ No newline at end of file
diff --git a/fvwm/.fvwm/themes/ef-melissa-dark.sys b/fvwm/.fvwm/themes/ef-melissa-dark.sys
index 3fa0c76..45cd3b5 100644
--- a/fvwm/.fvwm/themes/ef-melissa-dark.sys
+++ b/fvwm/.fvwm/themes/ef-melissa-dark.sys
@@ -13,4 +13,12 @@ Colorset 12 fg #e8e4b1, bg #60518f, hi, sh, Plain, NoShape
 Colorset 13 fg #e8e4b1, bg #60518f, hi, sh, Plain, NoShape
 Colorset 14 fg #e8e4b1, bg #302a3a, hi #aaaaaa, sh #999999, Plain, NoShape
 # dock buttons
-Colorset 15 fg #e8e4b1, bg #352718, hi, sh, Plain, Noshape
\ No newline at end of file
+Colorset 15 fg #e8e4b1, bg #352718, hi, sh, Plain, Noshape
+
+ButtonStyle 4 VGradient 20 #2270cf #004065  -- UseTitleStyle Flat
+ButtonStyle 6 VGradient 20 #2270cf #004065  -- UseTitleStyle Flat
+ButtonStyle 2 VGradient 20 #b02930 #72002a -- UseTitleStyle Flat
+AddButtonStyle 1 MiniIcon
+AddButtonStyle 6 Pixmap minimize__E8E4B1.svg:20x20
+AddButtonStyle 4 Pixmap maximize__E8E4B1.svg:20x20
+AddButtonStyle 2 Pixmap close__E8E4B1.svg:20x20
diff --git a/fvwm/.fvwm/themes/ef-melissa-light.sys b/fvwm/.fvwm/themes/ef-melissa-light.sys
index 861c157..ca95100 100644
--- a/fvwm/.fvwm/themes/ef-melissa-light.sys
+++ b/fvwm/.fvwm/themes/ef-melissa-light.sys
@@ -13,4 +13,11 @@ Colorset 12 fg #393330, bg #deb4f0, hi, sh, Plain, NoShape
 Colorset 13 fg #393330, bg #deb4f0, hi, sh, Plain, NoShape
 Colorset 14 fg #68708a, bg #e7d7c6, hi #aaaaaa, sh #999999, Plain, NoShape
 # dock buttons
-Colorset 15 fg #393330, bg #fff6d8, hi, sh, Plain, Noshape
\ No newline at end of file
+Colorset 15 fg #393330, bg #fff6d8, hi, sh, Plain, Noshape
+
+ButtonStyle All VGradient 20 #bfefff #88cfd0  -- UseTitleStyle Flat
+ButtonStyle 2 VGradient 20 #ffc6bf #ff8f88 -- UseTitleStyle Flat
+AddButtonStyle 1 MiniIcon
+AddButtonStyle 6 Pixmap minimize__393330.svg:20x20
+AddButtonStyle 4 Pixmap maximize__393330.svg:20x20
+AddButtonStyle 2 Pixmap close__393330.svg:20x20
diff --git a/fvwm/.fvwm/themes/modus-operandi.sys b/fvwm/.fvwm/themes/modus-operandi.sys
index 07d74b2..2051e55 100644
--- a/fvwm/.fvwm/themes/modus-operandi.sys
+++ b/fvwm/.fvwm/themes/modus-operandi.sys
@@ -13,6 +13,14 @@ 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
 Colorset 13 fg #000000, bg #b2e4dc, hi, sh, Plain, NoShape
-Colorset 14 fg #000000, bg #302a3a, hi #aaaaaa, sh #999999, Plain, NoShape
+Colorset 14 fg #ffffff, bg #005077, hi #aaaaaa, sh #999999, Plain, NoShape
 # dock buttons
-Colorset 15 fg #000000, bg #ffffff, hi, sh, Plain, Noshape
\ No newline at end of file
+Colorset 15 fg #000000, bg #ffffff, hi, sh, Plain, Noshape
+
+ButtonStyle All VGradient 20 #0031a9 #2f3f83  -- UseTitleStyle Flat
+ButtonStyle 2 VGradient 20 #a60000 #721045 -- UseTitleStyle Flat
+AddButtonStyle 1 MiniIcon
+AddButtonStyle 6 Pixmap minimize__FFFFFF.svg:20x20
+AddButtonStyle 4 Pixmap maximize__FFFFFF.svg:20x20
+AddButtonStyle 2 Pixmap close__FFFFFF.svg:20x20
+
diff --git a/fvwm/.fvwm/themes/modus-vivendi.sys b/fvwm/.fvwm/themes/modus-vivendi.sys
index 3d44fef..4ac09ac 100644
--- a/fvwm/.fvwm/themes/modus-vivendi.sys
+++ b/fvwm/.fvwm/themes/modus-vivendi.sys
@@ -15,4 +15,11 @@ Colorset 12 fg #ffffff, bg #45605e, hi, sh, Plain, NoShape
 Colorset 13 fg #ffffff, bg #989898, hi, sh, Plain, NoShape
 Colorset 14 fg #ffffff, bg #2f3849, hi #aaaaaa, sh #999999, Plain, NoShape
 # dock buttons
-Colorset 15 fg #ffffff, bg #000000, hi, sh, Plain, Noshape
\ No newline at end of file
+Colorset 15 fg #ffffff, bg #000000, hi, sh, Plain, Noshape
+
+ButtonStyle All VGradient 20 #242679 #12154a  -- UseTitleStyle Flat
+ButtonStyle 2 VGradient 20 #620f2a #3a0c14 -- UseTitleStyle Flat
+AddButtonStyle 1 MiniIcon
+AddButtonStyle 6 Pixmap minimize__FFFFFF.svg:20x20
+AddButtonStyle 4 Pixmap maximize__FFFFFF.svg:20x20
+AddButtonStyle 2 Pixmap close__FFFFFF.svg:20x20