diff --git a/.config/aliasrc b/.config/aliasrc
index 43f75151..38906b0b 100644
--- a/.config/aliasrc
+++ b/.config/aliasrc
@@ -16,7 +16,7 @@ alias \
 
 # Colorize commands when possible.
 alias \
-	ls="ls --all --literal -l --human-readable --color=auto --group-directories-first" \
+	ls="ls --literal -l --human-readable --color=auto --group-directories-first" \
 	grep="grep -n --color=auto" \
 	diff="diff --color=auto" \
 	ccat="highlight --out-format=ansi"
diff --git a/.config/assets/lockscreen.png b/.config/assets/lockscreen.png
new file mode 100644
index 00000000..8462bd10
Binary files /dev/null and b/.config/assets/lockscreen.png differ
diff --git a/.config/wall.png b/.config/assets/wallpaper.png
similarity index 100%
rename from .config/wall.png
rename to .config/assets/wallpaper.png
diff --git a/.config/directories b/.config/directories
index 38613693..6ce17ab1 100644
--- a/.config/directories
+++ b/.config/directories
@@ -3,8 +3,7 @@ cf	~/.config
 d	~/downloads
 gh	~/github
 h	~/
-m	~/music
 mn	/mnt
+psc     ~/.local/bin/polybar_scripts
 pp	~/pictures
 sc	~/.local/bin
-vv	~/videos
diff --git a/.config/i3/config b/.config/i3/config
index 7adb3d6a..5824756c 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -1,5 +1,4 @@
 # vim: filetype=i3
-# File originally by Luke Smith <https://lukesmith.xyz>
 
 # This config file will use environmental variables such as $BROWSER and $TERMINAL.
 # You can set these variables in ~/.profile or ~/.bash_profile if you have it as below:
@@ -9,8 +8,8 @@ exec_always --no-startup-id launch_polybar
 
 # #---Basic Definitions---# #
 for_window [class="^.*"] border pixel 2
-gaps inner 5
-gaps outer 5
+gaps inner 2
+gaps outer 2
 set $term --no-startup-id $TERMINAL
 set $mod Mod4
 
@@ -90,7 +89,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..d889833a 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -55,17 +55,19 @@ wm-restack = i3
 
 modules-left = i3
 modules-center = xwindow
-modules-right = arch-updates cpu memory volume wifi ethernet battery date
+modules-right = sys_updates cpu memory volume wifi ethernet battery date
 
 tray-position = right
 tray-padding = 0
 
-[module/arch-updates]
+[module/sys_updates]
 type = custom/script
 exec = ~/.local/bin/polybar_scripts/aur_updates
-format = %{u#ff0000}%{+u}<<label>
+format = <label>
 label = %{A1:$TERMINAL -e yay >/dev/null 2>&1 &:}%output%%{A}
-interval = 600
+label-underline=#ff0000
+label-overline=#ff0000
+interval = 1000
 
 [module/battery]
 type = internal/battery
@@ -74,8 +76,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 +107,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..820d32fb 100644
--- a/.config/sxhkd/sxhkdrc
+++ b/.config/sxhkd/sxhkdrc
@@ -1,36 +1,36 @@
 # The Simple X Hotkey Daemon is the program used by LARBS to map most of the
-# dwm-independent commands.  This file is pretty readable, so I'll let you read
+# i3 independent commands.  This file is pretty readable, so I'll let you read
 # it.
 
-# The keys NOT bound here by sxhkd, but by dwm or i3 are:
+# The keys NOT bound here by sxhkd, but by i3 are:
 # The t thru p keys on the top row
 # The f thru ; keys on the home row
 # The b key on the bottom row (hides the bar in either case)
 
 # Basic binds
-
 super + Return
 	$TERMINAL
 super + shift + Return
 	samedir
-super + shift + q
-	kill -9 `xdotool getwindowfocus getwindowpid`
+
+super + shift + a
+	$TERMINAL -e alsamixer; pkill -RTMIN+10 $STATUSBAR
+super + b
+	polybar-msg cmd toggle
+super + c
+	code
+super + shift + c
+	mpv --no-osc --no-input-default-bindings --input-conf=/dev/null --title='mpvfloat' /dev/video0
 super + d
 	dmenu_run
-super + r
-	$TERMINAL -e $FILE
-super + e
-	$TERMINAL -e neomutt; pkill -RTMIN+12 $STATUSBAR
 super + m
 	spotify #$TERMINAL -e spt
 super + n
 	nautilus
-super + c
-	code
-super + shift + a
-	$TERMINAL -e alsamixer; pkill -RTMIN+10 $STATUSBAR
-super + shift + c
-	mpv --no-osc --no-input-default-bindings --input-conf=/dev/null --title='mpvfloat' /dev/video0
+super + shift + q
+	kill -9 `xdotool getwindowfocus getwindowpid`
+super + r
+	$TERMINAL -e $FILE
 super + w
 	$TERMINAL -e sudo nmtui
 super + shift + w
@@ -40,7 +40,7 @@ super + shift + w
 super + grave
 	dmenuunicode
 super + Scroll_Lock
-	killall screenkey || screenkey
+	ifinstall screenkey && (killall screenkey || screenkey)
 super + Insert
 	showclip
 super + shift + x
@@ -50,17 +50,7 @@ super + shift + BackSpace
 super + shift + Escape
 	prompt 'Leave Xorg?' 'killall Xorg'
 super + x
-	ifinstalled slock && ( slock & xset dpms force off ; mpc pause ; pauseallmpv )
-XF86Launch1
-	xset dpms force off
-XF86TouchpadToggle
-	(synclient | grep "TouchpadOff.*1" && synclient TouchpadOff=0) || synclient TouchpadOff=1
-XF86Touchpad{Off,On}
-	synclient TouchpadOff={1,0}
-XF86MonBrightnessDown
-	xbacklight -dec 15
-XF86MonBrightnessUp
-	xbacklight -inc 15
+	ifinstalled i3lock && i3lock --color 000000 --indicator --radius 120 --ring-width 10.0
 
 # Recording
 # Take screenshot
@@ -74,24 +64,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 +77,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 +90,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}
diff --git a/.local/bin/polybar_scripts/aur_updates b/.local/bin/polybar_scripts/aur_updates
index d3491ec6..924fdceb 100755
--- a/.local/bin/polybar_scripts/aur_updates
+++ b/.local/bin/polybar_scripts/aur_updates
@@ -4,8 +4,10 @@ if ! updates=$(yay -Qum 2> /dev/null | wc -l); then
     updates=0
 fi
 
-if [ "$updates" -gt 0 ]; then
-    echo "[$updates updates]"
+if [ "$updates" -eq 1 ]; then
+    echo "$updates update"
+elif [ "$updates" -gt 1 ]; then
+    echo "$updates updates"
 else
     echo ""
 fi
diff --git a/.local/bin/setbg b/.local/bin/setbg
index 5fdf5662..36778e9c 100755
--- a/.local/bin/setbg
+++ b/.local/bin/setbg
@@ -5,5 +5,5 @@
 # argument sets ~/.config/wall.png as the wallpaper, which is required on login
 # if you don't want a blakc screen.
 
-[ ! -z "$1" ] && cp "$1" ~/.config/wall.png && notify-send -i "$HOME/.config/wall.png" "Wallpaper changed."
-xwallpaper --zoom ~/.config/wall.png
+[ ! -z "$1" ] && cp "$1" ~/.config/assets/wallpaper.png && notify-send -i "$HOME/.config/assets/wallpaper.png" "Wallpaper changed."
+xwallpaper --zoom ~/.config/assets/wallpaper.png
diff --git a/README.md b/README.md
index d18e656e..cd81fe36 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,13 @@
-## Config based upon (Luke Smith <https://lukesmith.xyz>'s dotfiles)
+## Config based upon (Luke Smith <https://lukesmith.xyz>'s dotfiles), but heavily modified to fit my needs.
 
 - Very useful scripts are in `~/.local/bin/`
 - Settings for:
-	- vim/nvim (text editor)
+	- neovim/vim (text editor)
 	- zsh (shell)
-	- i3wm/i3-gaps (window manager)
+	- i3wm/i3-gaps/i3-lock (window manager)
 	- polybar (status bar)
 	- sxhkd (general key binder)
 	- ranger (file manager)
-	- mpd/ncmpcpp (music)
 	- sxiv (image/gif viewer)
 	- mpv (video player)
 	- calcurse (calendar program)
@@ -21,3 +20,6 @@
 	- File bookmarks in `~/.config/files`
 	- Directory bookmarks in `~/.config/directories`
 	
+### Things to add
+[x] show/hide polybar using IPC (polybar-msg) fixed by `polybar-msg cmd toggle`
+- Launch pycharm without Jetbrains toolbox (command will look like ``` ./`find .local -name pycharm.sh` ```