diff --git a/.config/i3/config b/.config/i3/config
index 7adb3d6a..b8918eaa 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -90,7 +90,6 @@ bindsym $mod+Ctrl+l		move workspace to output right
 bindsym $mod+z			gaps outer current plus 5
 bindsym $mod+Shift+z		gaps outer current minus 5
 
-bindsym $mod+b			bar mode toggle
 bindsym $mod+Shift+b		floating toggle; sticky toggle; exec --no-startup-id hover left
 
 bindsym $mod+Shift+n		floating toggle; sticky toggle; exec --no-startup-id hover right
diff --git a/.config/polybar/config b/.config/polybar/config
index 1899b86f..74603ed4 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -74,8 +74,10 @@ adapter = ADP1
 full-at = 98
 
 ; orange denotes charging
-format-charging =%{u#ffa500}%{+u}<label-charging>
+format-charging =<label-charging>
 label-charging = Batt: %percentage%%
+label-charging-overline=#ffa500
+label-charging-underline=#ffa500
 
 format-discharging = <ramp-capacity> <label-discharging>
 label-discharging = Batt: %percentage%%
@@ -103,13 +105,6 @@ time = "%I:%M%p"
 format-prefix-foreground = ${colors.gray}
 label = %{A1:google-chrome-stable https\://calendar.google.com >/dev/null 2>&1 &:}%date% %time%%{A}
 
-[module/email]
-type = custom/script
-exec = mailbox
-interval = 5
-format-prefix = " "
-click-left = st -e neomutt
-
 [module/ethernet]
 type = internal/network
 interface = eth1
diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc
index ccd123df..a727fbe4 100644
--- a/.config/sxhkd/sxhkdrc
+++ b/.config/sxhkd/sxhkdrc
@@ -17,6 +17,8 @@ super + shift + q
 	kill -9 `xdotool getwindowfocus getwindowpid`
 super + d
 	dmenu_run
+super + b
+	polybar-msg cmd toggle
 super + r
 	$TERMINAL -e $FILE
 super + e
@@ -74,24 +76,10 @@ super + Print
 	dmenurecord
 super + Delete
 	dmenurecord kill
+alt + shift + escape
+	pkill -USR1 -x sxhkd
 
-# Pause audio
-super + p
-	mpc toggle
-super + shift + p
-	mpc pause; pauseallmpv
-# Changes to next/previous tracks
-super + {comma,period}
-	mpc {prev,next}
-# Restart track
-super + shift + less
-	mpc seek 0%
-# Seek foward in song
-super + {_,shift +} bracketright
-	mpc seek +{10,120}
-# Seek backward in song
-super + {_,shift +} bracketleft
-	mpc seek -{10,120}
+# Volume
 # Increase volume
 super {_,shift +} + plus
 	amixer sset Master {5,15}%+
@@ -101,41 +89,6 @@ super {_,shift +} + minus
 super + shift + m
 	amixer sset Master toggle
 
-# Audiokeys
-XF86AudioMute
-	amixer sset Master toggle
-XF86Audio{Raise,Lower}Volume
-	amixer sset Master 5%{+,-}
-XF86Audio{Next,Prev}
-	mpc {next,prev}
-XF86Audio{Pause,Play,Stop}
-	mpc {pause,play,stop}
-XF86Audio{Rewind,Forward}
-	mpc seek {-,+}10
-XF86AudioRecord
-	dmenurecord
-XF86AudioMedia
-	$TERMINAL -e ncmpcpp
-
-XF86PowerOff
-	prompt "Shutdown computer?" "sudo -A shutdown -h now"
-XF86Calculator
-	$TERMINAL -e bc
-XF86Sleep
-	prompt 'Hibernate computer?' 'sudo -A zzz'
-XF86WWW
-	$BROWSER
-XF86DOS
-	$TERMINAL
-XF86ScreenSaver
-	mpc pause; pauseallmpv; i3lock -e -f -c 1d2021; xset dpms force off
-XF86TaskPane
-	$TERMINAL -e htop
-XF86Mail
-	$TERMINAL -e neomutt
-XF86MyComputer
-	$TERMINAL -e $FILE /
-
 # Function keys
 # Show readme
 super + F1
@@ -149,9 +102,6 @@ super + F4
 	prompt 'Hibernate computer?' 'sudo -A zzz -Z'
 super + F5
 	killall screenkey || screenkey
-# sync email
-super + F8
-	mailsync
 # Mount a USB drive or Android device
 super + {F9,F10}
 	{dmenumount,dmenuumount}