diff --git a/.bashrc b/.bashrc
index 1f3a97d..d82a140 100644
--- a/.bashrc
+++ b/.bashrc
@@ -5,6 +5,6 @@ export PATH="$HOME/.local/bin:$PATH"
 myfetch.sh
 
 alias ls="ls -a --color"
-alias comp="make && doas make install && make clean && pkill dwm"
+alias comp="make && doas make install && make clean"
 alias update_world='doas emerge --ask --update --newuse --deep @world'
 alias env="sh /home/andrew/personal/dotfiles/env.sh"
diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc
deleted file mode 100644
index a01202a..0000000
--- a/.config/dunst/dunstrc
+++ /dev/null
@@ -1,82 +0,0 @@
-[global]
-monitor = 0
-follow = none
-
-width = 300
-height = (0, 300)
-origin = bottom-center 
-offset = (10, 50)
-scale = 0
-
-notification_limit = 5
-
-progress_bar = true
-progress_bar_height = 10
-progress_bar_frame_width = 1
-progress_bar_min_width = 150
-progress_bar_max_width = 300
-progress_bar_corner_radius = 0
-progress_bar_corners = all
-
-icon_corner_radius = 0
-icon_corners = all
-indicate_hidden = yes
-transparency = 0
-separator_height = 2
-padding = 8
-horizontal_padding = 8
-text_icon_padding = 0
-frame_width = 1
-frame_color = "#d699b6"
-gap_size = 0
-separator_color = frame
-sort = yes
-idle_threshold = 10
-
-font = Cascadia Mono 10
-line_height = 0
-markup = full
-format = "<b>%s</b>\n%b"
-alignment = left
-vertical_alignment = center
-show_age_threshold = 60
-ellipsize = middle
-ignore_newline = no
-stack_duplicates = true
-hide_duplicate_count = false
-show_indicators = yes
-
-enable_recursive_icon_lookup = true
-icon_theme = Adwaita
-icon_position = left
-min_icon_size = 0
-max_icon_size = 0
-icon_path = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/
-
-sticky_history = yes
-history_length = 20
-
-dmenu = /usr/bin/dmenu -p dunst:
-browser = /usr/bin/xdg-open
-always_run_script = true
-title = Dunst
-class = Dunst
-corner_radius = 5
-corners = all
-ignore_dbusclose = false
-force_xwayland = false
-force_xinerama = false
-
-mouse_left_click = close_current
-mouse_middle_click = do_action, close_current
-mouse_right_click = close_all
-
-background = "#2d353b"
-foreground = "#d3c6aa"
-highlight = "#a7c080"
-timeout = 2
-
-[experimental]
-per_monitor_dpi = false
-
-# vim: ft=cfg
diff --git a/.config/ghostty/config b/.config/ghostty/config
index 5a22d5d..4d202c6 100644
--- a/.config/ghostty/config
+++ b/.config/ghostty/config
@@ -1,4 +1,4 @@
-font-size = 11
+font-size = 10
 font-family = "Cascadia Code"
 font-style = "SemiBold"
 font-thicken = true
diff --git a/.config/suckless/dwm/config.h b/.config/suckless/dwm/config.h
index 9e75c73..c3551b5 100644
--- a/.config/suckless/dwm/config.h
+++ b/.config/suckless/dwm/config.h
@@ -14,8 +14,6 @@ static const Rule rules[] = {
 	{ "ghostty",   NULL, NULL, 1,      0, -1 },
 	{ "librewolf", 	   NULL, NULL, 1 << 1, 0, -1 }, 
 	{ "steam", 	   NULL, NULL, 1 << 2, 0, -1 }, 
-	{ "PrismLauncher", NULL, NULL, 1 << 2, 0, -1 },
-	{ "Hello World", NULL, NULL, 1, 1, -1 },
 };
 
 static const float mfact     = 0.55;
@@ -42,7 +40,6 @@ static const Key keys[] = {
 	{ MODKEY,                       XK_space,      			spawn,          SHCMD("dmenu_run -l 6") },
 	{ MODKEY,                       XK_f,      			spawn,          SHCMD("librewolf") },
 	{ MODKEY|ShiftMask,             XK_s,	 			spawn,          SHCMD("steam") },
-	{ MODKEY|ShiftMask,             XK_p,      			spawn,          SHCMD("prismlauncher") },
 	{ MODKEY,	                XK_t,      			spawn,          SHCMD("/home/andrew/.local/bin/dmenu-sessionizer.sh") },
 	{ MODKEY,                       XK_j,				focusstack,     {.i = +1 } },
 	{ MODKEY,                       XK_k,				focusstack,     {.i = -1 } },
@@ -53,8 +50,8 @@ static const Key keys[] = {
 	{ MODKEY|ShiftMask,             XK_space,			togglefloating, {0} },
 	{ MODKEY|ShiftMask,             XK_0,				tag,            {.ui = ~0 } },
 
-	{ 0, 				XF86XK_AudioRaiseVolume,   	spawn, 		SHCMD("sh /home/andrew/.config/suckless/dwm/scripts/volume.sh up") },
-	{ 0, 				XF86XK_AudioLowerVolume,   	spawn, 		SHCMD("sh /home/andrew/.config/suckless/dwm/scripts/volume.sh down") },
+	{ 0, 				XF86XK_AudioRaiseVolume,   	spawn, 		SHCMD("pactl set-sink-volume @DEFAULT_SINK@ +2%") },
+	{ 0, 				XF86XK_AudioLowerVolume,   	spawn, 		SHCMD("pactl set-sink-volume @DEFAULT_SINK@ -2%") },
 
 	TAGKEYS(XK_1, 0) TAGKEYS(XK_2, 1) TAGKEYS(XK_3, 2)
 };
diff --git a/.config/suckless/dwm/scripts/sflwal.sh b/.config/suckless/dwm/scripts/sflwal.sh
deleted file mode 100755
index dfbe7f5..0000000
--- a/.config/suckless/dwm/scripts/sflwal.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-while true; do
-	xwallpaper --zoom "$(find /home/andrew/.config/suckless/dwm/bgs -type f | shuf -n1)"
-	sleep 600  # Pause for 10 minutes - default 600 seconds
-done
diff --git a/.config/suckless/dwm/scripts/volume.sh b/.config/suckless/dwm/scripts/volume.sh
deleted file mode 100755
index b9386b2..0000000
--- a/.config/suckless/dwm/scripts/volume.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-if [ "$1" == "up" ]; then
-	pactl set-sink-volume @DEFAULT_SINK@ +2%
-elif [ "$1" == "down" ]; then
-	pactl set-sink-volume @DEFAULT_SINK@ -2%
-fi
-
-TEST=$(wpctl get-volume @DEFAULT_AUDIO_SINK@ | awk '{printf "%d%%", $2 * 100}')
-if [[ -z "${TEST}" ]]; then
-	dunstify "Volume: No working" -h string:synchronous:volume
-else 
-	dunstify "Volume: ${TEST}" -h int:value:${TEST%%%} -h string:synchronous:volume
-fi
diff --git a/.xinitrc b/.xinitrc
index b40c346..c06ae84 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,13 +1,9 @@
 gentoo-pipewire-launcher &
-xinput set-prop "Logitech USB Receiver Mouse" "libinput Accel Speed" -0.4 &
 xrandr --output HDMI-A-0 --mode 1920x1080 --rate 144 &
-dunst &
 picom -b &
-# Start tmux if not running
+setxkbmap -option ctrl:nocaps &
 if ! tmux has-session -t main 2>/dev/null; then
     tmux new-session -d -s main
 fi
-while true; do
-	xwallpaper --zoom "$(find /home/andrew/.config/suckless/dwm/bgs -type f | shuf -n1)" &
-	dwm 2>.dwm.log
-done
+xwallpaper --zoom "$(find /home/andrew/.config/suckless/dwm/bgs -type f | shuf -n1)" &
+exec dwm
diff --git a/env.sh b/env.sh
index 736f527..cc22b9d 100755
--- a/env.sh
+++ b/env.sh
@@ -17,7 +17,6 @@ ORIGINAL_DOTS=(
 	"${DOTFILES_CONFIG}tmux/"
 	"${DOTFILES_CONFIG}suckless/"
 	"${DOTFILES_CONFIG}ghostty/"
-	"${DOTFILES_CONFIG}dunst/"
 	"${DOTFILES_CONFIG}picom.conf"
 	"${DOTFILES_LOCAL}share/fonts/"
 	"${DOTFILES_LOCAL}bin/"
@@ -30,7 +29,6 @@ COPY_DOTS=(
 	"${CONFIG}tmux/"
 	"${CONFIG}suckless/"
 	"${CONFIG}ghostty/"
-	"${CONFIG}dunst/"
 	"${CONFIG}picom.conf"
 	"${LOCAL}share/fonts/"
 	"${LOCAL}bin/"