diff --git a/bspwm/bspwmrc b/bspwm/bspwmrc
index 682b70b..c8d825e 100755
--- a/bspwm/bspwmrc
+++ b/bspwm/bspwmrc
@@ -2,13 +2,13 @@
 
 pgrep -x sxhkd > /dev/null || sxhkd &
 
-bspc monitor -d I II III IV V VI VII VIII IX X
-# bspc monitor eDP1 -d I II III IV
-# bspc monitor DP1 -d V VI VII VIII IX X
+bspc monitor DP-4 -d I II III IV
+bspc monitor DP-0 -d V VI VII VIII IX X
 
-bspc config border_width 6
-bspc config window_gap 15
-bspc config top_padding 60
+bspc config border_width 5
+bspc config border_radius 14
+bspc config window_gap 8
+bspc config top_padding 42
 
 bspc config split_ratio 0.55
 bspc config borderless_monocle true
@@ -17,8 +17,8 @@ bspc config pointer_follows_focus true
 bspc config focus_follows_pointer true
 
 bspc rule -a Gimp desktop='^8' state=floating follow=on
-bspc rule -a Chromium desktop='^2'
-bspc rule -a firefox desktop='^2'
+bspc rule -a Chromium desktop='^5'
+bspc rule -a firefox desktop='^5'
 bspc rule -a mplayer2 state=floating
 bspc rule -a Yad state=floating
 bspc rule -a Kupfer.py focus=on
@@ -26,40 +26,54 @@ bspc rule -a Screenkey manage=off
 bspc rule -a gl state=floating
 bspc rule -a Gl state=floating
 bspc rule -a mpv state=floating
+bspc rule -a Emacs state=floating center=true rectangle=1900x1111+0+0
+bspc rule -a DBeaver state=floating center=true rectangle=2123x1234+0+0
 
 # Border
 # dracula blue
-bspc config focused_border_color "#bd93f9"
+# bspc config focused_border_color "#bd93f9"
+bspc config focused_border_color "#2C4762"
 bspc config normal_border_color "#073642"
 bspc config active_border_color "#073642"
 
-#
 # Autostart
-#
-# Set display from arandr saved script
-sh ~/.screenlayout/monitor.sh &
+
+# Wallpapers
+# feh --bg-scale ~/.wallpapers/MYSanGun-Inverted.png ~/.wallpapers/MYSanGun.png
+variety &
+
+copyq &
+
 # Notifications
-/usr/bin/dunst &
+dunst -conf ~/.config/dunst/dunstrc &
+
 # Polkit
 /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
-# Wallpaper
-# nitrogen --restore &
+
 # Dex
 dex -a -s /etc/xdg/autostart/:~/.config/autostart/
+
 # Picom
 picom --config ~/.config/picom/picom.conf &
+
 # Network Applet
 nm-applet --indicator &
 
-# SmoothVideoProject
-SVPManager &
+# emacs --bg-daemon
+
+SVPManager \t &
 
 # screensaver
-xss-lock -- xscreensaver-command -lock &
+if pgrep xscreensaver; then
+	killall xscreensaver
+fi
+xscreensaver --no-splash &
 
 # Bar
-# ~/.config/polybar/launch.sh &
-~/SudacodeRice/scripts/launch.sh
+~/SudacodeRice/scripts/launch_desktop.sh
+
+# start yubikey ssh-agen
+yubikey-agent -l "$XDG_RUNTIME_DIR/yubikey-agent/yubikey-agent.sock" &
 
 # Cursor
 # xsetroot -cursor_name left_ptr &
diff --git a/polybar-themes/sblocks/config.ini b/polybar-themes/sblocks/config.ini
index b8101cf..c1f9167 100644
--- a/polybar-themes/sblocks/config.ini
+++ b/polybar-themes/sblocks/config.ini
@@ -70,7 +70,6 @@ height = 40
 ; the percentage can optionally be extended with a pixel offset like so:
 ; 50%:-10, this will result in an offset in the x or y direction
 ; of 50% minus 10 pixels
-; offset-x = 2.5%
 offset-x = 0.3%
 offset-y = 0.38%
 
@@ -89,15 +88,14 @@ foreground = ${color.foreground}
 ; doesn't get rounded
 ; Individual top/bottom values can be defined using:
 ;   radius-{top,bottom}
-; HANDLED BY PICOM
-; radius-top = 0.0
-; radius-bottom = 0.0
+radius-top = 14.0
+radius-bottom = 14.0
 
 ; Under-/overline pixel size and argb color
 ; Individual values can be defined using:
 ;   {overline,underline}-size
 ;   {overline,underline}-color
-line-size = 5
+line-size = 6
 line-color = ${color.background}
 
 ; Values applied to all borders
@@ -117,7 +115,8 @@ border-bottom-color = ${color.primary}
 ; Number of spaces to add at the beginning/end of the bar
 ; Individual side values can be defined using:
 ;   padding-{left,right}
-padding = 0.5
+; padding = 0.5
+padding = 1
 
 ; Number of spaces to add before/after each module
 ; Individual side values can be defined using: