correct themes and fonts

6 files changed, 29 insertions, 32 deletions

diff --git a/fvwm/.fvwm/themes/ef-autumn.sys b/fvwm/.fvwm/themes/ef-autumn.sys
index 7798aaa..911d205 100644
--- a/fvwm/.fvwm/themes/ef-autumn.sys
+++ b/fvwm/.fvwm/themes/ef-autumn.sys
@@ -2,8 +2,8 @@
 Colorset 0  fg #cfbcba, bg #0f0e06, hi, sh, Plain, NoShape
 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 3  fg #0f0e06, bg #887c8a, hi #887c8a, sh #887c8a, Plain, NoShape
+Colorset 4  fg #0f0e06, bg #692a12, hi #692a12, sh #692a12, Plain, NoShape
 Colorset 5  fg #cfbcba, bg #0f0e06, hi, sh, Plain, NoShape
 Colorset 6  fg #cfbcba, bg #265f4a, hi, sh, Plain, NoShape
 Colorset 7  fg red, bg #cfbcba, hi, sh, Plain, NoShape
@@ -12,7 +12,7 @@ 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 #265f4a, hi, sh, Plain, NoShape
-Colorset 14 fg #cfbcba, bg #302a3a, hi #aaaaaa, sh #999999, Plain, NoShape
+Colorset 14 fg #887c8a, bg #15140d, hi #aaaaaa, sh #999999, Plain, NoShape
 # dock buttons
 Colorset 15 fg #cfbcba, bg #0f0e06, hi, sh, Plain, Noshape
 
diff --git a/fvwm/.fvwm/themes/ef-elea-light.sys b/fvwm/.fvwm/themes/ef-elea-light.sys
index a3dca22..22311e7 100644
--- a/fvwm/.fvwm/themes/ef-elea-light.sys
+++ b/fvwm/.fvwm/themes/ef-elea-light.sys
@@ -15,9 +15,6 @@ Colorset 14 fg #221321, bg #302a3a, hi #aaaaaa, sh #999999, Plain, NoShape
 # dock buttons
 Colorset 15 fg #221321, bg #edf5e2, 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__221321.svg:20x20
+AddButtonStyle 4 Pixmap maximize__221321.svg:20x20
+AddButtonStyle 2 Pixmap close__221321.svg:20x20
\ No newline at end of file
diff --git a/fvwm/.fvwm/themes/ef-melissa-light.sys b/fvwm/.fvwm/themes/ef-melissa-light.sys
index feb8ee4..a96258c 100644
--- a/fvwm/.fvwm/themes/ef-melissa-light.sys
+++ b/fvwm/.fvwm/themes/ef-melissa-light.sys
@@ -15,9 +15,6 @@ Colorset 14 fg #68708a, bg #e7d7c6, hi #aaaaaa, sh #999999, Plain, NoShape
 # dock buttons
 Colorset 15 fg #393330, bg #fff6d8, 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__393330.svg:20x20
+AddButtonStyle 4 Pixmap maximize__393330.svg:20x20
+AddButtonStyle 2 Pixmap close__393330.svg:20x20
diff --git a/xorg/Xresources.autumn b/xorg/Xresources.autumn
index 88e4271..a645e17 100644
--- a/xorg/Xresources.autumn
+++ b/xorg/Xresources.autumn
@@ -7,23 +7,23 @@ URxvt.background:  [90]#0f0e06
 *.color0:       #0f0e06
 *.color8:       #36322f
 ! red
-*.color1:       #ef656a
-*.color9:       #ef656a
+*.color1:       #ff7a7f
+*.color9:       #f06a3f
 ! green
 *.color2:       #2fa526
-*.color10:      #2fa526
+*.color10:      #64aa0f
 ! yellow
 *.color3:       #c48702
-*.color11:      #c48702
+*.color11:      #d0730f
 ! blue
-*.color4:       #379cf6
-*.color12:      #379cf6
+*.color4:       #6a88ff
+*.color12:      #029fff
 ! magenta
 *.color5:       #d570af
-*.color13:      #d570af
+*.color13:      #af8aff
 ! cyan
 *.color6:       #4fb0cf
-*.color14:      #4fb0cf
+*.color14:      #6fafff
 ! white
 *.color7:       #cfbcba
 *.color15:      #cfbcba
@@ -32,7 +32,7 @@ st.font: Comic Code-14
 
 dmenu.background: #0f0e06
 dmenu.foreground: #cfbcba
-dmenu.selbackground: #36322f
+dmenu.selbackground: #692a12
 dmenu.selforeground: #cfbcba
 dmenu.font: Comic Code-14
 
diff --git a/xorg/Xresources.operandi b/xorg/Xresources.operandi
index fedbf89..878eb3e 100644
--- a/xorg/Xresources.operandi
+++ b/xorg/Xresources.operandi
@@ -28,10 +28,13 @@ URxvt.background:  [90]#ffffff
 *.color7:       #ffffff
 *.color15:      #ffffff
 
+st.font: Comic Code-14
+
 dmenu.background: #ffffff
 dmenu.foreground: #000000
 dmenu.selbackground: #c8c8c8
 dmenu.selforeground: #000000
+dmenu.font: Comic Code-14
 
 Nsxiv.window.background: #ffffff
 Nsxiv.window.foreground: #000000
diff --git a/xorg/Xresources.vivendi b/xorg/Xresources.vivendi
index 3787a21..0c75c47 100644
--- a/xorg/Xresources.vivendi
+++ b/xorg/Xresources.vivendi
@@ -5,25 +5,25 @@ URxvt.background:  [90]#000000
 *.cursorColor:     #ffffff
 ! black
 *.color0:       #000000
-*.color8:       #535353
+*.color8:       #595959
 ! red
 *.color1:       #ff5f59
-*.color9:       #ff5f59
+*.color9:       #ff6b55
 ! green
 *.color2:       #44BC44
-*.color10:      #44BC44
+*.color10:      #00c06f
 ! yellow
-*.color3:       #fec43f
+*.color3:       #d0bc00
 *.color11:      #fec43f
 ! blue
 *.color4:       #2FAFFF
-*.color12:      #2FAFFF
+*.color12:      #79a8ff
 ! magenta
 *.color5:       #FEACD0
-*.color13:      #FEACD0
+*.color13:      #b6a0ff
 ! cyan
 *.color6:       #00D3D0
-*.color14:      #00D3D0
+*.color14:      #6ae4b9
 ! white
 *.color7:       #ffffff
 *.color15:      #ffffff
@@ -32,7 +32,7 @@ st.font: Comic Code-14
 
 dmenu.background: #000000
 dmenu.foreground: #ffffff
-dmenu.selbackground: #535353
+dmenu.selbackground: #505050
 dmenu.selforeground: #ffffff
 dmenu.font: Comic Code-14