21 files changed, 74 insertions, 68 deletions
diff --git a/fvwm/.fvwm/config b/fvwm/.fvwm/config
index 918a7c3..2e4e14f 100644
--- a/fvwm/.fvwm/config
+++ b/fvwm/.fvwm/config
@@ -252,7 +252,7 @@ MoveThreshold 3
 Style * SloppyFocus, MouseFocusClickRaises
 
 # Default Font
-DefaultFont "xft:Iosevka Comfy:size=12:antialias=True"
+DefaultFont "xft:Comic Code:size=14:antialias=True"
 
 # Window Placement
 Style * MinOverlapPlacement, GrabFocusOff, !UsePPosition
@@ -292,15 +292,15 @@ Style conky !Title, !Borders, !Handles, Sticky, \
 Style ConfirmQuit !Title, PositionPlacement Center, WindowListSkip, Layer 6
 Style FvwmIdent WindowListSkip
 
-Style st MiniIcon teacup.png, Icon teacup-big.png, EWMHMiniIconOverride
+Style st MiniIcon teacup.png, Icon teacup-big.png, EWMHMiniIconOverride, FPGrabFocus
 Style urxvt MiniIcon teacup.png, Icon teacup-big.png, EWMHMiniIconOverride
 Style firefox MiniIcon "Chouchin Reinensai-24x24.png", Icon "Chouchin Reinensai.png", EWMHMiniIconOverride, IconOverride
 Style LibreWolf MiniIcon "Chouchin Kuroshiro-24x24.png", Icon "Chouchin Kuroshiro.png", EWMHMiniIconOverride, IconOverride
-Style emacs MiniIcon Shodou-24x24.png, IconOverride, Icon Shodou.png, EWMHMiniIconOverride, FPGrabFocus
-Style Pcmanfm MiniIcon Bonsai-24x24.png, IconOverride, Icon Bonsai.png, EWMHMiniIconOverride, FPGrabFocus
+Style emacs MiniIcon Shodou-24x24.png, IconOverride, Icon Shodou.png, EWMHMiniIconOverride
+Style Pcmanfm MiniIcon Bonsai-24x24.png, IconOverride, Icon Bonsai.png, EWMHMiniIconOverride
 Style "Org-Clock" MiniIcon "Kakejiku-24x24.png", Icon "Kakejiku.png", Sticky, !Title, !Handles, NoClose, PositionPlacement 50-50w 0, WindowListSkip, NeverFocus, FixedPosition, StaysOnBottom
 # 50-50w 50-50w
-Style * Font "xft:Iosevka Comfy Motion:Thin:size=16:antialias=True"
+Style * Font "xft:Comic Code:Thin:size=14:antialias=True"
 ## Program styles
 
 #######
@@ -339,7 +339,7 @@ MenuStyle * Hilight3DOff, HilightBack, HilightTitleBack, SeparatorsLong
 MenuStyle * TrianglesSolid
 MenuStyle * ActiveFore, !Animation, PopupOffset -5 100
 # MenuStyle * ItemFormat "%|%3.1i%5.3l%5.3>%|"
-MenuStyle * Font "xft:Iosevka Comfy Motion:Thin:size=14:antialias=True"
+MenuStyle * Font "xft:Comic Code:Thin:size=14:antialias=True"
 
 # Root Menu
 #
@@ -413,6 +413,7 @@ AddToMenu MenuThemes "Themes" Title
 + "Ef &Bio" ChangeTheme 'ef-bio' 'bio' "(ef-themes-select 'ef-bio)"
 + "Ef &Spring" ChangeTheme 'ef-spring' 'spring' "(ef-themes-select 'ef-springc)"
 + "Ef &Symbiosis" ChangeTheme 'ef-symbiosis' 'symbiosis' "(ef-themes-select 'ef-symbiosis)"
++ "Ef &Spring" ChangeTheme 'ef-spring' 'spring' "(ef-themes-select 'ef-springc)"
 + "Ef &Melissa Dark" ChangeTheme 'ef-melissa-dark' 'melissa-dark' "(ef-themes-select 'ef-melissa-dark)"
 + "Ef &Melissa Light" ChangeTheme 'ef-melissa-light' 'melissa-light' "(ef-themes-select 'ef-melissa-light)"
 + "Ef &Arbutus" ChangeTheme 'ef-arbutus' 'arbutus' "(ef-themes-select 'ef-arbutus)"
@@ -780,7 +781,7 @@ AddButtonStyle 2 Pixmap close__FFFFFF.svg:20x20
 # a window. One use is getting the class/resource/name of a window.
 DestroyModuleConfig FvwmIdent:*
 *FvwmIdent: Colorset 10
-*FvwmIdent: Font "xft:Iosevka Comfy:size=12:antialias=True"
+*FvwmIdent: Font "xft:Comic Code:size=14:antialias=True"
 
 # FvwmBanner
 #
@@ -817,7 +818,7 @@ DestroyModuleConfig LeftPanel:*
 *LeftPanel: Rows $[vp.height]
 *LeftPanel: Columns 120
 *LeftPanel: Frame 0
-*LeftPanel: Font "xft:Iosevka Comfy:Bold:size=12:antialias=True"
+*LeftPanel: Font "xft:Comic Code:Bold:size=14:antialias=True"
 # *LeftPanel: (120x45, Icon "fvwm-logo-small.png", Frame 0)
 *LeftPanel: (120x5, Frame 0)
 *LeftPanel: (10x30, Frame 0)
@@ -850,7 +851,7 @@ DestroyModuleConfig FvwmPager:*
 *FvwmPager: WindowColorsets 10 11
 *FvwmPager: Font None
 *FvwmPager: Balloons All
-*FvwmPager: BalloonFont "xft:Iosevka Comfy:Italic:size=14:antialias=True"
+*FvwmPager: BalloonFont "xft:Comic Code:Italic:size=14:antialias=True"
 *FvwmPager: BallonYOffset +2
 *FvwmPager: Window3dBorders
 # *FvwmPager: MiniIcons
@@ -872,7 +873,7 @@ DestroyModuleConfig FvwmIconMan:*
 *FvwmIconMan: DrawIcons always
 *FvwmIconMan: ReliefThickness 0
 *FvwmIconMan: Format "%t"
-*FvwmIconMan: Font "xft:Iosevka Comfy:size=14:antialias=True"
+*FvwmIconMan: Font "xft:Comic Code:size=14:antialias=True"
 *FvwmIconMan: Action Mouse 0 A ret
 *FvwmIconMan: Action Mouse 1 A sendcommand IconManClick
 *FvwmIconMan: Action Mouse 3 A sendcommand "Menu MenuIconOps"
@@ -913,8 +914,6 @@ AddToFunc SmartPrevPageFlipFocus
 + I Prev (CurrentDesk,AcceptsFocus,!Iconic,Iconifiable) FuncFlipFocusWindow
 + I TestRc (Match) EchoPageNumberIfFull cyan
 
-
-
 DestroyFunc DeiconifyAndRearrange
 AddToFunc DeiconifyAndRearrange
 + C Iconify off
diff --git a/fvwm/.fvwm/fvwmscript/FvwmScript-DateTime b/fvwm/.fvwm/fvwmscript/FvwmScript-DateTime
index 340ea1f..d6ff6b6 100644
--- a/fvwm/.fvwm/fvwmscript/FvwmScript-DateTime
+++ b/fvwm/.fvwm/fvwmscript/FvwmScript-DateTime
@@ -1,6 +1,6 @@
 WindowTitle {DateTime}
 WindowSize  120 65
-Font "xft:Iosevka Comfy:size=14"
+Font "xft:Comic Code:size=16"
 
 Init
  Begin
@@ -27,7 +27,7 @@ Widget 1
 Property
  Position 0 0
  Size 120 20
- Font "xft:Iosevka Comfy:size=14"
+ Font "xft:Comic Code:size=16"
  Type ItemDraw
  Flags NoReliefString
  Title {}
@@ -42,7 +42,7 @@ Widget 2
 Property
  Position 0 20
  Size 120 20
- Font "xft:Iosevka Comfy:size=14"
+ Font "xft:Comic Code:size=16"
  Type ItemDraw
  Flags NoReliefString
  Title {}
diff --git a/fvwm/.fvwm/fvwmscript/org-clock b/fvwm/.fvwm/fvwmscript/org-clock
index 175d0ba..6cc61c6 100644
--- a/fvwm/.fvwm/fvwmscript/org-clock
+++ b/fvwm/.fvwm/fvwmscript/org-clock
@@ -1,6 +1,6 @@
 WindowTitle {Org-Clock}
 WindowSize  1000 30
-Font "xft:Iosevka Comfy Motion:Thin:size=20"
+Font "xft:Comic Code:Thin:size=20"
 
 Init
  Begin
@@ -21,7 +21,7 @@ Widget 1
 Property
  Position 0 0
  Size 1000 30
- Font "xft:Iosevka Comfy Motion:Thin:size=20"
+ Font "xft:Comic Code:Thin:size=20"
  Type ItemDraw
  Flags NoReliefString
  Title {}
diff --git a/fvwm/.fvwm/themes/ef-bio.sys b/fvwm/.fvwm/themes/ef-bio.sys
index 0112170..17349b2 100644
--- a/fvwm/.fvwm/themes/ef-bio.sys
+++ b/fvwm/.fvwm/themes/ef-bio.sys
@@ -1,6 +1,6 @@
 #### Ef Bio FVWM Colorsets
 Colorset 0  fg #cfdfd5, bg #111111, hi, sh, Plain, NoShape
-Colorset 1  fg #808f80, bg #15140d, hi, sh, Plain, NoShape
+Colorset 1  fg #808f80, bg #161916, hi, sh, Plain, NoShape
 Colorset 2  fg #cfdfd5, bg #111111, hi, sh, Plain, NoShape
 Colorset 3  fg #111111, bg #606060, hi #606060, sh #606060, Plain, NoShape
 Colorset 4  fg #111111, bg #808f80, hi #808f80, sh #808f80, Plain, NoShape
diff --git a/xorg/Xresources.arbutus b/xorg/Xresources.arbutus
index 1e29175..914d50d 100644
--- a/xorg/Xresources.arbutus
+++ b/xorg/Xresources.arbutus
@@ -28,17 +28,17 @@ URxvt.background:  [90]#ffead8
 *.color7:       #ffead8
 *.color15:      #ffead8
 
-st.font: Iosevka Comfy-14
+st.font: Comic Code-14
 
 dmenu.background: #ffead8
 dmenu.foreground: #393330
 dmenu.selbackground: #e9a0a0
 dmenu.selforeground: #393330
-dmenu.font: Iosevka Comfy-14
+dmenu.font: Comic Code-14
 
 Nsxiv.window.background: #ffead8
 Nsxiv.window.foreground: #393330
 Nsxiv.mark.foreground: #393330
 Nsxiv.bar.background: #e9a0a0
 Nsxiv.bar.foreground: #393330
-Nsxiv.bar.font: IosevkaComfy-16
+Nsxiv.bar.font: Comic Code-14
diff --git a/xorg/Xresources.autumn b/xorg/Xresources.autumn
index 438fde6..88e4271 100644
--- a/xorg/Xresources.autumn
+++ b/xorg/Xresources.autumn
@@ -28,17 +28,17 @@ URxvt.background:  [90]#0f0e06
 *.color7:       #cfbcba
 *.color15:      #cfbcba
 
-st.font: Iosevka Comfy-14
+st.font: Comic Code-14
 
 dmenu.background: #0f0e06
 dmenu.foreground: #cfbcba
 dmenu.selbackground: #36322f
 dmenu.selforeground: #cfbcba
-dmenu.font: Iosevka Comfy-14
+dmenu.font: Comic Code-14
 
 Nsxiv.window.background: #0f0e06
 Nsxiv.window.foreground: #cfbcba
 Nsxiv.mark.foreground: #cfbcba
 Nsxiv.bar.background: #692a12
 Nsxiv.bar.foreground: #cfbcba
-Nsxiv.bar.font: IosevkaComfy-16
+Nsxiv.bar.font: Comic Code-14
diff --git a/xorg/Xresources.bio b/xorg/Xresources.bio
index a9498e1..114211f 100644
--- a/xorg/Xresources.bio
+++ b/xorg/Xresources.bio
@@ -28,17 +28,17 @@ URxvt.background:  [90]#111111
 *.color7:       #cfdfd5
 *.color15:      #cfdfd5
 
-st.font: Iosevka Comfy-16
+st.font: Comic Code-14
 
 dmenu.background: #111111
 dmenu.foreground: #cfdfd5
 dmenu.selbackground: #00552f
 dmenu.selforeground: #cfdfd5
-dmenu.font: Iosevka Comfy-16
+dmenu.font: Comic Code-14
 
 Nsxiv.window.background: #111111
 Nsxiv.window.foreground: #cfdfd5
 Nsxiv.mark.foreground: #cfdfd5
 Nsxiv.bar.background: #00552f
 Nsxiv.bar.foreground: #cfdfd5
-Nsxiv.bar.font: IosevkaComfy-16
+Nsxiv.bar.font: Comic Code-14
diff --git a/xorg/Xresources.cherie b/xorg/Xresources.cherie
index 078da85..0e57f7a 100644
--- a/xorg/Xresources.cherie
+++ b/xorg/Xresources.cherie
@@ -28,17 +28,17 @@ URxvt.background:  [90]#190a0f
 *.color7:       #d3cfcf
 *.color15:      #d3cfcf
 
-st.font: Iosevka Comfy-14
+st.font: Comic Code-14
 
 dmenu.background: #190a0f
 dmenu.foreground: #d3cfcf
 dmenu.selbackground: #771a4f
 dmenu.selforeground: #d3cfcf
-dmenu.font: Iosevka Comfy-14
+dmenu.font: Comic Code-14
 
 Nsxiv.window.background: #190a0f
 Nsxiv.window.foreground: #d3cfcf
 Nsxiv.mark.foreground: #d3cfcf
 Nsxiv.bar.background: #771a4f
 Nsxiv.bar.foreground: #d3cfcf
-Nsxiv.bar.font: IosevkaComfy-16
+Nsxiv.bar.font: Comic Code-14
diff --git a/xorg/Xresources.cyprus b/xorg/Xresources.cyprus
index d9768ab..929802c 100644
--- a/xorg/Xresources.cyprus
+++ b/xorg/Xresources.cyprus
@@ -28,17 +28,17 @@ URxvt.background:  [90]#fcf7ef
 *.color7:       #fcf7ef
 *.color15:      #fcf7ef
 
-st.font: Iosevka Comfy-14
+st.font: Comic Code-14
 
 dmenu.background: #fcf7ef
 dmenu.foreground: #242521
 dmenu.selbackground: #c0df6f
 dmenu.selforeground: #242521
-dmenu.font: Iosevka Comfy-14
+dmenu.font: Comic Code-14
 
 Nsxiv.window.background: #fcf7ef
 Nsxiv.window.foreground: #242521
 Nsxiv.mark.foreground: #242521
 Nsxiv.bar.background: #c0df6f
 Nsxiv.bar.foreground: #221321
-Nsxiv.bar.font: IosevkaComfy-16
+Nsxiv.bar.font: Comic Code-14
diff --git a/xorg/Xresources.dream b/xorg/Xresources.dream
index daaed98..475517d 100644
--- a/xorg/Xresources.dream
+++ b/xorg/Xresources.dream
@@ -28,17 +28,17 @@ URxvt.background:  [90]#232025
 *.color7:       #efd5c5
 *.color15:      #efd5c5
 
-st.font: Iosevka Comfy-16
+st.font: Comic Code-14
 
 dmenu.background: #232025
 dmenu.foreground: #efd5c5
 dmenu.selbackground: #675072
 dmenu.selforeground: #efd5c5
-dmenu.font: Iosevka Comfy-16
+dmenu.font: Comic Code-14
 
 Nsxiv.window.background: #232025
 Nsxiv.window.foreground: #efd5c5
 Nsxiv.mark.foreground: #efd5c5
 Nsxiv.bar.background: #675072
 Nsxiv.bar.foreground: #efd5c5
-Nsxiv.bar.font: IosevkaComfy-16
+Nsxiv.bar.font: Comic Code-14
diff --git a/xorg/Xresources.elea-dark b/xorg/Xresources.elea-dark
index 4e37ea8..df6192c 100644
--- a/xorg/Xresources.elea-dark
+++ b/xorg/Xresources.elea-dark
@@ -28,17 +28,17 @@ URxvt.background:  [90]#222524
 *.color7:       #eaf2ef
 *.color15:      #eaf2ef
 
-st.font: Iosevka Comfy-16
+st.font: Comic Code-14
 
 dmenu.background: #222524
 dmenu.foreground: #eaf2ef
 dmenu.selbackground: #35605d
 dmenu.selforeground: #eaf2ef
-dmenu.font: Iosevka Comfy-16
+dmenu.font: Comic Code-14
 
 Nsxiv.window.background: #222524
 Nsxiv.window.foreground: #eaf2ef
 Nsxiv.mark.foreground: #eaf2ef
 Nsxiv.bar.background: #35605d
 Nsxiv.bar.foreground: #eaf2ef
-Nsxiv.bar.font: IosevkaComfy-16
-\ No newline at end of file
+Nsxiv.bar.font: Comic Code-14
+\ No newline at end of file
diff --git a/xorg/Xresources.elea-light b/xorg/Xresources.elea-light
index e5ddf05..0e14ed7 100644
--- a/xorg/Xresources.elea-light
+++ b/xorg/Xresources.elea-light
@@ -28,17 +28,17 @@ URxvt.background:  [90]#edf5e2
 *.color7:       #edf5e2
 *.color15:      #edf5e2
 
-st.font: Iosevka Comfy-14
+st.font: Comic Code-14
 
 dmenu.background: #edf5e2
 dmenu.foreground: #221321
 dmenu.selbackground: #a5c67f
 dmenu.selforeground: #221321
-dmenu.font: Iosevka Comfy-14
+dmenu.font: Comic Code-14
 
 Nsxiv.window.background: #edf5e2
 Nsxiv.window.foreground: #221321
 Nsxiv.mark.foreground: #221321
 Nsxiv.bar.background: #a5c67f
 Nsxiv.bar.foreground: #221321
-Nsxiv.bar.font: IosevkaComfy-16
+Nsxiv.bar.font: Comic Code-14
diff --git a/xorg/Xresources.maris-dark b/xorg/Xresources.maris-dark
index 1e9442b..8481b6d 100644
--- a/xorg/Xresources.maris-dark
+++ b/xorg/Xresources.maris-dark
@@ -28,17 +28,17 @@ URxvt.background:  [90]#131c2b
 *.color7:       #eaedef
 *.color15:      #eaedef
 
-st.font: Iosevka Comfy-14
+st.font: Comic Code-14
 
 dmenu.background: #131c2b
 dmenu.foreground: #eaedef
 dmenu.selbackground: #2f527b
 dmenu.selforeground: #eaedef
-dmenu.font: Iosevka Comfy-14
+dmenu.font: Comic Code-14
 
 Nsxiv.window.background: #131c2b
 Nsxiv.window.foreground: #eaedef
 Nsxiv.mark.foreground: #eaedef
 Nsxiv.bar.background: #2f527b
 Nsxiv.bar.foreground: #eaedef
-Nsxiv.bar.font: IosevkaComfy-16
+Nsxiv.bar.font: Comic Code-14
diff --git a/xorg/Xresources.maris-light b/xorg/Xresources.maris-light
index 2aa1d58..0b876b9 100644
--- a/xorg/Xresources.maris-light
+++ b/xorg/Xresources.maris-light
@@ -28,17 +28,17 @@ URxvt.background:  [90]#edf4f8
 *.color7:       #edf4f8
 *.color15:      #edf4f8
 
-st.font: Iosevka Comfy-16
+st.font: Comic Code-14
 
 dmenu.background: #edf4f8
 dmenu.foreground: #151a27
 dmenu.selbackground: #a0c2ef
 dmenu.selforeground: #151a27
-dmenu.font: Iosevka Comfy-16
+dmenu.font: Comic Code-14
 
 Nsxiv.window.background: #edf4f8
 Nsxiv.window.foreground: #151a27
 Nsxiv.mark.foreground: #151a27
 Nsxiv.bar.background: #a0c2ef
 Nsxiv.bar.foreground: #151a27
-Nsxiv.bar.font: IosevkaComfy-14
+Nsxiv.bar.font: Comic Code-14
diff --git a/xorg/Xresources.melissa-dark b/xorg/Xresources.melissa-dark
index 038515d..949284e 100644
--- a/xorg/Xresources.melissa-dark
+++ b/xorg/Xresources.melissa-dark
@@ -1,4 +1,4 @@
-!! Ef Melissa Dark Xresources theme
+!!!!! Ef Melissa Dark Xresources theme
 *.foreground:      #e8e4b1
 *.background:      #352718	
 URxvt.background:  [90]#352718
diff --git a/xorg/Xresources.melissa-light b/xorg/Xresources.melissa-light
index e263ed7..aeb36e6 100644
--- a/xorg/Xresources.melissa-light
+++ b/xorg/Xresources.melissa-light
@@ -28,17 +28,17 @@ URxvt.background:  [90]#fff6d8
 *.color7:       #fff6d8
 *.color15:      #fff6d8
 
-st.font: Iosevka Comfy-16
+st.font: Comic Code-14
 
 dmenu.background: #fff6d8
 dmenu.foreground: #484431
 dmenu.selbackground: #f3cf72
 dmenu.selforeground: #484431
-dmenu.font: Iosevka Comfy-16
+dmenu.font: Comic Code-14
 
 Nsxiv.window.background: #fff6d8
 Nsxiv.window.foreground: #484431
 Nsxiv.mark.foreground: #484431
 Nsxiv.bar.background: #f3cf72
 Nsxiv.bar.foreground: #484431
-Nsxiv.bar.font: IosevkaComfy-16
+Nsxiv.bar.font: Comic Code-14
diff --git a/xorg/Xresources.night b/xorg/Xresources.night
index ab9abef..02017a8 100644
--- a/xorg/Xresources.night
+++ b/xorg/Xresources.night
@@ -28,17 +28,17 @@ URxvt.background:  [90]#000e17
 *.color7:       #afbcbf
 *.color15:      #afbcbf
 
-st.font: Iosevka Comfy-14
+st.font: Comic Code-14
 
 dmenu.background: #000e17
 dmenu.foreground: #afbcbf
 dmenu.selbackground: #003a7f
 dmenu.selforeground: #afbcbf
-dmenu.font: Iosevka Comfy-14
+dmenu.font: Comic Code-14
 
 Nsxiv.window.background: #000e17
 Nsxiv.window.foreground: #afbcbf
 Nsxiv.mark.foreground: #afbcbf
 Nsxiv.bar.background: #003a7f
 Nsxiv.bar.foreground: #afbcbf
-Nsxiv.bar.font: IosevkaComfy-16
+Nsxiv.bar.font: Comic Code-14
diff --git a/xorg/Xresources.operandi b/xorg/Xresources.operandi
index d9c4dad..fedbf89 100644
--- a/xorg/Xresources.operandi
+++ b/xorg/Xresources.operandi
@@ -1,4 +1,4 @@
-!! Modus Operandi Tinted Xresources theme
+!!!! Modus Operandi Tinted Xresources theme
 *.foreground:      #000000
 *.background:      #ffffff
 URxvt.background:  [90]#ffffff	
@@ -32,3 +32,10 @@ dmenu.background: #ffffff
 dmenu.foreground: #000000
 dmenu.selbackground: #c8c8c8
 dmenu.selforeground: #000000
+
+Nsxiv.window.background: #ffffff
+Nsxiv.window.foreground: #000000
+Nsxiv.mark.foreground: #000000
+Nsxiv.bar.background: #c8c8c8
+Nsxiv.bar.foreground: #000000
+Nsxiv.bar.font: Comic Code-14
diff --git a/xorg/Xresources.operandi-tinted b/xorg/Xresources.operandi-tinted
index 40a4b92..983567d 100644
--- a/xorg/Xresources.operandi-tinted
+++ b/xorg/Xresources.operandi-tinted
@@ -1,4 +1,4 @@
-!! Modus Operandi Tinted Xresources theme
+!!!!! Modus Operandi Tinted Xresources theme
 *.foreground:      #000000
 *.background:      #fbf7f0
 URxvt.background:  [90]#fbf7f0	
diff --git a/xorg/Xresources.spring b/xorg/Xresources.spring
index e0dc13d..ef19af9 100644
--- a/xorg/Xresources.spring
+++ b/xorg/Xresources.spring
@@ -1,4 +1,4 @@
-! Ef Spring Xresources theme
+!!!!! Ef Spring Xresources theme
 *.foreground:      #34494a
 *.background:      #f6fff9
 URxvt.background:  [90]#f6fff9
@@ -8,22 +8,22 @@ URxvt.background:  [90]#f6fff9
 *.color8:       #90918a
 ! red
 *.color1:       #c42d2f
-*.color9:       #c42d2f
+*.color9:       #cf2f4f
 ! green
 *.color2:       #1a870f
-*.color10:      #1a870f
+*.color10:      #007f68
 ! yellow
-*.color3:       #a45f22
+*.color3:       #b6540f
 *.color11:      #a45f22
 ! blue
-*.color4:       #375cc6
-*.color12:      #375cc6
+*.color4:       #5f5fdf
+*.color12:      #265fbf
 ! magenta
 *.color5:       #d5206f
-*.color13:      #d5206f
+*.color13:      #9435b4
 ! cyan
 *.color6:       #1f6fbf
-*.color14:      #1f6fbf
+*.color14:      #0f7b8f
 ! white
 *.color7:       #34494a
 *.color15:      #34494a
diff --git a/xorg/Xresources.vivendi b/xorg/Xresources.vivendi
index 3b3c644..3787a21 100644
--- a/xorg/Xresources.vivendi
+++ b/xorg/Xresources.vivendi
@@ -28,17 +28,17 @@ URxvt.background:  [90]#000000
 *.color7:       #ffffff
 *.color15:      #ffffff
 
-st.font: Iosevka Comfy-14
+st.font: Comic Code-14
 
 dmenu.background: #000000
 dmenu.foreground: #ffffff
 dmenu.selbackground: #535353
 dmenu.selforeground: #ffffff
-dmenu.font: Iosevka Comfy-14
+dmenu.font: Comic Code-14
 
 Nsxiv.window.background: #000000
 Nsxiv.window.foreground: #ffffff
 Nsxiv.mark.foreground: #ffffff
 Nsxiv.bar.background: #505050
 Nsxiv.bar.foreground: #ffffff
-Nsxiv.bar.font: IosevkaComfy-16
+Nsxiv.bar.font: Comic Code-14