diff --git a/.gitignore b/.gitignore
index c9348d0..4dfc330 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@ dwm/.dwm/dwm.o
 dwm/.dwm/util.o
 dwm/.dwm/dwm
 dwm/.dwm/drw.o
-ulauncher/.config/ulauncher/ext_preferences
\ No newline at end of file
+ulauncher/.config/ulauncher/ext_preferences
+spicetify/.config/spicetify/Extracted
\ No newline at end of file
diff --git a/alacritty/.config/alacritty/theme-patcher.sh b/alacritty/.config/alacritty/theme-patcher.sh
deleted file mode 100755
index 7efc017..0000000
--- a/alacritty/.config/alacritty/theme-patcher.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-# Update alacritty config to apply Xresources color scheme
-
-# Target file
-target_file="$HOME/.config/alacritty/alacritty.yml"
-
-# copy input file to temporary file for black magic fuckery
-# (alacritty applies colors when the config file is written, so we want to do it
-# all in one write)
-cp $target_file.in $target_file.tmp
-
-# Grab colors from Xresources
-xrdb ~/.cache/wal/colors.Xresources
-
-# Numbered colors
-for i in {0..15}
-do
-    v=`xrdb -query | awk '/*.color'"$i":'/ { print substr($2,2) }'`
-    #echo $v
-    eval "sed -i 's/%cl${i}%/\x270x${v}\x27/g' $target_file.tmp";
-done
-
-# Named colors
-foreground=`xrdb -query | awk '/*.foreground/ { print substr($2,2) }'`
-background=`xrdb -query | awk '/*.background/ { print substr($2,2) }'`
-sed -i "s/%clfg%/\x270x${foreground}\x27/g" $target_file.tmp
-sed -i "s/%clbg%/\x270x${background}\x27/g" $target_file.tmp
-
-# Finally, replace target file with our updated one
-rm $target_file
-mv $target_file.tmp $target_file
\ No newline at end of file
diff --git a/cava/.config/cava/config b/cava/.config/cava/config
new file mode 100644
index 0000000..927175f
--- /dev/null
+++ b/cava/.config/cava/config
@@ -0,0 +1,11 @@
+[color]
+
+; background = #0b0c16
+; foreground = #c2c2c4
+
+gradient = 1
+gradient_count = 4
+gradient_color_1 = '#554D8D'
+gradient_color_2 = '#A33582'
+gradient_color_3 = '#2482BC'
+gradient_color_4 = '#2D8FCB'
\ No newline at end of file
diff --git a/cava/.config/cava/scripts/update-colors.sh b/cava/.config/cava/scripts/update-colors.sh
new file mode 100755
index 0000000..c4ee0a7
--- /dev/null
+++ b/cava/.config/cava/scripts/update-colors.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+cp -r $HOME/.cache/wal/colors-cava.cava $HOME/.config/cava
+cd $HOME/.config/cava
+mv colors-cava.cava config
\ No newline at end of file
diff --git a/desktop/.dwm b/desktop/.dwm
index 41f3a08..f999107 160000
--- a/desktop/.dwm
+++ b/desktop/.dwm
@@ -1 +1 @@
-Subproject commit 41f3a08d9eac8a88a7897cd9adbbcbedbc03bfc5
+Subproject commit f999107ddc61b78899581df83ea2a1d265bb6552
diff --git a/desktop/.xinitrc b/desktop/.xinitrc
index 1235331..45cd67f 100755
--- a/desktop/.xinitrc
+++ b/desktop/.xinitrc
@@ -66,7 +66,8 @@ source /etc/X11/xinit/xinitrc.d/50-systemd-user.sh
 
 # wallpaper engine and theming
 # nitrogen --restore &
-wal --backend colorz -i $HOME/.dots/nitrogen/.config/nitrogen/pexels-engin-akyurt-1435752.jpg &
+# wal --backend colorz -i $HOME/.dots/nitrogen/.config/nitrogen/pexels-engin-akyurt-1435752.jpg &
+. ~/.fehbg &
 xrdb merge ~/.cache/wal/colors.Xresources &
 
 ## Set screen locker
diff --git a/discord/.config/BetterDiscord/themes/pywal-discord-default.theme.css b/discord/.config/BetterDiscord/themes/pywal-discord-default.theme.css
index 8d22076..aa98c34 100644
--- a/discord/.config/BetterDiscord/themes/pywal-discord-default.theme.css
+++ b/discord/.config/BetterDiscord/themes/pywal-discord-default.theme.css
@@ -9,30 +9,30 @@
 /* CSS variables
    Generated by 'wal' */
 :root {
-    --wallpaper: url("/home/mike/.config/nitrogen/pexels-skyler-ewing-5228890.jpg");
+    --wallpaper: url("/home/mike/Wallpapers/bigsur.jpeg");
 
     /* Special */
-    --background: #080102;
-    --foreground: #c1bfbf;
-    --cursor: #c1bfbf;
+    --background: #0b0c16;
+    --foreground: #c2c2c4;
+    --cursor: #c2c2c4;
 
     /* Colors */
-    --color0: #080102;
-    --color1: #3e335c;
-    --color2: #732324;
-    --color3: #6f273b;
-    --color4: #442e64;
-    --color5: #3b4374;
-    --color6: #6d439f;
-    --color7: #838080;
-    --color8: #454041;
-    --color9: #53447B;
-    --color10: #9A2F31;
-    --color11: #94344F;
-    --color12: #5B3E86;
-    --color13: #4F5A9B;
-    --color14: #925AD4;
-    --color15: #c1bfbf;
+    --color0: #0b0c16;
+    --color1: #0c5484;
+    --color2: #3f3969;
+    --color3: #7a2761;
+    --color4: #1b618d;
+    --color5: #216b98;
+    --color6: #3e81ab;
+    --color7: #85858a;
+    --color8: #484850;
+    --color9: #1171B0;
+    --color10: #554D8D;
+    --color11: #A33582;
+    --color12: #2482BC;
+    --color13: #2D8FCB;
+    --color14: #53ACE4;
+    --color15: #c2c2c4;
 }
 /**  colors will come from .cache/wal/colors.css as variables defined in :root
  *  see: cat $HOME/.cache/wal/colors.css
diff --git a/kitty/.config/kitty/kitty.conf b/kitty/.config/kitty/kitty.conf
index a7c3221..87dd2c5 100644
--- a/kitty/.config/kitty/kitty.conf
+++ b/kitty/.config/kitty/kitty.conf
@@ -11,4 +11,6 @@ shell zsh
 
 confirm_os_window_close 0
 
-detect_urls yes
\ No newline at end of file
+detect_urls yes
+
+enable_audio_bell no
\ No newline at end of file
diff --git a/mako/.config/mako/config b/mako/.config/mako/config
new file mode 100644
index 0000000..ef44f67
--- /dev/null
+++ b/mako/.config/mako/config
@@ -0,0 +1,22 @@
+sort=-time
+layer=overlay
+background-color=#0b0c16
+width=300
+height=110
+border-size=3
+text-color=#c2c2c4
+border-color=#2D8FCB
+border-radius=10
+icons=1
+padding=24
+max-icon-size=64
+default-timeout=5000
+ignore-timeout=1
+font=CartographCF Nerd Font 11
+
+[urgency=high]
+default-timeout=0
+
+[category=mpd]
+default-timeout=2000
+group-by=category
\ No newline at end of file
diff --git a/mako/.config/mako/update-colors.sh b/mako/.config/mako/update-colors.sh
new file mode 100755
index 0000000..4497ce4
--- /dev/null
+++ b/mako/.config/mako/update-colors.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+. "${HOME}/.cache/wal/colors.sh"
+
+conffile="${HOME}/.config/mako/config"
+
+# Associative array, color name -> color code.
+declare -A colors
+colors=(
+    ["background-color"]="$background"
+    ["text-color"]="$foreground"
+    ["border-color"]="$color13"
+)
+
+for color_name in "${!colors[@]}"; do
+  # replace first occurance of each color in config file
+  sed -i "0,/^$color_name.*/{s//$color_name=${colors[$color_name]}/}" $conffile
+done
+
+makoctl reload
+
+notify-send "Wallpaper and colors updated"
\ No newline at end of file
diff --git a/mako/.config/mako/update-theme.sh b/mako/.config/mako/update-theme.sh
new file mode 100755
index 0000000..4497ce4
--- /dev/null
+++ b/mako/.config/mako/update-theme.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+. "${HOME}/.cache/wal/colors.sh"
+
+conffile="${HOME}/.config/mako/config"
+
+# Associative array, color name -> color code.
+declare -A colors
+colors=(
+    ["background-color"]="$background"
+    ["text-color"]="$foreground"
+    ["border-color"]="$color13"
+)
+
+for color_name in "${!colors[@]}"; do
+  # replace first occurance of each color in config file
+  sed -i "0,/^$color_name.*/{s//$color_name=${colors[$color_name]}/}" $conffile
+done
+
+makoctl reload
+
+notify-send "Wallpaper and colors updated"
\ No newline at end of file
diff --git a/nitrogen/.config/nitrogen/bg-saved.cfg b/nitrogen/.config/nitrogen/bg-saved.cfg
deleted file mode 100755
index bbeb254..0000000
--- a/nitrogen/.config/nitrogen/bg-saved.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[xin_0]
-file=/home/mike/.config/nitrogen/pexels-skyler-ewing-5228890.jpg
-mode=5
-bgcolor=#24273a
-
-[xin_1]
-file=/home/mike/.config/nitrogen/pexels-skyler-ewing-5228890.jpg
-mode=5
-bgcolor=#24273a
-
-[xin_2]
-file=/home/mike/.config/nitrogen/pexels-skyler-ewing-5228890.jpg
-mode=5
-bgcolor=#24273a
diff --git a/nitrogen/.config/nitrogen/myprimarycolours.txt b/nitrogen/.config/nitrogen/myprimarycolours.txt
deleted file mode 100644
index 6ce6d36..0000000
--- a/nitrogen/.config/nitrogen/myprimarycolours.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-'/home/mike/.dots/nitrogen/.config/nitrogen/pexels-skyler-ewing-5228890.jpg\'#A5BFC3#C0C8C6#A7B5B4#9D7055#322C2B
-'/home/mike/.dots/nitrogen/.config/nitrogen/cat-waves.png\'#1E1E2E#242436#43455E#707DA0#B6BEF2
-'/home/mike/.dots/nitrogen/.config/nitrogen/pexels-engin-akyurt-1435752.jpg\'#017898#0486A2#2FB7D6#028CAC#9FDCE9
-'/home/mike/.dots/nitrogen/.config/nitrogen/z3in53x1r1d81.png\'#615D71#CCA2B4#302D41#1A1927
diff --git a/picom/.config/picom.conf b/picom/.config/picom.conf
index aafcb80..bb67f49 100644
--- a/picom/.config/picom.conf
+++ b/picom/.config/picom.conf
@@ -168,6 +168,7 @@ opacity-rule = [
     "90:class_g = 'Spotify'",
     "90:class_g = 'notion-app'",
     "90:class_g = 'easyeffects'",
+    "85:class_g = 'kitty'",
     # "85:class_g = 'firefox'",
 ]
 
diff --git a/rofi/.config/rofi/config.rasi b/rofi/.config/rofi/config.rasi
index 1b56feb..6cee309 100644
--- a/rofi/.config/rofi/config.rasi
+++ b/rofi/.config/rofi/config.rasi
@@ -181,5 +181,3 @@ configuration {
 	me-accept-custom: "Control+MouseDPrimary";
 */
 }
-
-@theme "catppuccin-macchiato"
\ No newline at end of file
diff --git a/rofi/.config/rofi/scripts/wallpaper b/rofi/.config/rofi/scripts/wallpaper
index c3c9f37..ca8163e 100755
--- a/rofi/.config/rofi/scripts/wallpaper
+++ b/rofi/.config/rofi/scripts/wallpaper
@@ -21,13 +21,16 @@ else
     exit 1
 fi
 
-swww img $wallpaper --transition-type grow --transition-fps 60 --transition-duration 1.0 --transition-bezier 0.65,0,0.35,1 --transition-step 255
+# swww img $wallpaper --transition-type grow --transition-fps 60 --transition-duration 1.0 --transition-bezier 0.65,0,0.35,1 --transition-step 255
+feh --bg-fill $wallpaper
 
 wal -i $wallpaper --cols16
 pywalfox update
 pywal-discord -t default
 wal-telegram --wal
 
+kill -HUP $(pgrep dwm)
+
 . $HOME/.config/mako/update-colors.sh
 . $HOME/.config/spicetify/Themes/Pywal/update-colors.sh
 . $HOME/.config/cava/scripts/update-colors.sh
\ No newline at end of file
diff --git a/rofi/.config/rofi/scripts/websearch b/rofi/.config/rofi/scripts/websearch
index 79727e5..9f04421 100755
--- a/rofi/.config/rofi/scripts/websearch
+++ b/rofi/.config/rofi/scripts/websearch
@@ -6,6 +6,7 @@ theme='style-1'
 declare -A URLS
 
 URLS=(
+  ["kvasir"]="https://czyz.icu/search?q="
   ["google"]="https://www.google.com/search?q="
   ["bing"]="https://www.bing.com/search?q="
   ["yahoo"]="https://search.yahoo.com/search?p="
diff --git a/rofi/.local/share/rofi/rofi_calc_history b/rofi/.local/share/rofi/rofi_calc_history
deleted file mode 100644
index 45e1b13..0000000
--- a/rofi/.local/share/rofi/rofi_calc_history
+++ /dev/null
@@ -1 +0,0 @@
-(43 × 4) − (43 × 2) = 86
\ No newline at end of file
diff --git a/rofi/.local/share/rofi/themes/catppuccin-frappe.rasi b/rofi/.local/share/rofi/themes/catppuccin-frappe.rasi
deleted file mode 100644
index e6e8783..0000000
--- a/rofi/.local/share/rofi/themes/catppuccin-frappe.rasi
+++ /dev/null
@@ -1,111 +0,0 @@
-* {
-    bg-col:  #303446;
-    bg-col-light: #303446;
-    border-col: #303446;
-    selected-col: #303446;
-    blue: #8caaee;
-    fg-col: #c6d0f5;
-    fg-col2: #e78284;
-    grey: #737994;
-
-    width: 600;
-    font: "JetBrainsMono Nerd Font 14";
-}
-
-element-text, element-icon , mode-switcher {
-    background-color: inherit;
-    text-color:       inherit;
-}
-
-window {
-    height: 360px;
-    border: 3px;
-    border-color: @border-col;
-    background-color: @bg-col;
-}
-
-mainbox {
-    background-color: @bg-col;
-}
-
-inputbar {
-    children: [prompt,entry];
-    background-color: @bg-col;
-    border-radius: 5px;
-    padding: 2px;
-}
-
-prompt {
-    background-color: @blue;
-    padding: 6px;
-    text-color: @bg-col;
-    border-radius: 3px;
-    margin: 20px 0px 0px 20px;
-}
-
-textbox-prompt-colon {
-    expand: false;
-    str: ":";
-}
-
-entry {
-    padding: 6px;
-    margin: 20px 0px 0px 10px;
-    text-color: @fg-col;
-    background-color: @bg-col;
-}
-
-listview {
-    border: 0px 0px 0px;
-    padding: 6px 0px 0px;
-    margin: 10px 0px 0px 20px;
-    columns: 2;
-    lines: 5;
-    background-color: @bg-col;
-}
-
-element {
-    padding: 5px;
-    background-color: @bg-col;
-    text-color: @fg-col  ;
-}
-
-element-icon {
-    size: 25px;
-}
-
-element selected {
-    background-color:  @selected-col ;
-    text-color: @fg-col2  ;
-}
-
-mode-switcher {
-    spacing: 0;
-  }
-
-button {
-    padding: 10px;
-    background-color: @bg-col-light;
-    text-color: @grey;
-    vertical-align: 0.5; 
-    horizontal-align: 0.5;
-}
-
-button selected {
-  background-color: @bg-col;
-  text-color: @blue;
-}
-
-message {
-    background-color: @bg-col-light;
-    margin: 2px;
-    padding: 2px;
-    border-radius: 5px;
-}
-
-textbox {
-    padding: 6px;
-    margin: 20px 0px 0px 20px;
-    text-color: @blue;
-    background-color: @bg-col-light;
-}
diff --git a/rofi/.local/share/rofi/themes/catppuccin-latte.rasi b/rofi/.local/share/rofi/themes/catppuccin-latte.rasi
deleted file mode 100644
index 6826db6..0000000
--- a/rofi/.local/share/rofi/themes/catppuccin-latte.rasi
+++ /dev/null
@@ -1,111 +0,0 @@
-* {
-    bg-col:  #eff1f5;
-    bg-col-light: #eff1f5;
-    border-col: #eff1f5;
-    selected-col: #eff1f5;
-    blue: #1e66f5;
-    fg-col: #4c4f69;
-    fg-col2: #d20f39;
-    grey: #9ca0b0;
-
-    width: 600;
-    font: "JetBrainsMono Nerd Font 14";
-}
-
-element-text, element-icon , mode-switcher {
-    background-color: inherit;
-    text-color:       inherit;
-}
-
-window {
-    height: 360px;
-    border: 3px;
-    border-color: @border-col;
-    background-color: @bg-col;
-}
-
-mainbox {
-    background-color: @bg-col;
-}
-
-inputbar {
-    children: [prompt,entry];
-    background-color: @bg-col;
-    border-radius: 5px;
-    padding: 2px;
-}
-
-prompt {
-    background-color: @blue;
-    padding: 6px;
-    text-color: @bg-col;
-    border-radius: 3px;
-    margin: 20px 0px 0px 20px;
-}
-
-textbox-prompt-colon {
-    expand: false;
-    str: ":";
-}
-
-entry {
-    padding: 6px;
-    margin: 20px 0px 0px 10px;
-    text-color: @fg-col;
-    background-color: @bg-col;
-}
-
-listview {
-    border: 0px 0px 0px;
-    padding: 6px 0px 0px;
-    margin: 10px 0px 0px 20px;
-    columns: 2;
-    lines: 5;
-    background-color: @bg-col;
-}
-
-element {
-    padding: 5px;
-    background-color: @bg-col;
-    text-color: @fg-col  ;
-}
-
-element-icon {
-    size: 25px;
-}
-
-element selected {
-    background-color:  @selected-col ;
-    text-color: @fg-col2  ;
-}
-
-mode-switcher {
-    spacing: 0;
-  }
-
-button {
-    padding: 10px;
-    background-color: @bg-col-light;
-    text-color: @grey;
-    vertical-align: 0.5; 
-    horizontal-align: 0.5;
-}
-
-button selected {
-  background-color: @bg-col;
-  text-color: @blue;
-}
-
-message {
-    background-color: @bg-col-light;
-    margin: 2px;
-    padding: 2px;
-    border-radius: 5px;
-}
-
-textbox {
-    padding: 6px;
-    margin: 20px 0px 0px 20px;
-    text-color: @blue;
-    background-color: @bg-col-light;
-}
diff --git a/rofi/.local/share/rofi/themes/catppuccin-macchiato.rasi b/rofi/.local/share/rofi/themes/catppuccin-macchiato.rasi
deleted file mode 100644
index ab1d7f5..0000000
--- a/rofi/.local/share/rofi/themes/catppuccin-macchiato.rasi
+++ /dev/null
@@ -1,111 +0,0 @@
-* {
-    bg-col:  #24273a;
-    bg-col-light: #24273a;
-    border-col: #24273a;
-    selected-col: #24273a;
-    blue: #8aadf4;
-    fg-col: #cad3f5;
-    fg-col2: #8aadf4;
-    grey: #6e738d;
-
-    width: 600;
-    font: "JetBrainsMono Nerd Font 14";
-}
-
-element-text, element-icon , mode-switcher {
-    background-color: inherit;
-    text-color:       inherit;
-}
-
-window {
-    height: 360px;
-    border: 3px;
-    border-color: @border-col;
-    background-color: @bg-col;
-}
-
-mainbox {
-    background-color: @bg-col;
-}
-
-inputbar {
-    children: [prompt,entry];
-    background-color: @bg-col;
-    border-radius: 5px;
-    padding: 2px;
-}
-
-prompt {
-    background-color: @blue;
-    padding: 6px;
-    text-color: @bg-col;
-    border-radius: 3px;
-    margin: 20px 0px 0px 20px;
-}
-
-textbox-prompt-colon {
-    expand: false;
-    str: ":";
-}
-
-entry {
-    padding: 6px;
-    margin: 20px 0px 0px 10px;
-    text-color: @fg-col;
-    background-color: @bg-col;
-}
-
-listview {
-    border: 0px 0px 0px;
-    padding: 6px 0px 0px;
-    margin: 10px 0px 0px 20px;
-    columns: 2;
-    lines: 5;
-    background-color: @bg-col;
-}
-
-element {
-    padding: 5px;
-    background-color: @bg-col;
-    text-color: @fg-col  ;
-}
-
-element-icon {
-    size: 25px;
-}
-
-element selected {
-    background-color:  @selected-col ;
-    text-color: @fg-col2  ;
-}
-
-mode-switcher {
-    spacing: 0;
-  }
-
-button {
-    padding: 10px;
-    background-color: @bg-col-light;
-    text-color: @grey;
-    vertical-align: 0.5; 
-    horizontal-align: 0.5;
-}
-
-button selected {
-  background-color: @bg-col;
-  text-color: @blue;
-}
-
-message {
-    background-color: @bg-col-light;
-    margin: 2px;
-    padding: 2px;
-    border-radius: 5px;
-}
-
-textbox {
-    padding: 6px;
-    margin: 20px 0px 0px 20px;
-    text-color: @blue;
-    background-color: @bg-col-light;
-}
diff --git a/rofi/.local/share/rofi/themes/catppuccin-mocha.rasi b/rofi/.local/share/rofi/themes/catppuccin-mocha.rasi
deleted file mode 100644
index 38c0b80..0000000
--- a/rofi/.local/share/rofi/themes/catppuccin-mocha.rasi
+++ /dev/null
@@ -1,111 +0,0 @@
-* {
-    bg-col:  #1e1e2e;
-    bg-col-light: #1e1e2e;
-    border-col: #1e1e2e;
-    selected-col: #1e1e2e;
-    blue: #89b4fa;
-    fg-col: #cdd6f4;
-    fg-col2: #f38ba8;
-    grey: #6c7086;
-
-    width: 600;
-    font: "JetBrainsMono Nerd Font 14";
-}
-
-element-text, element-icon , mode-switcher {
-    background-color: inherit;
-    text-color:       inherit;
-}
-
-window {
-    height: 360px;
-    border: 3px;
-    border-color: @border-col;
-    background-color: @bg-col;
-}
-
-mainbox {
-    background-color: @bg-col;
-}
-
-inputbar {
-    children: [prompt,entry];
-    background-color: @bg-col;
-    border-radius: 5px;
-    padding: 2px;
-}
-
-prompt {
-    background-color: @blue;
-    padding: 6px;
-    text-color: @bg-col;
-    border-radius: 3px;
-    margin: 20px 0px 0px 20px;
-}
-
-textbox-prompt-colon {
-    expand: false;
-    str: ":";
-}
-
-entry {
-    padding: 6px;
-    margin: 20px 0px 0px 10px;
-    text-color: @fg-col;
-    background-color: @bg-col;
-}
-
-listview {
-    border: 0px 0px 0px;
-    padding: 6px 0px 0px;
-    margin: 10px 0px 0px 20px;
-    columns: 2;
-    lines: 5;
-    background-color: @bg-col;
-}
-
-element {
-    padding: 5px;
-    background-color: @bg-col;
-    text-color: @fg-col  ;
-}
-
-element-icon {
-    size: 25px;
-}
-
-element selected {
-    background-color:  @selected-col ;
-    text-color: @fg-col2  ;
-}
-
-mode-switcher {
-    spacing: 0;
-  }
-
-button {
-    padding: 10px;
-    background-color: @bg-col-light;
-    text-color: @grey;
-    vertical-align: 0.5; 
-    horizontal-align: 0.5;
-}
-
-button selected {
-  background-color: @bg-col;
-  text-color: @blue;
-}
-
-message {
-    background-color: @bg-col-light;
-    margin: 2px;
-    padding: 2px;
-    border-radius: 5px;
-}
-
-textbox {
-    padding: 6px;
-    margin: 20px 0px 0px 20px;
-    text-color: @blue;
-    background-color: @bg-col-light;
-}
diff --git a/scripts/lazarus.sh b/scripts/lazarus.sh
index 7c1a04c..2918cbc 100755
--- a/scripts/lazarus.sh
+++ b/scripts/lazarus.sh
@@ -33,7 +33,6 @@ echo "Installing additional software (this may take a long time!)"
 
 paru -S \
 adobe-source-code-pro-fonts \
-alacritty \
 bat \
 betterlockscreen \
 calf \
@@ -63,6 +62,7 @@ helvum \
 jq \
 json-c \
 json-glib \
+kitty \
 kleopatra \
 kvantum \
 less \
@@ -170,3 +170,46 @@ xss-lock \
 zoxide \
 zsh
 
+# stowing
+echo "Stowing dotfiles"
+
+cd $HOME/.dots
+
+stow alacritty
+stow bash
+stow bat
+stow common
+stow desktop
+stow dunst
+stow feh
+stow gtk
+stow htop
+stow kitty
+stow kvantum
+stow libvirt
+stow neofetch
+stow nitrogen
+stow picom
+stow rofi
+stow wal
+stow zsh
+
+# compiling desktop environment
+echo "Compiling desktop environment"
+
+cd $HOME/.dwm
+sudo make clean install
+
+cd $HOME/.dmenu
+sudo make clean install
+
+cd $HOME/.st
+sudo make clean install
+
+# disable lightdm
+echo "Disable lightdm (setup uses .xinitrc)"
+
+sudo systemctl disable lightdm.service
+
+echo "Setup complete!"
+echo "Please reboot your computer for changes to apply"
\ No newline at end of file
diff --git a/spicetify/.config/spicetify/Backup/login.spa b/spicetify/.config/spicetify/Backup/login.spa
new file mode 100755
index 0000000..9be7b5c
Binary files /dev/null and b/spicetify/.config/spicetify/Backup/login.spa differ
diff --git a/spicetify/.config/spicetify/Backup/xpui.spa b/spicetify/.config/spicetify/Backup/xpui.spa
new file mode 100755
index 0000000..12b4827
Binary files /dev/null and b/spicetify/.config/spicetify/Backup/xpui.spa differ
diff --git a/spicetify/.config/spicetify/Themes/Pywal/color.ini b/spicetify/.config/spicetify/Themes/Pywal/color.ini
new file mode 100644
index 0000000..5fe9fd7
--- /dev/null
+++ b/spicetify/.config/spicetify/Themes/Pywal/color.ini
@@ -0,0 +1,16 @@
+[Dynamic]
+text               = c2c2c4
+subtext            = c2c2c4
+main               = 0b0c16
+sidebar            = 0b0c16
+player             = 0b0c16
+card               = 0b0c16
+shadow             = 0b0c16
+selected-row       = 53ACE4
+button             = 1171B0
+button-active      = 53ACE4
+button-disabled    = 484850
+tab-active         = 1171B0
+notification       = 0b0c16
+notification-error = 1171B0
+misc               = 0b0c16
\ No newline at end of file
diff --git a/spicetify/.config/spicetify/Themes/Pywal/update-colors.sh b/spicetify/.config/spicetify/Themes/Pywal/update-colors.sh
new file mode 100755
index 0000000..cec4a9a
--- /dev/null
+++ b/spicetify/.config/spicetify/Themes/Pywal/update-colors.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+cp -r $HOME/.cache/wal/colors-spicetify.ini $HOME/.config/spicetify/Themes/Pywal
+cd $HOME/.config/spicetify/Themes/Pywal
+mv colors-spicetify.ini color.ini
\ No newline at end of file
diff --git a/spicetify/.config/spicetify/config-xpui.ini b/spicetify/.config/spicetify/config-xpui.ini
new file mode 100644
index 0000000..a7bdd1c
--- /dev/null
+++ b/spicetify/.config/spicetify/config-xpui.ini
@@ -0,0 +1,31 @@
+[Setting]
+inject_theme_js         = 1
+overwrite_assets        = 0
+check_spicetify_upgrade = 1
+prefs_path              = /home/mike/.config/spotify/prefs
+current_theme           = Pywal
+inject_css              = 1
+replace_colors          = 1
+spotify_launch_flags    = 
+spotify_path            = /opt/spotify/
+color_scheme            = 
+
+[Preprocesses]
+expose_apis        = 1
+disable_sentry     = 1
+disable_ui_logging = 1
+remove_rtl_rule    = 1
+
+[AdditionalOptions]
+extensions            = 
+custom_apps           = 
+sidebar_config        = 1
+home_config           = 1
+experimental_features = 1
+
+[Patch]
+
+; DO NOT CHANGE!
+[Backup]
+version = 1.2.20.1210.g2a8a8a57
+with    = Dev
diff --git a/wal/.config/wal/templates/colors.Xresources b/wal/.config/wal/templates/colors.Xresources
index 08c051c..289bf57 100644
--- a/wal/.config/wal/templates/colors.Xresources
+++ b/wal/.config/wal/templates/colors.Xresources
@@ -71,25 +71,25 @@ URxvt*depth: 32
 
 dwm.normfgcolor: {foreground}
 dwm.normbgcolor: {background}
-dwm.normbordercolor: {color15}
+dwm.normbordercolor: {background}
 dwm.normfloatcolor: {color7}
 dwm.selfgcolor: {color0}
 dwm.selbgcolor: {color1}
 dwm.selbordercolor: {color9}
 dwm.selfloatcolor: {color9}
-dwm.titlenormfgcolor: {color7}
+dwm.titlenormfgcolor: {foreground}
 dwm.titlenormbgcolor: {color0}
 dwm.titlenormbordercolor: {color8}
 dwm.titlenormfloatcolor: {color0}
-dwm.titleselfgcolor: {color2}
+dwm.titleselfgcolor: {color5}
 dwm.titleselbgcolor: {background}
 dwm.titleselbordercolor: {color15}
 dwm.titleselfloatcolor: {color15}
-dwm.tagsnormfgcolor: {color7}
+dwm.tagsnormfgcolor: {foreground}
 dwm.tagsnormbgcolor: {color0}
 dwm.tagsnormbordercolor: {color15}
 dwm.tagsnormfloatcolor: {color15}
-dwm.tagsselfgcolor: {color2}
+dwm.tagsselfgcolor: {color5}
 dwm.tagsselbgcolor: {color0}
 dwm.tagsselbordercolor: {color4}
 dwm.tagsselfloatcolor: {color5}
diff --git a/wallpapers/Wallpapers/aesthetic_deer.png b/wallpapers/Wallpapers/aesthetic_deer.png
new file mode 100644
index 0000000..aef3995
Binary files /dev/null and b/wallpapers/Wallpapers/aesthetic_deer.png differ
diff --git a/wallpapers/Wallpapers/apex_octane.jpg b/wallpapers/Wallpapers/apex_octane.jpg
new file mode 100644
index 0000000..832fd96
Binary files /dev/null and b/wallpapers/Wallpapers/apex_octane.jpg differ
diff --git a/wallpapers/Wallpapers/apple_astronaut.jpg b/wallpapers/Wallpapers/apple_astronaut.jpg
new file mode 100644
index 0000000..7829121
Binary files /dev/null and b/wallpapers/Wallpapers/apple_astronaut.jpg differ
diff --git a/wallpapers/Wallpapers/arcade_decay_red.png b/wallpapers/Wallpapers/arcade_decay_red.png
new file mode 100644
index 0000000..f151477
Binary files /dev/null and b/wallpapers/Wallpapers/arcade_decay_red.png differ
diff --git a/wallpapers/Wallpapers/astronaut.png b/wallpapers/Wallpapers/astronaut.png
new file mode 100644
index 0000000..d70c5fb
Binary files /dev/null and b/wallpapers/Wallpapers/astronaut.png differ
diff --git a/wallpapers/Wallpapers/aurora_borealis.png b/wallpapers/Wallpapers/aurora_borealis.png
new file mode 100644
index 0000000..a094102
Binary files /dev/null and b/wallpapers/Wallpapers/aurora_borealis.png differ
diff --git a/wallpapers/Wallpapers/bigsur-dark.jpg b/wallpapers/Wallpapers/bigsur-dark.jpg
new file mode 100644
index 0000000..79241b1
Binary files /dev/null and b/wallpapers/Wallpapers/bigsur-dark.jpg differ
diff --git a/wallpapers/Wallpapers/bigsur.jpeg b/wallpapers/Wallpapers/bigsur.jpeg
new file mode 100644
index 0000000..266f360
Binary files /dev/null and b/wallpapers/Wallpapers/bigsur.jpeg differ
diff --git a/wallpapers/Wallpapers/bird.png b/wallpapers/Wallpapers/bird.png
new file mode 100644
index 0000000..9e18e5f
Binary files /dev/null and b/wallpapers/Wallpapers/bird.png differ
diff --git a/wallpapers/Wallpapers/blue_swirl.png b/wallpapers/Wallpapers/blue_swirl.png
new file mode 100644
index 0000000..1d52d0d
Binary files /dev/null and b/wallpapers/Wallpapers/blue_swirl.png differ
diff --git a/wallpapers/Wallpapers/boat_abondoned.jpg b/wallpapers/Wallpapers/boat_abondoned.jpg
new file mode 100644
index 0000000..0f3d156
Binary files /dev/null and b/wallpapers/Wallpapers/boat_abondoned.jpg differ
diff --git a/wallpapers/Wallpapers/building.png b/wallpapers/Wallpapers/building.png
new file mode 100644
index 0000000..7e3153a
Binary files /dev/null and b/wallpapers/Wallpapers/building.png differ
diff --git a/nitrogen/.config/nitrogen/cat-waves.png b/wallpapers/Wallpapers/cat-waves.png
similarity index 100%
rename from nitrogen/.config/nitrogen/cat-waves.png
rename to wallpapers/Wallpapers/cat-waves.png
diff --git a/wallpapers/Wallpapers/cat_firewatch.png b/wallpapers/Wallpapers/cat_firewatch.png
new file mode 100644
index 0000000..b2cd162
Binary files /dev/null and b/wallpapers/Wallpapers/cat_firewatch.png differ
diff --git a/wallpapers/Wallpapers/cyber.jpg b/wallpapers/Wallpapers/cyber.jpg
new file mode 100644
index 0000000..e70a715
Binary files /dev/null and b/wallpapers/Wallpapers/cyber.jpg differ
diff --git a/wallpapers/Wallpapers/desert.png b/wallpapers/Wallpapers/desert.png
new file mode 100644
index 0000000..5f68a1b
Binary files /dev/null and b/wallpapers/Wallpapers/desert.png differ
diff --git a/wallpapers/Wallpapers/escape_velocity.jpg b/wallpapers/Wallpapers/escape_velocity.jpg
new file mode 100644
index 0000000..6f50f1a
Binary files /dev/null and b/wallpapers/Wallpapers/escape_velocity.jpg differ
diff --git a/wallpapers/Wallpapers/forest.jpg b/wallpapers/Wallpapers/forest.jpg
new file mode 100644
index 0000000..ccf2c64
Binary files /dev/null and b/wallpapers/Wallpapers/forest.jpg differ
diff --git a/wallpapers/Wallpapers/forest_deer_blue.jpg b/wallpapers/Wallpapers/forest_deer_blue.jpg
new file mode 100644
index 0000000..aa05217
Binary files /dev/null and b/wallpapers/Wallpapers/forest_deer_blue.jpg differ
diff --git a/wallpapers/Wallpapers/forest_deer_red.jpg b/wallpapers/Wallpapers/forest_deer_red.jpg
new file mode 100644
index 0000000..495b5a3
Binary files /dev/null and b/wallpapers/Wallpapers/forest_deer_red.jpg differ
diff --git a/wallpapers/Wallpapers/ice.jpg b/wallpapers/Wallpapers/ice.jpg
new file mode 100644
index 0000000..58841e4
Binary files /dev/null and b/wallpapers/Wallpapers/ice.jpg differ
diff --git a/wallpapers/Wallpapers/mehanical_keyboards.jpg b/wallpapers/Wallpapers/mehanical_keyboards.jpg
new file mode 100644
index 0000000..abd41d5
Binary files /dev/null and b/wallpapers/Wallpapers/mehanical_keyboards.jpg differ
diff --git a/wallpapers/Wallpapers/moments_before_desk.png b/wallpapers/Wallpapers/moments_before_desk.png
new file mode 100644
index 0000000..e1cc7c0
Binary files /dev/null and b/wallpapers/Wallpapers/moments_before_desk.png differ
diff --git a/wallpapers/Wallpapers/mysterious_woman.jpg b/wallpapers/Wallpapers/mysterious_woman.jpg
new file mode 100644
index 0000000..51995e4
Binary files /dev/null and b/wallpapers/Wallpapers/mysterious_woman.jpg differ
diff --git a/wallpapers/Wallpapers/night_city.png b/wallpapers/Wallpapers/night_city.png
new file mode 100644
index 0000000..2a2c391
Binary files /dev/null and b/wallpapers/Wallpapers/night_city.png differ
diff --git a/wallpapers/Wallpapers/observatory.png b/wallpapers/Wallpapers/observatory.png
new file mode 100644
index 0000000..34214a2
Binary files /dev/null and b/wallpapers/Wallpapers/observatory.png differ
diff --git a/wallpapers/Wallpapers/particles.png b/wallpapers/Wallpapers/particles.png
new file mode 100644
index 0000000..fb69e73
Binary files /dev/null and b/wallpapers/Wallpapers/particles.png differ
diff --git a/nitrogen/.config/nitrogen/pexels-engin-akyurt-1435752.jpg b/wallpapers/Wallpapers/pexels-engin-akyurt-1435752.jpg
similarity index 100%
rename from nitrogen/.config/nitrogen/pexels-engin-akyurt-1435752.jpg
rename to wallpapers/Wallpapers/pexels-engin-akyurt-1435752.jpg
diff --git a/nitrogen/.config/nitrogen/pexels-skyler-ewing-5228890.jpg b/wallpapers/Wallpapers/pexels-skyler-ewing-5228890.jpg
similarity index 100%
rename from nitrogen/.config/nitrogen/pexels-skyler-ewing-5228890.jpg
rename to wallpapers/Wallpapers/pexels-skyler-ewing-5228890.jpg
diff --git a/wallpapers/Wallpapers/pixel.jpg b/wallpapers/Wallpapers/pixel.jpg
new file mode 100644
index 0000000..7ffcd44
Binary files /dev/null and b/wallpapers/Wallpapers/pixel.jpg differ
diff --git a/wallpapers/Wallpapers/pixel_surf.jpg b/wallpapers/Wallpapers/pixel_surf.jpg
new file mode 100644
index 0000000..da0c93b
Binary files /dev/null and b/wallpapers/Wallpapers/pixel_surf.jpg differ
diff --git a/wallpapers/Wallpapers/rain_world1.png b/wallpapers/Wallpapers/rain_world1.png
new file mode 100644
index 0000000..f391ca6
Binary files /dev/null and b/wallpapers/Wallpapers/rain_world1.png differ
diff --git a/wallpapers/Wallpapers/rain_world2.png b/wallpapers/Wallpapers/rain_world2.png
new file mode 100644
index 0000000..a705b74
Binary files /dev/null and b/wallpapers/Wallpapers/rain_world2.png differ
diff --git a/wallpapers/Wallpapers/relaxed_mario.png b/wallpapers/Wallpapers/relaxed_mario.png
new file mode 100644
index 0000000..f920fbf
Binary files /dev/null and b/wallpapers/Wallpapers/relaxed_mario.png differ
diff --git a/wallpapers/Wallpapers/rocket_launch.png b/wallpapers/Wallpapers/rocket_launch.png
new file mode 100644
index 0000000..508ee2b
Binary files /dev/null and b/wallpapers/Wallpapers/rocket_launch.png differ
diff --git a/wallpapers/Wallpapers/samurai_strike.jpg b/wallpapers/Wallpapers/samurai_strike.jpg
new file mode 100644
index 0000000..b477f61
Binary files /dev/null and b/wallpapers/Wallpapers/samurai_strike.jpg differ
diff --git a/wallpapers/Wallpapers/space.png b/wallpapers/Wallpapers/space.png
new file mode 100644
index 0000000..994f65a
Binary files /dev/null and b/wallpapers/Wallpapers/space.png differ
diff --git a/wallpapers/Wallpapers/space_saturn.png b/wallpapers/Wallpapers/space_saturn.png
new file mode 100644
index 0000000..dbc4fc3
Binary files /dev/null and b/wallpapers/Wallpapers/space_saturn.png differ
diff --git a/wallpapers/Wallpapers/spider_verse.jpg b/wallpapers/Wallpapers/spider_verse.jpg
new file mode 100644
index 0000000..5ece548
Binary files /dev/null and b/wallpapers/Wallpapers/spider_verse.jpg differ
diff --git a/wallpapers/Wallpapers/streets.jpg b/wallpapers/Wallpapers/streets.jpg
new file mode 100644
index 0000000..f31ee84
Binary files /dev/null and b/wallpapers/Wallpapers/streets.jpg differ
diff --git a/wallpapers/Wallpapers/switch_swirl.jpg b/wallpapers/Wallpapers/switch_swirl.jpg
new file mode 100644
index 0000000..5024d7a
Binary files /dev/null and b/wallpapers/Wallpapers/switch_swirl.jpg differ
diff --git a/wallpapers/Wallpapers/volcano.png b/wallpapers/Wallpapers/volcano.png
new file mode 100644
index 0000000..73a9a4a
Binary files /dev/null and b/wallpapers/Wallpapers/volcano.png differ
diff --git a/wallpapers/Wallpapers/waves.png b/wallpapers/Wallpapers/waves.png
new file mode 100644
index 0000000..6feeba0
Binary files /dev/null and b/wallpapers/Wallpapers/waves.png differ
diff --git a/nitrogen/.config/nitrogen/z3in53x1r1d81.png b/wallpapers/Wallpapers/z3in53x1r1d81.png
similarity index 100%
rename from nitrogen/.config/nitrogen/z3in53x1r1d81.png
rename to wallpapers/Wallpapers/z3in53x1r1d81.png
diff --git a/zsh/.zshenv b/zsh/.zshenv
index bde5aab..8ef5d9d 100644
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -28,3 +28,4 @@ fi
 
 export FZF_DEFAULT_OPTS="--color=bg+:#363a4f,bg:#24273a,spinner:#f4dbd6,hl:#ed8796 --color=fg:#cad3f5,header:#ed8796,info:#c6a0f6,pointer:#f4dbd6 --color=marker:#f4dbd6,fg+:#cad3f5,prompt:#c6a0f6,hl+:#ed8796";
 
+export PATH=$PATH:$HOME/.local/bin
\ No newline at end of file