diff --git a/.config/i3/config b/.config/i3/config
index 1fe17b8b..d58054f4 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -33,134 +33,134 @@ for_window [class="Pulse"] move to workspace $ws9
 
 # #---Basic Bindings---# #
 # Return
-bindsym $mod+Return		exec $term
+bindsym $mod+Return		      exec $term
 bindsym $mod+Shift+Return		exec --no-startup-id samedir
 
 # Space
-bindsym $mod+Shift+space 	floating toggle
-bindsym $mod+space		focus mode_toggle
+bindsym $mod+Shift+space 	  floating toggle
+bindsym $mod+space		      focus mode_toggle
 
-bindsym $mod+Escape		workspace prev
+bindsym $mod+Escape		      workspace prev
 
 # `
-bindsym $mod+grave		exec --no-startup-id dmenuunicode
+bindsym $mod+grave		      exec --no-startup-id dmenuunicode
 
 # Show selection:
-bindsym $mod+Insert		exec --no-startup-id showclip
+bindsym $mod+Insert		      exec --no-startup-id showclip
 
 # #---Letter Key Bindings---# #
 # A
-bindsym $mod+a			exec --no-startup-id ddspawn dropdowncalc -f mono:pixelsize=24
-bindsym $mod+shift +a		$TERMINAL -e alsamixer; pkill -RTMIN+10 $STATUSBAR
+bindsym $mod+a			        exec --no-startup-id ddspawn dropdowncalc -f mono:pixelsize=24
+bindsym $mod+shift +a		    $TERMINAL -e alsamixer; pkill -RTMIN+10 $STATUSBAR
 
 # B
-bindsym $mod+b		exec --no-startup-id polybar_msg cmd toggle
-bindsym $mod+Shift+b		floating toggle; sticky toggle; exec --no-startup-id hover left
+bindsym $mod+b		          exec --no-startup-id polybar_msg cmd toggle
+bindsym $mod+Shift+b		    floating toggle; sticky toggle; exec --no-startup-id hover left
 
 # C
-bindsym $mod+c		exec code
-bindsym $mod+Shift+c		exec $TERMINAL mpv --no-osc --no-input-default-bindings --input-conf=/dev/null --title='mpvfloat' /dev/video0
+bindsym $mod+c		          exec code
+bindsym $mod+Shift+c	    	exec $TERMINAL mpv --no-osc --no-input-default-bindings --input-conf=/dev/null --title='mpvfloat' /dev/video0
 
 # D
-bindsym $mod+d			exec --no-startup-id dmenu_run
-bindsym $mod+Shift+d		gaps inner current set 0; gaps outer current set 0
+bindsym $mod+d			        exec --no-startup-id dmenu_run
+bindsym $mod+Shift+d		    gaps inner current set 0; gaps outer current set 0
 
 # F
-bindsym $mod+f			fullscreen toggle
+bindsym $mod+f		          fullscreen toggle
 
 # G
-bindsym $mod+g			workspace prev
-bindsym $mod+Shift+g		exec --no-startup-id gimp; workspace $ws5
+bindsym $mod+g		          workspace prev
+bindsym $mod+Shift+g	    	exec --no-startup-id gimp; workspace $ws5
 
 # H
-bindsym $mod+h			focus left
-bindsym $mod+Shift+h		move left 30
-bindsym $mod+Ctrl+h		move workspace to output left
+bindsym $mod+h		          focus left
+bindsym $mod+Shift+h		    move left 30
+bindsym $mod+Ctrl+h		      move workspace to output left
 
 # I
-bindsym $mod+i 			exec $term -e htop
-bindsym $mod+Shift+i		exec --no-startup-id i3resize up
+bindsym $mod+i		          exec $term -e htop
+bindsym $mod+Shift+i		    exec --no-startup-id i3resize up
 
 # J
-bindsym $mod+j			focus down
-bindsym $mod+Shift+j		move down 30
-bindsym $mod+Ctrl+j		move workspace to output down
+bindsym $mod+j			        focus down
+bindsym $mod+Shift+j		    move down 30
+bindsym $mod+Ctrl+j		      move workspace to output down
 
 # K
-bindsym $mod+k			focus up
-bindsym $mod+Shift+k		move up 30
-bindsym $mod+Ctrl+k		move workspace to output up
+bindsym $mod+k		          focus up
+bindsym $mod+Shift+k		    move up 30
+bindsym $mod+Ctrl+k		      move workspace to output up
 
 # L
-bindsym $mod+l			focus right
-bindsym $mod+Shift+l		move right 30
-bindsym $mod+Ctrl+l		move workspace to output right
+bindsym $mod+l		          focus right
+bindsym $mod+Shift+l		    move right 30
+bindsym $mod+Ctrl+l		      move workspace to output right
 
 # M
-bindsym $mod+m		exec spotify
-bindsym $mod+Shift+m		exec --no-startup-id amixer sset Master toggle; pkill -RTMIN+10 i3blocks
+bindsym $mod+m		          exec spotify
+bindsym $mod+Shift+m		    exec --no-startup-id amixer sset Master toggle; pkill -RTMIN+10 i3blocks
 
 # N
-bindsym $mod+n		exec nautilus
-bindsym $mod+Shift+n		floating toggle; sticky toggle; exec --no-startup-id hover right
+bindsym $mod+n		          exec nautilus
+bindsym $mod+Shift+n		    floating toggle; sticky toggle; exec --no-startup-id hover right
 
 # O
-bindsym $mod+o			sticky toggle
-bindsym $mod+Shift+o		exec --no-startup-id i3resize right
+bindsym $mod+o		          sticky toggle
+bindsym $mod+Shift+o		    exec --no-startup-id i3resize right
 
 # P
-bindsym $mod+Shift+p    exec pycharm
+bindsym $mod+Shift+p        exec pycharm
 
 # Q
-bindsym $mod+q			[con_id="__focused__" instance="^(?!dropdown_).*$"] kill
-bindsym $mod+Shift+q		[con_id="__focused__" instance="^(?!dropdown_).*$"] exec --no-startup-id kill -9 `xdotool getwindowfocus getwindowpid`
+bindsym $mod+q		          [con_id="__focused__" instance="^(?!dropdown_).*$"] kill
+bindsym $mod+Shift+q		    [con_id="__focused__" instance="^(?!dropdown_).*$"] exec --no-startup-id kill -9 `xdotool getwindowfocus getwindowpid`
 
 # R
-bindsym $mod+r 			exec $term -e $FILE
+bindsym $mod+r		          exec $term -e $FILE
 
 # S
-bindsym $mod+s			gaps inner current plus 5
-bindsym $mod+Shift+s		gaps inner current minus 5
+bindsym $mod+s		          gaps inner current plus 5
+bindsym $mod+Shift+s	    	gaps inner current minus 5
 
 # T
-bindsym $mod+t			split toggle
-bindsym $mod+Shift+t		gaps inner current set 15; gaps outer current set 15
+bindsym $mod+t	          	split toggle
+bindsym $mod+Shift+t		    gaps inner current set 15; gaps outer current set 15
 
 # U
-bindsym $mod+u			exec --no-startup-id ddspawn tmuxdd
-bindsym $mod+Shift+u		exec --no-startup-id i3resize down
+bindsym $mod+u		        	exec --no-startup-id ddspawn tmuxdd
+bindsym $mod+Shift+u		    exec --no-startup-id i3resize down
 
 # W
-bindsym $mod+w    exec $TERMINAL -e sudo nmtui
-bindsym $mod+Shift+w    exec $BROWSER
+bindsym $mod+w              exec $TERMINAL -e sudo nmtui
+bindsym $mod+Shift+w        exec $BROWSER
 
 # Y
-bindsym $mod+y			exec $term -e calcurse -D ~/.config/calcurse
-bindsym $mod+Shift+y		exec --no-startup-id i3resize left
+bindsym $mod+y		          exec $term -e calcurse -D ~/.config/calcurse
+bindsym $mod+Shift+y	    	exec --no-startup-id i3resize left
 
 # Z
-bindsym $mod+z			gaps outer current plus 5
-bindsym $mod+Shift+z		gaps outer current minus 5
+bindsym $mod+z		          gaps outer current plus 5
+bindsym $mod+Shift+z	    	gaps outer current minus 5
 
 # #---Workspace Bindings---# #
-bindsym $mod+Home		workspace $ws1
-bindsym $mod+Shift+Home		move container to workspace $ws1
-bindsym $mod+End		workspace $ws10
-bindsym $mod+Shift+End		move container to workspace $ws10
-bindsym $mod+Prior		workspace prev
-bindsym $mod+Shift+Prior	move container to workspace prev
-bindsym $mod+Next		workspace next
-bindsym $mod+Shift+Next		move container to workspace next
-bindsym $mod+Tab		workspace back_and_forth
-bindsym $mod+XF86Back		workspace prev
-bindsym $mod+Shift+XF86Back	move container to workspace prev
-bindsym $mod+XF86Forward	workspace next
+bindsym $mod+Home		            workspace $ws1
+bindsym $mod+Shift+Home		      move container to workspace $ws1
+bindsym $mod+End		            workspace $ws10
+bindsym $mod+Shift+End		      move container to workspace $ws10
+bindsym $mod+Prior		          workspace prev
+bindsym $mod+Shift+Prior	      move container to workspace prev
+bindsym $mod+Next		            workspace next
+bindsym $mod+Shift+Next		      move container to workspace next
+bindsym $mod+Tab		            workspace back_and_forth
+bindsym $mod+XF86Back	  	      workspace prev
+bindsym $mod+Shift+XF86Back	    move container to workspace prev
+bindsym $mod+XF86Forward	      workspace next
 bindsym $mod+Shift+XF86Forward	move container to workspace next
-bindsym $mod+semicolon		workspace next
-bindsym $mod+apostrophe		split horizontal ;; exec $term
-bindsym $mod+slash		split vertical ;; exec $term
-bindsym $mod+Shift+slash	kill
-bindsym $mod+backslash		workspace back_and_forth
+bindsym $mod+semicolon		      workspace next
+bindsym $mod+apostrophe		      split horizontal ;; exec $term
+bindsym $mod+slash		          split vertical ;; exec $term
+bindsym $mod+Shift+slash	      xkill
+bindsym $mod+backslash		      workspace back_and_forth
 
 set $ws1 "1"
 set $ws2 "2"
@@ -219,22 +219,22 @@ bindsym $mod+F9		exec --no-startup-id dmenumount
 bindsym $mod+F10	exec --no-startup-id dmenuumount
 
 # #---Arrow Keys---# #
-bindsym $mod+Left		focus left
+bindsym $mod+Left		      focus left
 bindsym $mod+Shift+Left		move left
 bindsym $mod+Ctrl+Left		move workspace to output left
-bindsym $mod+Down		focus down
+bindsym $mod+Down		      focus down
 bindsym $mod+Shift+Down		move down
 bindsym $mod+Ctrl+Down		move workspace to output down
-bindsym $mod+Up			focus up
-bindsym $mod+Shift+Up		move up
-bindsym $mod+Ctrl+Up		move workspace to output up
-bindsym $mod+Right 		focus right
+bindsym $mod+Up			      focus up
+bindsym $mod+Shift+Up		  move up
+bindsym $mod+Ctrl+Up		  move workspace to output up
+bindsym $mod+Right 		    focus right
 bindsym $mod+Shift+Right 	move right
 bindsym $mod+Ctrl+Right		move workspace to output right
 
 # Screenshots/Recording
-bindsym Print 			exec --no-startup-id maim pic-full-"$(date '+%y%m%d-%H%M-%S').png"
-bindsym Shift+Print 		exec --no-startup-id maimpick
-bindsym $mod+Print		exec --no-startup-id dmenurecord
+bindsym Print 			      exec --no-startup-id maim pic-full-"$(date '+%y%m%d-%H%M-%S').png"
+bindsym Shift+Print 		  exec --no-startup-id maimpick
+bindsym $mod+Print		    exec --no-startup-id dmenurecord
 bindsym $mod+Scroll_Lock	exec --no-startup-id "killall screenkey || screenkey"
-bindsym $mod+Delete		exec $stoprec
+bindsym $mod+Delete		    exec $stoprec