diff --git a/dunst/.config/dunst/dunstrc b/dunst/.config/dunst/dunstrc
index 26e94b8..c96fb29 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 = "#fabd2f"
+    frame_color = "#f5c2e7"
 
     # 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,23 +347,30 @@
     pause_on_mouse_over = false
 
 
-[global]
-separator_color=frame
-
 [urgency_low]
-background = "#282828"
-foreground = "#ebdbb2"
-frame_color = "#fabd2f"
+    # 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
 
 [urgency_normal]
-background = "#282828"
-foreground = "#ebdbb2"
-frame_color = "#fabd2f"
+    background = "#1e1e2e"
+    foreground = "#cdd6f4"
+    timeout = 5
+    override_pause_level = 30
+    # Icon for notifications with normal urgency
+    default_icon = dialog-information
 
 [urgency_critical]
-background = "#3c1f1e"
-foreground = "#ddc7a1"
-frame_color = "#ea6962"
+    background = "#fab387"
+    foreground = "#cdd6f4"
+    timeout = 5
+    override_pause_level = 60
+    # Icon for notifications with critical urgency
+    default_icon = dialog-warning
 
 # Every section that isn't one of the above is interpreted as a rules to
 # override settings for certain messages.
diff --git a/emacs/.config/emacs/Emacs.org b/emacs/.config/emacs/Emacs.org
index de22fee..64454a0 100644
--- a/emacs/.config/emacs/Emacs.org
+++ b/emacs/.config/emacs/Emacs.org
@@ -139,10 +139,10 @@
 #+end_src
 *** Catpuccin
 #+begin_src emacs-lisp
-  ;; (use-package catppuccin-theme
-  ;;   :init (setq catppuccin-flavor 'mocha)
-  ;;   :config
-  ;;   (load-theme 'catppuccin :no-confirm))
+  (use-package catppuccin-theme
+    :init (setq catppuccin-flavor 'mocha)
+    :config
+    (load-theme 'catppuccin :no-confirm))
 #+end_src
 *** Solaire
 #+begin_src emacs-lisp
diff --git a/foot/.config/foot/foot.ini b/foot/.config/foot/foot.ini
index ad85630..d3c1f66 100644
--- a/foot/.config/foot/foot.ini
+++ b/foot/.config/foot/foot.ini
@@ -6,22 +6,36 @@ pad=4x2 center
 blink=yes
 
 [colors-dark]
-alpha=0.99
-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
+cursor=11111b f5e0dc
+foreground=cdd6f4
+background=1e1e2e
+
+regular0=45475a
+regular1=f38ba8
+regular2=a6e3a1
+regular3=f9e2af
+regular4=89b4fa
+regular5=f5c2e7
+regular6=94e2d5
+regular7=bac2de
+
+bright0=585b70
+bright1=f38ba8
+bright2=a6e3a1
+bright3=f9e2af
+bright4=89b4fa
+bright5=f5c2e7
+bright6=94e2d5
+bright7=a6adc8
+
+16=fab387
+17=f5e0dc
+
+selection-foreground=cdd6f4
+selection-background=414356
+
+search-box-no-match=11111b f38ba8
+search-box-match=cdd6f4 313244
+
+jump-labels=11111b fab387
+urls=89b4fa
diff --git a/river-classic/.config/river/init b/river-classic/.config/river/init
index 4ee0f4f..e1a9de6 100755
--- a/river-classic/.config/river/init
+++ b/river-classic/.config/river/init
@@ -26,10 +26,10 @@ riverctl map normal $mod T spawn "$email"
 riverctl map normal $mod Z spawn "$books"
 riverctl map normal $mod Y spawn "$papers"
 riverctl map normal $mod E spawn "$emacs"
-riverctl map normal $mod+ctrl O spawn "swaylock"
+riverctl map normal $mod+Control O spawn "swaylock"
 riverctl map normal $mod B spawn "$config/bluetooth.sh --connect"
 riverctl map normal $mod+Shift B spawn "$config/bluetooth.sh --disconnect"
-riverctl map normal $mod+ctrl S spawn "$config/screenshot.sh clip"
+riverctl map normal $mod+Control S spawn "$config/screenshot.sh clip"
 riverctl map normal $mod+Shift E spawn "$config/screenshot.sh menu"
 
 # Close windows & exit wm
@@ -63,10 +63,10 @@ riverctl map normal $mod+Alt J move down 100
 riverctl map normal $mod+Alt K move up 100
 riverctl map normal $mod+Alt L move right 100
 
-riverctl map normal $mod+Alt+ctrl H snap left
-riverctl map normal $mod+Alt+ctrl J snap down
-riverctl map normal $mod+Alt+ctrl K snap up
-riverctl map normal $mod+Alt+ctrl L snap right
+riverctl map normal $mod+Alt+Control H snap left
+riverctl map normal $mod+Alt+Control J snap down
+riverctl map normal $mod+Alt+Control K snap up
+riverctl map normal $mod+Alt+Control L snap right
 
 riverctl map normal $mod+Alt+Shift H resize horizontal -100
 riverctl map normal $mod+Alt+Shift J resize vertical 100
@@ -84,8 +84,8 @@ do
 
     riverctl map normal $mod $i set-focused-tags $tags
     riverctl map normal $mod+Shift $i set-view-tags $tags
-    riverctl map normal $mod+ctrl $i toggle-focused-tags $tags
-    riverctl map normal $mod+Shift+ctrl $i toggle-view-tags $tags
+    riverctl map normal $mod+Control $i toggle-focused-tags $tags
+    riverctl map normal $mod+Shift+Control $i toggle-view-tags $tags
 done
 
 all_tags=$(((1 << 32) - 1))
@@ -97,10 +97,10 @@ riverctl map normal $mod Space toggle-float
 riverctl map normal $mod F toggle-fullscreen
 
 # change layout orientation
-riverctl map normal $mod+ctrl K send-layout-cmd rivertile "main-location top"
-riverctl map normal $mod+ctrl L send-layout-cmd rivertile "main-location right"
-riverctl map normal $mod+ctrl J send-layout-cmd rivertile "main-location bottom"
-riverctl map normal $mod+ctrl H send-layout-cmd rivertile "main-location left"
+riverctl map normal $mod+Control K send-layout-cmd rivertile "main-location top"
+riverctl map normal $mod+Control L send-layout-cmd rivertile "main-location right"
+riverctl map normal $mod+Control J send-layout-cmd rivertile "main-location bottom"
+riverctl map normal $mod+Control H send-layout-cmd rivertile "main-location left"
 
 # passthrough mode
 riverctl declare-mode passthrough
@@ -116,8 +116,8 @@ do
     riverctl map $mode None XF86AudioLowerVolume spawn "$config/volume.sh down 0.02"
     riverctl map $mode Shift XF86AudioRaiseVolume spawn "$config/volume.sh up 0.01"
     riverctl map $mode Shift XF86AudioLowerVolume spawn "$config/volume.sh down 0.01"
-    riverctl map $mode ctrl XF86AudioRaiseVolume spawn "$config/volume.sh up 0.10"
-    riverctl map $mode ctrl XF86AudioLowerVolume spawn "$config/volume.sh down 0.10"
+    riverctl map $mode Control XF86AudioRaiseVolume spawn "$config/volume.sh up 0.10"
+    riverctl map $mode Control XF86AudioLowerVolume spawn "$config/volume.sh down 0.10"
     riverctl map $mode None XF86AudioMute exec spawn "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
 
     riverctl map $mode None XF86AudioMedia spawn 'playerctl play-pause'
@@ -130,12 +130,12 @@ do
 done
 
 # "caffeine"
-riverctl map normal $mod+ctrl C spawn "$config/toggle_caffeine.sh"
+riverctl map normal $mod+Control C spawn "$config/toggle_caffeine.sh"
 
 # colors
-riverctl background-color 0x282828
-riverctl border-color-focused 0xfabd2f
-riverctl border-color-unfocused 0x928374
+riverctl background-color 0x1e1e2e
+riverctl border-color-focused 0xf5c2e7
+riverctl border-color-unfocused 0x586e75
 riverctl border-width 2
 
 # options
@@ -165,7 +165,7 @@ riverctl float-filter-add app-id blueman-manager
 scratch_tag=$((1 << 20))
 riverctl map normal $mod Slash toggle-focused-tags $scratch_tag
 riverctl map normal $mod+Shift Slash set-view-tags $scratch_tag
-riverctl map normal $mod+ctrl Slash toggle-view-tags $scratch_tag
+riverctl map normal $mod+Control Slash toggle-view-tags $scratch_tag
 riverctl map normal $mod S spawn "$term_float"
 riverctl rule-add -app-id float float
 
@@ -179,8 +179,14 @@ riverctl rule-add -app-id steam ssd
 riverctl rule-add -app-id org.pwmt.zathura ssd
 riverctl rule-add -app-id com.github.xournalpp.xournalpp ssd
 
+# mpc
+riverctl map normal $mod P spawn 'mpc toggle'
+riverctl map normal $mod+Shift P spawn "$config/music_command.sh --playlist"
+riverctl map normal $mod+Shift S spawn "$config/music_command.sh --song"
+riverctl map normal $mod N spawn 'mpc next'
+
 # spawn stuff
-pgrep swaybg || swaybg -i ~/.config/river/wallpaper.png &
+pgrep swaybg || swaybg -i ~/.config/river/wallpaper.jpg &
 wlr-randr --output eDP-1 --scale 1.25 &
 pgrep waybar || waybar &
 
@@ -201,16 +207,6 @@ emacs --daemon &
 # nextcloud client
 nextcloud &
 
-# pianobar
-# riverctl map normal $mod+Shift S spawn '~/.config/pianobar/change_station.sh'
-# riverctl map normal $mod P spawn 'echo "p" > ~/.config/pianobar/ctl'
-# riverctl map normal $mod N spawn 'echo "n" > ~/.config/pianobar/ctl'
-# riverctl map normal $mod C spawn '~/.config/pianobar/display_info.sh'
-riverctl map normal $mod P spawn 'mpc toggle'
-riverctl map normal $mod+Shift S spawn "$config/music_command.sh --playlist"
-riverctl map normal $mod+ctrl S spawn "$config/music_command.sh --song"
-riverctl map normal $mod N spawn 'mpc next'
-
 # swayidle
 pgrep swayidle || swayidle -w \
     timeout 300 "$config/timeout.sh" \
diff --git a/river-classic/.config/river/wallpaper.jpg b/river-classic/.config/river/wallpaper.jpg
new file mode 100644
index 0000000..9ca0c04
Binary files /dev/null and b/river-classic/.config/river/wallpaper.jpg differ
diff --git a/river-classic/.config/river/wallpaper.png b/river-classic/.config/river/wallpaper.png
deleted file mode 100644
index 3ea6e34..0000000
Binary files a/river-classic/.config/river/wallpaper.png and /dev/null differ
diff --git a/sioyek/.config/sioyek/prefs_user.config b/sioyek/.config/sioyek/prefs_user.config
index ccebfbb..958e7dd 100644
--- a/sioyek/.config/sioyek/prefs_user.config
+++ b/sioyek/.config/sioyek/prefs_user.config
@@ -222,19 +222,6 @@ 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
@@ -290,32 +277,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 f0c48aa..dec6d65 100644
--- a/swaylock/.config/swaylock/config
+++ b/swaylock/.config/swaylock/config
@@ -1,32 +1,32 @@
-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=b8bb26
+color=1e1e2e
+bs-hl-color=f5e0dc
+caps-lock-bs-hl-color=f5e0dc
+caps-lock-key-hl-color=a6e3a1
+inside-color=1e1e2e
+inside-clear-color=1e1e2e
+inside-caps-lock-color=1e1e2e
+inside-ver-color=1e1e2e
+inside-wrong-color=1e1e2e
+key-hl-color=a6e3a1
 layout-bg-color=00000000
 layout-border-color=00000000
-layout-text-color=ebdbb2
+layout-text-color=cdd6f4
 line-color=00000000
 line-clear-color=00000000
 line-caps-lock-color=00000000
 line-ver-color=00000000
 line-wrong-color=00000000
-ring-color=83a598
-ring-clear-color=ebdbb2
-ring-caps-lock-color=fe8019
-ring-ver-color=83a598
-ring-wrong-color=fb4934
+ring-color=313244
+ring-clear-color=f5e0dc
+ring-caps-lock-color=fab387
+ring-ver-color=89b4fa
+ring-wrong-color=eba0ac
 separator-color=00000000
-text-color=ebdbb2
-text-clear-color=ebdbb2
-text-caps-lock-color=fe8019
-text-ver-color=83a598
-text-wrong-color=fb4934
+text-color=cdd6f4
+text-clear-color=f5e0dc
+text-caps-lock-color=fab387
+text-ver-color=89b4fa
+text-wrong-color=eba0ac
 
 font=Iosevka Nerd Font
 font-size=35
diff --git a/waybar/.config/waybar/mocha.css b/waybar/.config/waybar/mocha.css
new file mode 100644
index 0000000..98e218a
--- /dev/null
+++ b/waybar/.config/waybar/mocha.css
@@ -0,0 +1,37 @@
+/*
+*
+* 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 1537065..69e5871 100644
--- a/waybar/.config/waybar/style.css
+++ b/waybar/.config/waybar/style.css
@@ -1,38 +1,40 @@
+@import "mocha.css";
+
 * {
-    font-size: 20px;
-    font-family: Iosevka Nerd Font;
+	font-size: 20px;
+	font-family: Iosevka Nerd Font;
     border-radius: 0;
 }
 
 window#waybar {
-    background: #282828;
-    color: #ebdbb2;
+    background: rgba(30, 30, 40, 1);
+	color: @text;
 }
 
 #workspaces button {
-    color: #ebdbb2;
+    color: @text;
 }
 
 #workspaces button.focused {
-    color: #fabd2f;
+    color: @pink;
 }
 
 #tags button {
-    color: #ebdbb2;
+    color: @text;
 }
 
 #tags button.occupied {
-    color: #fe8019;
+    color: @yellow;
 }
 
 #tags button.focused {
-    color: #282828;
-    background: #fabd2f;
+    color: @base;
+    background: @pink;
 }
 
 #tags button.urgent {
-    color: #282828;
-    background: #fb4934;
+    color: @base;
+    background: @red;
 }
 
 #clock,
@@ -43,20 +45,20 @@ window#waybar {
 }
 
 #language {
-    color: #fabd2f;
+    color: @yellow;
 }
 
 #wireplumber,
 #pulseaudio {
-    color: #fb4934;
+	color: @red;
 }
 
 #network {
-    color: #b8bb26;
+    color: @green;
 }
 
 #battery {
-    color: #83a598;
+	color: @blue;
 }
 
 #clock,
@@ -66,5 +68,5 @@ window#waybar {
 #battery,
 #wireplumber,
 #disk {
-    padding: 0 10px;
+	padding: 0 10px;
 }
diff --git a/wob/.config/wob/wob.ini b/wob/.config/wob/wob.ini
index 4bd6a58..731cacf 100644
--- a/wob/.config/wob/wob.ini
+++ b/wob/.config/wob/wob.ini
@@ -1,3 +1,3 @@
-border_color = fabd2f
-background_color = 282828
-bar_color = ebdbb2
+border_color = f5c2e7
+background_color = 1e1e2e
+bar_color = cdd6f4
diff --git a/zathura/.config/zathura/gruvbox-dark b/zathura/.config/zathura/gruvbox-dark
deleted file mode 100644
index c69ed2d..0000000
--- a/zathura/.config/zathura/gruvbox-dark
+++ /dev/null
@@ -1,40 +0,0 @@
-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 fbf1901..5ad7b38 100644
--- a/zathura/.config/zathura/zathurarc
+++ b/zathura/.config/zathura/zathurarc
@@ -1,4 +1,4 @@
-include gruvbox-dark
+include catppuccin-mocha
 
 map ,r recolor
 
diff --git a/zsh/.config/zsh/.zcompcache/beetscmds b/zsh/.config/zsh/.zcompcache/beetscmds
new file mode 100644
index 0000000..964df5d
Binary files /dev/null and b/zsh/.config/zsh/.zcompcache/beetscmds differ
diff --git a/zsh/.config/zsh/.zcompcache/beetsimport b/zsh/.config/zsh/.zcompcache/beetsimport
new file mode 100644
index 0000000..16f1f78
--- /dev/null
+++ b/zsh/.config/zsh/.zcompcache/beetsimport
@@ -0,0 +1,20 @@
+beets_import='_beet_import () {
+	local _ra_p1 _ra_p2 _ra_left _ra_right _ra_com expl tmp nm="$compstate[nmatches]" 
+	local _ra_actions _ra_line="${(pj:\0:)${(@)words[1,CURRENT - 1]:Q}}"$'\''\0'\''"$PREFIX" 
+	_ra_actions=() 
+	zregexparse -c _ra_p1 _ra_p2 "$_ra_line" $'\''/[^\0]##\0/'\'' $'\''/import\0/'\'' $'\''('\'' $'\''/-h\0/'\'' $'\''|'\'' $'\''/-c\0/'\'' $'\''|'\'' $'\''/-C\0/'\'' $'\''|'\'' $'\''/-m\0/'\'' $'\''|'\'' $'\''/-w\0/'\'' $'\''|'\'' $'\''/-W\0/'\'' $'\''|'\'' $'\''/-a\0/'\'' $'\''|'\'' $'\''/-A\0/'\'' $'\''|'\'' $'\''/-p\0/'\'' $'\''|'\'' $'\''/-P\0/'\'' $'\''|'\'' $'\''/-q\0/'\'' $'\''|'\'' $'\''/--quiet-fallback=QUIET_FALLBACK\0/'\'' $'\''|'\'' $'\''/-l\0/'\'' $'\''/[^\0]##\0/'\'' $'\'':_ra_comp $\'\''file:file:_files\'\'''\'' $'\''|'\'' $'\''/-s\0/'\'' $'\''|'\'' $'\''/-t\0/'\'' $'\''|'\'' $'\''/-L\0/'\'' $'\''('\'' $'\''/(acoustid_fingerprint|acoustid_id|added|album|albumartist|albumartist_credit|albumartists|albumartists_credit|albumartist_sort|albumartists_sort|albumdisambig|album_id|albumstatus|albumtotal|albumtype|albumtypes|arranger|artist|artist_credit|artists|artists_credit|artists_ids|artist_sort|artists_sort|artpath|asin|barcode|bitdepth|bitrate|bitrate_mode|bpm|catalognum|channels|comments|comp|composer|composer_sort|country|data_source|day|disc|discogs_albumid|discogs_artistid|discogs_labelid|disctitle|disctotal|encoder|encoder_info|encoder_settings|filesize|format|genres|grouping|id|initial_key|isrc|label|language|length|lyricist|lyrics|mb_albumartistid|mb_albumartistids|mb_albumid|mb_artistid|mb_artistids|mb_releasegroupid|mb_releasetrackid|mb_trackid|mb_workid|media|month|mtime|original_day|original_month|original_year|path|r128_album_gain|r128_track_gain|releasegroupdisambig|release_group_title|remixer|rg_album_gain|rg_album_peak|rg_track_gain|rg_track_peak|samplerate|script|singleton|style|title|track|track_alt|trackdisambig|tracktotal|work|work_disambig|year):[^\0]##\0/'\'' $'\'':_ra_comp $\'\''query:query string:{_beet_query}\'\'''\'' $'\'')'\'' $'\''#'\'' $'\''|'\'' $'\''/-i\0/'\'' $'\''|'\'' $'\''/-I\0/'\'' $'\''|'\'' $'\''/-R\0/'\'' $'\''|'\'' $'\''/-r\0/'\'' $'\''|'\'' $'\''/--from-scratch\0/'\'' $'\''|'\'' $'\''/--flat\0/'\'' $'\''|'\'' $'\''/-g\0/'\'' $'\''|'\'' $'\''/--pretend\0/'\'' $'\''|'\'' $'\''/-S\0/'\'' $'\''/[^\0]##\0/'\'' $'\''|'\'' $'\''/--from-logfile=PATH\0/'\'' $'\''|'\'' $'\''/--set=FIELD=VALUE\0/'\'' $'\''|'\'' $'\''/[]/'\'' $'\'':_ra_comp $\'\''options:import options:(( -h\\\\:show\\\\ this\\\\ help\\\\ message\\\\ and\\\\ exit -c\\\\:copy\\\\ tracks\\\\ into\\\\ library\\\\ directory\\\\ \\\\(default\\\\) -C\\\\:dont\\\\ copy\\\\ tracks\\\\ \\\\(opposite\\\\ of\\\\ -c\\\\) -m\\\\:move\\\\ tracks\\\\ into\\\\ the\\\\ library\\\\ \\\\(overrides\\\\ -c\\\\) -w\\\\:write\\\\ new\\\\ metadata\\\\ to\\\\ files\\\\ tags\\\\ \\\\(default\\\\) -W\\\\:dont\\\\ write\\\\ metadata\\\\ \\\\(opposite\\\\ of\\\\ -w\\\\) -a\\\\:infer\\\\ tags\\\\ for\\\\ imported\\\\ files\\\\ \\\\(default\\\\) -A\\\\:dont\\\\ infer\\\\ tags\\\\ for\\\\ imported\\\\ files\\\\ \\\\(opposite\\\\ of\\\\ -a\\\\) -p\\\\:resume\\\\ importing\\\\ if\\\\ interrupted -P\\\\:do\\\\ not\\\\ try\\\\ to\\\\ resume\\\\ importing -q\\\\:never\\\\ prompt\\\\ for\\\\ input-\\\\ skip\\\\ albums\\\\ instead --quiet-fallback=QUIET_FALLBACK\\\\:decision\\\\ in\\\\ quiet\\\\ mode\\\\ when\\\\ no\\\\ strong\\\\ match-\\\\ skip\\\\ or\\\\ \\\\ \\\\ \\\\ \\\\ \\\\ \\\\ \\\\ \\\\ \\\\ \\\\ \\\\ \\\\ \\\\ \\\\ \\\\ \\\\ \\\\ \\\\ \\\\ \\\\ \\\\ \\\\ \\\\ asis -l\\\\:file\\\\ to\\\\ log\\\\ untaggable\\\\ albums\\\\ for\\\\ later\\\\ review -s\\\\:import\\\\ individual\\\\ tracks\\\\ instead\\\\ of\\\\ full\\\\ albums -t\\\\:always\\\\ confirm\\\\ all\\\\ actions -L\\\\:retag\\\\ items\\\\ matching\\\\ a\\\\ query -i\\\\:skip\\\\ already-imported\\\\ directories -I\\\\:do\\\\ not\\\\ skip\\\\ already-imported\\\\ directories -R\\\\:do\\\\ not\\\\ record\\\\ skipped\\\\ files\\\\ during\\\\ incremental\\\\ import -r\\\\:record\\\\ skipped\\\\ files\\\\ during\\\\ incremental\\\\ import --from-scratch\\\\:erase\\\\ existing\\\\ metadata\\\\ before\\\\ applying\\\\ new\\\\ metadata --flat\\\\:import\\\\ an\\\\ entire\\\\ tree\\\\ as\\\\ a\\\\ single\\\\ album -g\\\\:group\\\\ tracks\\\\ in\\\\ a\\\\ folder\\\\ into\\\\ separate\\\\ albums --pretend\\\\:just\\\\ print\\\\ the\\\\ files\\\\ to\\\\ import -S\\\\:restrict\\\\ matching\\\\ to\\\\ a\\\\ specific\\\\ metadata\\\\ backend\\\\ ID --from-logfile=PATH\\\\:read\\\\ skipped\\\\ paths\\\\ from\\\\ an\\\\ existing\\\\ logfile --set=FIELD=VALUE\\\\:set\\\\ the\\\\ given\\\\ fields\\\\ to\\\\ the\\\\ supplied\\\\ values ))\'\'''\'' $'\'')'\'' $'\''#'\'' $'\''/[^\0]##\0/'\'' $'\'':_ra_comp $\'\''file:file:_files\'\'''\'' $'\''#'\''
+	case "$?" in
+		(0 | 2) _message "no more arguments" ;;
+		(1) if [[ "$_ra_line[_ra_p1 + 1, -1]" = *$'\''\0'\''* ]]
+			then
+				_message "parse failed before current word"
+			else
+				_ra_left="$_ra_line[_ra_p1 + 1, _ra_p2]" 
+				_ra_right="$_ra_line[_ra_p2 + 1, -1]" 
+				compset -p $(( $#PREFIX - $#_ra_line + $_ra_p1 ))
+				(( $#_ra_actions )) && _alternative "$_ra_actions[@]"
+			fi ;;
+		(3) _message "invalid regex" ;;
+	esac
+	[[ nm -ne "$compstate[nmatches]" ]]
+}'
diff --git a/zsh/.config/zsh/.zcompcache/beetslibrary b/zsh/.config/zsh/.zcompcache/beetslibrary
new file mode 100644
index 0000000..d07c015
--- /dev/null
+++ b/zsh/.config/zsh/.zcompcache/beetslibrary
@@ -0,0 +1,2 @@
+BEETS_LIBRARY='~/.cache/beets/musiclibrary.db'
+BEETS_CONFIG='/home/wball/.config/beets/config.yaml'
diff --git a/zsh/.config/zsh/.zprofile b/zsh/.config/zsh/.zprofile
index a82d2a5..d7c82ae 100644
--- a/zsh/.config/zsh/.zprofile
+++ b/zsh/.config/zsh/.zprofile
@@ -4,10 +4,15 @@
 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 "#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'
 
 # fzf
-export FZF_DEFAULT_OPTS='--color=fg:#ebdbb2,bg:#282828,hl:#b16286 --color=fg+:#689d6a,bg+:#32302f,hl+:#d3869b --color=info:#d65d0e,prompt:#458588,pointer:#fe8019 --color=marker:#8ec07c,spinner:#cc241d,header:#fabd2f'
+export FZF_DEFAULT_OPTS=" \
+--color=bg+:#313244,bg:#1E1E2E,spinner:#F5E0DC,hl:#F38BA8 \
+--color=fg:#CDD6F4,header:#F38BA8,info:#CBA6F7,pointer:#F5E0DC \
+--color=marker:#B4BEFE,fg+:#CDD6F4,prompt:#CBA6F7,hl+:#F38BA8 \
+--color=selected-bg:#45475A \
+--color=border:#6C7086,label:#CDD6F4"
 
 # XDG directories
 export XDG_CACHE_HOME="$HOME/.cache"