diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc
deleted file mode 100755
index a5bf2c9..0000000
--- a/.config/bspwm/bspwmrc
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-pgrep -x sxhkd > /dev/null || sxhkd &
-
-bspc monitor -d I II III
-
-bspc config border_width         2
-bspc config window_gap          12
-
-bspc config split_ratio          0.52
-bspc config borderless_monocle   true
-bspc config gapless_monocle      true
diff --git a/.config/pulse/aurelia-runtime b/.config/pulse/aurelia-runtime
deleted file mode 120000
index 77c8636..0000000
--- a/.config/pulse/aurelia-runtime
+++ /dev/null
@@ -1 +0,0 @@
-/tmp/pulse-Zwz6kTSwrL9s
\ No newline at end of file
diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc
deleted file mode 100755
index 8e52c3c..0000000
--- a/.config/sxhkd/sxhkdrc
+++ /dev/null
@@ -1,121 +0,0 @@
-#
-# wm independent hotkeys
-#
-
-# terminal emulator
-super + Return
-	wezterm
-
-# program launcher
-super + @space
-	dmenu_run
-
-# make sxhkd reload its configuration files:
-super + Escape
-	pkill -USR1 -x sxhkd
-
-#
-# bspwm hotkeys
-#
-
-# quit/restart bspwm
-super + alt + {q,r}
-	bspc {quit,wm -r}
-
-# close and kill
-super + {_,shift + }w
-	bspc node -{c,k}
-
-# alternate between the tiled and monocle layout
-super + m
-	bspc desktop -l next
-
-# send the newest marked node to the newest preselected node
-super + y
-	bspc node newest.marked.local -n newest.!automatic.local
-
-# swap the current node and the biggest window
-super + g
-	bspc node -s biggest.window
-
-#
-# state/flags
-#
-
-# set the window state
-super + {t,shift + t,s,f}
-	bspc node -t {tiled,pseudo_tiled,floating,fullscreen}
-
-# set the node flags
-super + ctrl + {m,x,y,z}
-	bspc node -g {marked,locked,sticky,private}
-
-#
-# focus/swap
-#
-
-# focus the node in the given direction
-super + {_,shift + }{h,j,k,l}
-	bspc node -{f,s} {west,south,north,east}
-
-# focus the node for the given path jump
-super + {p,b,comma,period}
-	bspc node -f @{parent,brother,first,second}
-
-# focus the next/previous window in the current desktop
-super + {_,shift + }c
-	bspc node -f {next,prev}.local.!hidden.window
-
-# focus the next/previous desktop in the current monitor
-super + bracket{left,right}
-	bspc desktop -f {prev,next}.local
-
-# focus the last node/desktop
-super + {grave,Tab}
-	bspc {node,desktop} -f last
-
-# focus the older or newer node in the focus history
-super + {o,i}
-	bspc wm -h off; \
-	bspc node {older,newer} -f; \
-	bspc wm -h on
-
-# focus or send to the given desktop
-super + {_,shift + }{1-9,0}
-	bspc {desktop -f,node -d} '^{1-9,10}'
-
-#
-# preselect
-#
-
-# preselect the direction
-super + ctrl + {h,j,k,l}
-	bspc node -p {west,south,north,east}
-
-# preselect the ratio
-super + ctrl + {1-9}
-	bspc node -o 0.{1-9}
-
-# cancel the preselection for the focused node
-super + ctrl + space
-	bspc node -p cancel
-
-# cancel the preselection for the focused desktop
-super + ctrl + shift + space
-	bspc query -N -d | xargs -I id -n 1 bspc node id -p cancel
-
-#
-# move/resize
-#
-
-# expand a window by moving one of its side outward
-super + alt + {h,j,k,l}
-	bspc node -z {left -20 0,bottom 0 20,top 0 -20,right 20 0}
-
-# contract a window by moving one of its side inward
-super + alt + shift + {h,j,k,l}
-	bspc node -z {right -20 0,top 0 20,bottom 0 -20,left 20 0}
-
-# move a floating window
-super + {Left,Down,Up,Right}
-	bspc node -v {-20 0,0 20,0 -20,20 0}
diff --git a/setup.sh b/setup.sh
old mode 100644
new mode 100755
index 3afd13b..74a086e
--- a/setup.sh
+++ b/setup.sh
@@ -1,12 +1,14 @@
-sudo xbps-install -y stow xtools neovim tmux yazi zsh 
+
+# CLI Tools
+sudo xbps-install -y stow xtools neovim tmux yazi zsh starship
+
 mkdir $HOME/.dotfiles
 cp ./.stow-local-ignore $HOME/.dotfiles/
 cp -r ./.* $HOME/.dotfiles/
 cp -r ./* $HOME/.dotfiles/
 cd $HOME/.dotfiles && stow . && cd -
 
-sudo xbps-install -y xorg picom feh bspwm sxhkd wezterm firefox autorandr
-sudo xbps-install -y river wezterm firefox 
+sudo xbps-install -y fira-code river wezterm firefox 
 sudo xbps-install -y rustup ghc openjdk21 apache-maven gradle nodejs
 
 mkdir --parents ~/projects/rust