diff --git a/.config/suckless/dwm/config.h b/.config/suckless/dwm/config.h
index 7908f3a..7d96ce4 100644
--- a/.config/suckless/dwm/config.h
+++ b/.config/suckless/dwm/config.h
@@ -1,5 +1,5 @@
-static const unsigned int borderpx  = 3;
-static const unsigned int gappx	    = 10;
+static const unsigned int borderpx  = 2;
+static const unsigned int gappx	    = 5;
 static const unsigned int snap      = 32;
 static const int showbar            = 1;
 static const int topbar             = 1;
@@ -10,7 +10,7 @@ static const char *colors[][3]      = {
 	[SchemeSel]  = { "#374145", "#DBBC7F", "#A7C080" },
 };
 
-static const char *tags[] = { "1", "2", "3", "4" };
+static const char *tags[] = { "1", "2", "3" };
 static const Rule rules[] = {
 	{ "PrismLauncher", "prismlauncher",	NULL, 	1 << 2,	  0,   -1 },
 	{ "librewolf", "Navigator",	NULL, 	1 << 1,	  0,   -1 }, 
diff --git a/.config/suckless/dwm/scripts/shuffle_wallpapers.sh b/.config/suckless/dwm/scripts/shuffle_wallpapers.sh
index 2cadbd0..abbdb3b 100755
--- a/.config/suckless/dwm/scripts/shuffle_wallpapers.sh
+++ b/.config/suckless/dwm/scripts/shuffle_wallpapers.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 while true; do
   xwallpaper --zoom "$(find /home/andrew/.config/suckless/dwm/Wallpapers -type f | shuf -n1)"
-  date +%s > /tmp/last_wallpaper_time  # Save current timestamp
   sleep 600  # Pause for 10 minutes - default 600 seconds
 done
diff --git a/.xinitrc b/.xinitrc
index 93a220c..e25342b 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,11 +1,9 @@
 gentoo-pipewire-launcher &
-eval "$(dbus-launch --sh-syntax --exit-with-session)" &
 xinput set-prop "Logitech USB Receiver Mouse" "libinput Accel Speed" -0.4 &
 sh /home/andrew/.config/suckless/dwm/scripts/shuffle_wallpapers.sh &
-st -e bash -c 'cd /home/andrew/personal/Server/ && /home/andrew/personal/Server/start.sh' &
 xrandr --output HDMI-A-0 --mode 1920x1080 --rate 144 &
 while true; do
     pkill slstatus
-    slstatus &
+    slstatus
     dwm 2>~/.dwm.log
 done
diff --git a/env.sh b/env.sh
index c041501..a1de4cc 100755
--- a/env.sh
+++ b/env.sh
@@ -13,17 +13,17 @@ CONFIG="${PERSONAL_HOME}.config/"
 LOCAL="${PERSONAL_HOME}.local/"
 
 ORIGINAL_DOTS=(
-	"${DOTFILES_CONFIG}nvim/"
 	"${DOTFILES_CONFIG}suckless/"
+	"${DOTFILES_CONFIG}nvim/"
 	"${DOTFILES_LOCAL}share/fonts/"
 	"${DOTFILES_HOME}.xinitrc"
 	"${DOTFILES_HOME}.bashrc") 
 COPY_DOTS=(
-	"${CONFIG}nvim/"
 	"${CONFIG}suckless/"
+	"${CONFIG}nvim/"
 	"${LOCAL}share/fonts/"
 	"${PERSONAL_HOME}.xinitrc"
-	"${PERSONAL_HOME}.bashrc") 
+	"${PERSONAL_HOME}.bashrc")
 
 for x in "${!COPY_DOTS[@]}"; do
 	i="${COPY_DOTS[${x}]}"
@@ -52,11 +52,11 @@ for x in "${!ORIGINAL_DOTS[@]}"; do
 
 done
 
-echo -e "${GREEN}Re-caching fonts${RESET}"
-fc-cache -f
-
 echo -e "${GREEN}Rebuilding Suckless Software${RESET}"
 for x in "${CONFIG}suckless"/*/; do
 	[[ -d "${x}" ]] || continue
 	cd "${x}" && make && doas make install && make clean
 done
+
+echo -e "${GREEN}Re-caching fonts${RESET}"
+fc-cache -f