diff --git a/dunst/.config/dunst/dunstrc b/dunst/.config/dunst/dunstrc
index c96fb29..26e94b8 100644
--- a/dunst/.config/dunst/dunstrc
+++ b/dunst/.config/dunst/dunstrc
@@ -111,7 +111,7 @@
     frame_width = 2
 
     # Defines color of the frame around the notification window.
-    frame_color = "#f5c2e7"
+    frame_color = "#fabd2f"
 
     # Size of gap to display between notifications - requires a compositor.
     # If value is greater than 0, separator_height will be ignored and a border
@@ -347,30 +347,23 @@
     pause_on_mouse_over = false
 
 
+[global]
+separator_color=frame
+
 [urgency_low]
-    # IMPORTANT: colors have to be defined in quotation marks.
-    # Otherwise the "#" and following would be interpreted as a comment.
-    background = "#1e1e2e"
-    foreground = "#cdd6f4"
-    timeout = 5
-    # Icon for notifications with low urgency
-    default_icon = dialog-information
+background = "#282828"
+foreground = "#ebdbb2"
+frame_color = "#fabd2f"
 
 [urgency_normal]
-    background = "#1e1e2e"
-    foreground = "#cdd6f4"
-    timeout = 5
-    override_pause_level = 30
-    # Icon for notifications with normal urgency
-    default_icon = dialog-information
+background = "#282828"
+foreground = "#ebdbb2"
+frame_color = "#fabd2f"
 
 [urgency_critical]
-    background = "#fab387"
-    foreground = "#cdd6f4"
-    timeout = 5
-    override_pause_level = 60
-    # Icon for notifications with critical urgency
-    default_icon = dialog-warning
+background = "#3c1f1e"
+foreground = "#ddc7a1"
+frame_color = "#ea6962"
 
 # Every section that isn't one of the above is interpreted as a rules to
 # override settings for certain messages.
diff --git a/foot/.config/foot/foot.ini b/foot/.config/foot/foot.ini
index d6fc844..dd2747f 100644
--- a/foot/.config/foot/foot.ini
+++ b/foot/.config/foot/foot.ini
@@ -6,21 +6,22 @@ pad=4x2 center
 blink=yes
 
 [colors-dark]
-foreground=cdd6f4 # Text
-background=1e1e2e # Base
-regular0=45475a   # Surface 1
-regular1=f38ba8   # red
-regular2=a6e3a1   # green
-regular3=f9e2af   # yellow
-regular4=89b4fa   # blue
-regular5=f5c2e7   # pink
-regular6=94e2d5   # teal
-regular7=bac2de   # Subtext 1
-bright0=585b70    # Surface 2
-bright1=f38ba8    # red
-bright2=a6e3a1    # green
-bright3=f9e2af    # yellow
-bright4=89b4fa    # blue
-bright5=f5c2e7    # pink
-bright6=94e2d5    # teal
-bright7=a6adc8    # Subtext 0
+alpha=0.9
+background=282828
+foreground=ebdbb2
+regular0=282828
+regular1=cc241d
+regular2=98971a
+regular3=d79921
+regular4=458588
+regular5=b16286
+regular6=689d6a
+regular7=a89984
+bright0=928374
+bright1=fb4934
+bright2=b8bb26
+bright3=fabd2f
+bright4=83a598
+bright5=d3869b
+bright6=8ec07c
+bright7=ebdbb2
diff --git a/river-classic/.config/river/init b/river-classic/.config/river/init
index 0f98927..4ee0f4f 100755
--- a/river-classic/.config/river/init
+++ b/river-classic/.config/river/init
@@ -133,9 +133,9 @@ done
 riverctl map normal $mod+ctrl C spawn "$config/toggle_caffeine.sh"
 
 # colors
-riverctl background-color 0x1e1e2e
-riverctl border-color-focused 0xf5c2e7
-riverctl border-color-unfocused 0x586e75
+riverctl background-color 0x282828
+riverctl border-color-focused 0xfabd2f
+riverctl border-color-unfocused 0x928374
 riverctl border-width 2
 
 # options
@@ -180,7 +180,7 @@ riverctl rule-add -app-id org.pwmt.zathura ssd
 riverctl rule-add -app-id com.github.xournalpp.xournalpp ssd
 
 # spawn stuff
-pgrep swaybg || swaybg -i ~/.config/river/wallpaper.jpg &
+pgrep swaybg || swaybg -i ~/.config/river/wallpaper.png &
 wlr-randr --output eDP-1 --scale 1.25 &
 pgrep waybar || waybar &
 
diff --git a/river-classic/.config/river/wallpaper.jpg b/river-classic/.config/river/wallpaper.jpg
deleted file mode 100644
index 9ca0c04..0000000
Binary files a/river-classic/.config/river/wallpaper.jpg and /dev/null differ
diff --git a/river-classic/.config/river/wallpaper.png b/river-classic/.config/river/wallpaper.png
new file mode 100644
index 0000000..3ea6e34
Binary files /dev/null and b/river-classic/.config/river/wallpaper.png differ
diff --git a/scripts/.local/bin/books.sh b/scripts/.local/bin/books.sh
index f8f8079..efb73a0 100755
--- a/scripts/.local/bin/books.sh
+++ b/scripts/.local/bin/books.sh
@@ -3,7 +3,7 @@
 prefix=$HOME/Nextcloud/Books/
 # dmenu="pipemenu --title Books"
 # dmenu="fuzzel -d -p books -w 80"
-dmenu="bemenu -p books --center --list 20 down --width-factor 0.5 --border 2 --bdr #f6c2e7"
+dmenu="bemenu -p books --center --list 20 down --width-factor 0.5 --border 2 --bdr #fabd2f"
 # pdf=zathura
 pdf=sioyek
 # pdf="flatpak run org.gnome.Papers"
diff --git a/scripts/.local/bin/papers.sh b/scripts/.local/bin/papers.sh
index 3271fe4..698e0dd 100755
--- a/scripts/.local/bin/papers.sh
+++ b/scripts/.local/bin/papers.sh
@@ -1,9 +1,7 @@
 #!/bin/sh
 
 prefix=$HOME/Nextcloud/Papers/
-# dmenu="pipemenu --title Books"
-# dmenu="fuzzel -d -p books -w 80"
-dmenu="bemenu -p papers --center --list 20 down --width-factor 0.5 --border 2 --bdr #f6c2e7"
+dmenu="bemenu -p papers --center --list 20 down --width-factor 0.5 --border 2 --bdr #fabd2f"
 # pdf=zathura
 pdf=sioyek
 # pdf="flatpak run org.gnome.Papers"
diff --git a/sioyek/.config/sioyek/prefs_user.config b/sioyek/.config/sioyek/prefs_user.config
index 958e7dd..ccebfbb 100644
--- a/sioyek/.config/sioyek/prefs_user.config
+++ b/sioyek/.config/sioyek/prefs_user.config
@@ -222,6 +222,19 @@ prerender_next_page_presentation 1
 # Use case-insensitive search
 #case_sensitive_search 0
 
+
+
+custom_color_contrast 0.3
+custom_color_mode_empty_background_color #1d2021
+page_separator_color #1d2021
+page_separator_width 10
+custom_background_color #282828
+custom_text_color #fbf1c7
+search_highlight_color #7ec16e
+status_bar_color #427b58
+status_bar_text_color #fbf1c7
+
+
 #Amethyst
 highlight_color_a	0.94 0.64 1.00
 #Blue
@@ -277,32 +290,32 @@ highlight_color_z	1.00 0.31 0.02
 
 
 
-# === CATPPUCCIN MOCHA === #
-background_color           #1e1e2e
+# # === CATPPUCCIN MOCHA === #
+# background_color           #1e1e2e
 
-text_highlight_color       #f9e2af
-visual_mark_color          #7f849c
+# text_highlight_color       #f9e2af
+# visual_mark_color          #7f849c
 
-search_highlight_color     #f9e2af
-link_highlight_color       #89b4fa
-synctex_highlight_color    #a6e3a1
+# search_highlight_color     #f9e2af
+# link_highlight_color       #89b4fa
+# synctex_highlight_color    #a6e3a1
 
-highlight_color_a          #f9e2af
-highlight_color_b          #a6e3a1
-highlight_color_c          #89dceb
-highlight_color_d          #eba0ac
-highlight_color_e          #cba6f7
-highlight_color_f          #f38ba8
-highlight_color_g          #f9e2af
+# highlight_color_a          #f9e2af
+# highlight_color_b          #a6e3a1
+# highlight_color_c          #89dceb
+# highlight_color_d          #eba0ac
+# highlight_color_e          #cba6f7
+# highlight_color_f          #f38ba8
+# highlight_color_g          #f9e2af
 
 
-custom_background_color    #1e1e2e
-custom_text_color          #cdd6f4
+# custom_background_color    #1e1e2e
+# custom_text_color          #cdd6f4
 
-ui_text_color              #cdd6f4
-ui_background_color        #313244
-ui_selected_text_color     #cdd6f4
-ui_selected_background_color #585b70
+# ui_text_color              #cdd6f4
+# ui_background_color        #313244
+# ui_selected_text_color     #cdd6f4
+# ui_selected_background_color #585b70
 
-status_bar_color           #313244
-status_bar_text_color      #cdd6f4
+# status_bar_color           #313244
+# status_bar_text_color      #cdd6f4
diff --git a/swaylock/.config/swaylock/config b/swaylock/.config/swaylock/config
index b7f6d26..f0c48aa 100644
--- a/swaylock/.config/swaylock/config
+++ b/swaylock/.config/swaylock/config
@@ -1,29 +1,32 @@
-color=1e1e2e
-bs-hl-color=f5e0dc
-caps-lock-bs-hl-color=f5e0dc
-caps-lock-key-hl-color=a6e3a1
+color=282828
+bs-hl-color=ebdbb2
+caps-lock-bs-hl-color=ebdbb2
+caps-lock-key-hl-color=b8bb26
 inside-color=00000000
 inside-clear-color=00000000
 inside-caps-lock-color=00000000
 inside-ver-color=00000000
 inside-wrong-color=00000000
-key-hl-color=a6e3a1
+key-hl-color=b8bb26
 layout-bg-color=00000000
 layout-border-color=00000000
-layout-text-color=cdd6f4
+layout-text-color=ebdbb2
 line-color=00000000
 line-clear-color=00000000
 line-caps-lock-color=00000000
 line-ver-color=00000000
 line-wrong-color=00000000
-ring-color=b4befe
-ring-clear-color=f5e0dc
-ring-caps-lock-color=fab387
-ring-ver-color=89b4fa
-ring-wrong-color=eba0ac
+ring-color=83a598
+ring-clear-color=ebdbb2
+ring-caps-lock-color=fe8019
+ring-ver-color=83a598
+ring-wrong-color=fb4934
 separator-color=00000000
-text-color=cdd6f4
-text-clear-color=f5e0dc
-text-caps-lock-color=fab387
-text-ver-color=89b4fa
-text-wrong-color=eba0ac
+text-color=ebdbb2
+text-clear-color=ebdbb2
+text-caps-lock-color=fe8019
+text-ver-color=83a598
+text-wrong-color=fb4934
+
+font=Iosevka Nerd Font
+font-size=35
diff --git a/waybar/.config/waybar/mocha.css b/waybar/.config/waybar/mocha.css
deleted file mode 100644
index 98e218a..0000000
--- a/waybar/.config/waybar/mocha.css
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-*
-* Catppuccin Mocha palette
-* Maintainer: rubyowo
-*
-*/
-
-@define-color base   #1e1e2e;
-@define-color mantle #181825;
-@define-color crust  #11111b;
-
-@define-color text     #cdd6f4;
-@define-color subtext0 #a6adc8;
-@define-color subtext1 #bac2de;
-
-@define-color surface0 #313244;
-@define-color surface1 #45475a;
-@define-color surface2 #585b70;
-
-@define-color overlay0 #6c7086;
-@define-color overlay1 #7f849c;
-@define-color overlay2 #9399b2;
-
-@define-color blue      #89b4fa;
-@define-color lavender  #b4befe;
-@define-color sapphire  #74c7ec;
-@define-color sky       #89dceb;
-@define-color teal      #94e2d5;
-@define-color green     #a6e3a1;
-@define-color yellow    #f9e2af;
-@define-color peach     #fab387;
-@define-color maroon    #eba0ac;
-@define-color red       #f38ba8;
-@define-color mauve     #cba6f7;
-@define-color pink      #f5c2e7;
-@define-color flamingo  #f2cdcd;
-@define-color rosewater #f5e0dc;
diff --git a/waybar/.config/waybar/style.css b/waybar/.config/waybar/style.css
index 69e5871..538d075 100644
--- a/waybar/.config/waybar/style.css
+++ b/waybar/.config/waybar/style.css
@@ -1,64 +1,62 @@
-@import "mocha.css";
-
 * {
 	font-size: 20px;
 	font-family: Iosevka Nerd Font;
-    border-radius: 0;
+	border-radius: 0;
 }
 
 window#waybar {
-    background: rgba(30, 30, 40, 1);
-	color: @text;
+	background: #282828;
+	color: #ebdbb2;
 }
 
 #workspaces button {
-    color: @text;
+	color: #ebdbb2;
 }
 
 #workspaces button.focused {
-    color: @pink;
+	color: #fabd2f;
 }
 
 #tags button {
-    color: @text;
+	color: #ebdbb2;
 }
 
 #tags button.occupied {
-    color: @yellow;
+	color: #fe8019;
 }
 
 #tags button.focused {
-    color: @base;
-    background: @pink;
+	color: #282828;
+	background: #fabd2f;
 }
 
 #tags button.urgent {
-    color: @base;
-    background: @red;
+	color: #282828;
+	background: #fb4934;
 }
 
 #clock,
 #pulseaudio,
 #battery,
 #tray {
-    background: transparent;
+	background: transparent;
 }
 
 #language {
-    color: @yellow;
+	color: #fabd2f;
 }
 
 #wireplumber,
 #pulseaudio {
-	color: @red;
+	color: #fb4934;
 }
 
 #network {
-    color: @green;
+	color: #b8bb26;
 }
 
 #battery {
-	color: @blue;
+	color: #83a598;
 }
 
 #clock,
diff --git a/zathura/.config/zathura/gruvbox-dark b/zathura/.config/zathura/gruvbox-dark
new file mode 100644
index 0000000..c69ed2d
--- /dev/null
+++ b/zathura/.config/zathura/gruvbox-dark
@@ -0,0 +1,40 @@
+set notification-error-bg       "rgba(40,40,40,1)"     # bg
+set notification-error-fg       "rgba(251,73,52,1)"    # bright:red
+set notification-warning-bg     "rgba(40,40,40,1)"     # bg
+set notification-warning-fg     "rgba(250,189,47,1)"   # bright:yellow
+set notification-bg             "rgba(40,40,40,1)"     # bg
+set notification-fg             "rgba(184,187,38,1)"   # bright:green
+
+set completion-bg               "rgba(80,73,69,1)"     # bg2
+set completion-fg               "rgba(235,219,178,1)"  # fg
+set completion-group-bg         "rgba(60,56,54,1)"     # bg1
+set completion-group-fg         "rgba(146,131,116,1)"  # gray
+set completion-highlight-bg     "rgba(131,165,152,1)"  # bright:blue
+set completion-highlight-fg     "rgba(80,73,69,1)"     # bg2
+
+# Define the color in index mode
+set index-bg                    "rgba(80,73,69,1)"     # bg2
+set index-fg                    "rgba(235,219,178,1)"  # fg
+set index-active-bg             "rgba(131,165,152,1)"  # bright:blue
+set index-active-fg             "rgba(80,73,69,1)"     # bg2
+
+set inputbar-bg                 "rgba(40,40,40,1)"     # bg
+set inputbar-fg                 "rgba(235,219,178,1)"  # fg
+
+set statusbar-bg                "rgba(80,73,69,1)"     # bg2
+set statusbar-fg                "rgba(235,219,178,1)"  # fg
+
+set highlight-color             "rgba(250,189,47,0.5)" # bright:yellow
+set highlight-active-color      "rgba(254,128,25,0.5)" # bright:orange
+
+set default-bg                  "rgba(40,40,40,1)"     # bg
+set default-fg                  "rgba(235,219,178,1)"  # fg
+set render-loading              true
+set render-loading-bg           "rgba(40,40,40,1)"     # bg
+set render-loading-fg           "rgba(235,219,178,1)"  # fg
+
+# Recolor book content's color
+set recolor-lightcolor          "rgba(40,40,40,1)"     # bg
+set recolor-darkcolor           "rgba(235,219,178,1)"  # fg
+set recolor                     "true"
+set recolor-keephue             "true"                 # keep original color
diff --git a/zathura/.config/zathura/zathurarc b/zathura/.config/zathura/zathurarc
index 5ad7b38..de561f8 100644
--- a/zathura/.config/zathura/zathurarc
+++ b/zathura/.config/zathura/zathurarc
@@ -1,4 +1,5 @@
-include catppuccin-mocha
+# include catppuccin-mocha
+include gruvbox-dark
 
 map ,r recolor
 
diff --git a/zsh/.config/zsh/.zprofile b/zsh/.config/zsh/.zprofile
index b750927..2f41838 100644
--- a/zsh/.config/zsh/.zprofile
+++ b/zsh/.config/zsh/.zprofile
@@ -4,7 +4,8 @@
 export PATH="$HOME/.local/share/cargo/bin:$HOME/.cache/cabal/bin:$HOME/.local/bin:$HOME/j9.5/bin:$HOME/.local/share/rustup/toolchains/stable-x86_64-unknown-linux-gnu/bin:/usr/lib/smlnj/bin:$HOME/.config/emacs/bin:$HOME/.elan/bin:$HOME/.local/share/pack/bin:$PATH"
 
 # Bemenu
-export BEMENU_OPTS='--ignorecase --fb "#1e1e2e" --ff "#cdd6f4" --nb "#1e1e2e" --nf "#cdd6f4" --tb "#1e1e2e" --hb "#1e1e2e" --tf "#f5c2e7" --hf "#f9e2af" --af "#cdd6f4" --ab "#1e1e2e" --fn "Iosevka Nerd Font 16" --no-overlap --wrap'
+export BEMENU_OPTS='--ignorecase --fb "#282828" --ff "#ebdbb2" --nb "#282828" --nf "#ebdbb2" --tb "#282828" --hb "#282828" --tf "#fb4934" --hf "#fabd2f" --nf "#ebdbb2" --af "#ebdbb2" --ab "#282828" --fn "Iosevka Nerd Font 16" --no-overlap --wrap'
+# export BEMENU_OPTS='--ignorecase --fb "#1e1e2e" --ff "#cdd6f4" --nb "#1e1e2e" --nf "#cdd6f4" --tb "#1e1e2e" --hb "#1e1e2e" --tf "#f5c2e7" --hf "#f9e2af" --af "#cdd6f4" --ab "#1e1e2e" --fn "Iosevka Nerd Font 16" --no-overlap --wrap'
 
 # XDG directories
 export XDG_CACHE_HOME="$HOME/.cache"
@@ -12,6 +13,8 @@ export XDG_CONFIG_HOME="$HOME/.config"
 export XDG_DATA_HOME="$HOME/.local/share"
 export XDG_MUSIC_DIR="$HOME/Nextcloud/Music"
 
+export BAT_THEME="gruvbox-dark"
+
 # General environment variables
 export EDITOR=nvim
 export VISUAL=nvim