diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc
index f55e042..a34678f 100755
--- a/.config/bspwm/bspwmrc
+++ b/.config/bspwm/bspwmrc
@@ -6,13 +6,10 @@ xrdb -load $HOME/.config/.Xresources &
 dunst -conf $HOME/.config/dunst/dunstrc &
 picom &
 feh --bg-fill ~/Pictures/nordic-obsession.png &
-killall -q polybar
-
-# xrandr --output DisplayPort-2 --primary --mode 1920x1080 --rotate normal --output eDP --mode 1920x1080 --rotate normal --right-of DisplayPort-2
 
 xset -b
 
-DISPLAYS=$(bspc query -M --names)
+DISPLAYS=$(xrandr -q | grep -w 'connected' | cut -d ' ' -f 1)
 EXT_PRIMARY=""
 
 for DISP in ${DISPLAYS}; do
@@ -21,7 +18,8 @@ for DISP in ${DISPLAYS}; do
     fi
 done
 
-if [ -n ${EXT_PRIMARY} ]; then
+killall -q polybar
+if [ ${EXT_PRIMARY} != "" ]; then
     xrandr --output ${EXT_PRIMARY} --primary --output eDP --right-of ${EXT_PRIMARY}
     bspc monitor ${EXT_PRIMARY} -d I II III IV V
     bspc monitor eDP -d VI VII VIII IX X
diff --git a/.config/polybar/config b/.config/polybar/config
index 29210cc..ab9b3c6 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -332,7 +332,7 @@ animation-discharging-framerate = 750
 [module/temperature]
 type = internal/temperature
 thermal-zone = 0
-warn-temperature = 60
+warn-temperature = 85
 
 format = <ramp> <label>
 format-underline = #f50a4d
@@ -347,6 +347,7 @@ ramp-0 = 
 ramp-1 = 
 ramp-2 = 
 ramp-foreground = ${colors.foreground-alt}
+hwmon-path = /sys/devices/platform/thinkpad_hwmon/hwmon/hwmon3/temp1_input
 
 [module/powermenu]
 type = custom/menu
diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc
index fddf0e3..c3de8b2 100644
--- a/.config/sxhkd/sxhkdrc
+++ b/.config/sxhkd/sxhkdrc
@@ -1,48 +1,48 @@
 #Terminal
 super + Return
-	konsole
+        konsole
 #Program launcher
 super + r
-	dmenu_run
+        dmenu_run
 #Firefox
 super + d
-	firefox
+        firefox
 # Lock Screen
 super + l
         betterlockscreen -l
 #Nautilus
 super + p
-	dolphin
+        dolphin
 #Quit/restart bspwm
 super + alt + {q,r}
-	bspc {quit,wm -r}
+        bspc {quit,wm -r}
 #Close and kill
 super + {_,shift + }v
-	bspc node -{c,k}
+        bspc node -{c,k}
 #Set the window state
 super + {t,s,f}
-	bspc node -t {tiled,floating,fullscreen}
+        bspc node -t {tiled,floating,fullscreen}
 #Focus the node in the given direction
 super + {_,shift + }{h,j,k,l}
-	bspc node -{f,s} {west,south,north,east}
+        bspc node -{f,s} {west,south,north,east}
 #Focus or send to the given desktop
 super + {_,shift + }{1-9,0}
-	bspc {desktop -f,node -d} '^{1-9,10}'
+        bspc {desktop -f,node -d} '^{1-9,10}'
 #Preselect the direction
 super + ctrl + {h,j,k,l}
-	bspc node -p {west,south,north,east}
+        bspc node -p {west,south,north,east}
 #Preselect the ratio
 super + ctrl + {1-9}
-	bspc node -o 0.{1-9}
+        bspc node -o 0.{1-9}
 #Cancel the preselection for the focused desktop
 super + Escape
-	bspc query -N -d | xargs -I id -n 1 bspc node id -p cancel
+        bspc query -N -d | xargs -I id -n 1 bspc node id -p cancel
 #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}
+        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}
+        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}
+        bspc node -v {-20 0,0 20,0 -20,20 0}