diff --git a/dot_dotfiles/i3/config b/dot_dotfiles/i3/config
index 1139ade..a506992 100644
--- a/dot_dotfiles/i3/config
+++ b/dot_dotfiles/i3/config
@@ -88,12 +88,12 @@ bindsym $mod+c exec rofi -modi "clipboard:greenclip print" -show clipboard -run-
 # lock / logout / sleep / hibernate / restart / poweroff
 set $mode_system System  l e s鈴 h rﰇ וּsﮤ
 mode "$mode_system" {
-    bindsym l exec --no-startup-id /home/jnieland/.config/i3/i3exit.sh lock, mode "default"
-    bindsym e exec --no-startup-id /home/jnieland/.config/i3/i3exit.sh logout, mode "default"
-    bindsym s exec --no-startup-id /home/jnieland/.config/i3/i3exit.sh suspend, mode "default"
-    bindsym h exec --no-startup-id /home/jnieland/.config/i3/i3exit.sh hibernate, mode "default"
-    bindsym r exec --no-startup-id /home/jnieland/.config/i3/i3exit.sh reboot, mode "default"
-    bindsym Shift+s exec --no-startup-id /home/jnieland/.config/i3/i3exit.sh shutdown, mode "default"
+    bindsym l exec --no-startup-id ~/.config/i3/i3exit.sh lock, mode "default"
+    bindsym e exec --no-startup-id ~/.config/i3/i3exit.sh logout, mode "default"
+    bindsym s exec --no-startup-id ~/.config/i3/i3exit.sh suspend, mode "default"
+    bindsym h exec --no-startup-id ~/.config/i3/i3exit.sh hibernate, mode "default"
+    bindsym r exec --no-startup-id ~/.config/i3/i3exit.sh reboot, mode "default"
+    bindsym Shift+s exec --no-startup-id ~/.config/i3/i3exit.sh shutdown, mode "default"
     # back to normal: Enter or Escape
     bindsym Return mode "default"
     bindsym Escape mode "default"
@@ -220,8 +220,8 @@ bindsym $mod+Shift+bracketleft move workspace to output left
 bindsym $mod+Shift+bracketright move workspace to output right
 
 # explicit bindings for arandr's setups: might not need these anymore... using autorandr now
-# bindsym $mod+Shift+Ctrl+1 exec /home/jnieland/.screenlayout/laptop-only.sh 
-# bindsym $mod+Shift+Ctrl+2 exec /home/jnieland/.screenlayout/work-desk.sh 
+# bindsym $mod+Shift+Ctrl+1 exec ~/.screenlayout/laptop-only.sh 
+# bindsym $mod+Shift+Ctrl+2 exec ~/.screenlayout/work-desk.sh 
 
 
 # split in horizontal orientation
@@ -364,7 +364,7 @@ mode "resize" {
 bindsym $mod+r mode "resize"
 
 # Edit config files
-bindsym XF86Tools exec --no-startup-id urxvt -e vim /home/jnieland/.config/i3/config
+bindsym XF86Tools exec --no-startup-id urxvt -e vim ~/.config/i3/config
 
 # Pulse Audio controls
 bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 0 +5% #increase sound volume
diff --git a/dot_dotfiles/i3/executable_i3exit.sh b/dot_dotfiles/i3/executable_i3exit.sh
index 53a23a0..2f5d41b 100644
--- a/dot_dotfiles/i3/executable_i3exit.sh
+++ b/dot_dotfiles/i3/executable_i3exit.sh
@@ -24,30 +24,30 @@ lock() {
 	# --screen 1
 	# --keylayout 2
 i3lock -i /home/jnieland/pictures/great-wall-namib.jpg --blur 5 --clock --indicator \
-	--insidevercolor=$background   \
-	--ringvercolor=$col4     \
+	--insidever-color=$background   \
+	--ringver-color=$col4     \
 	\
-	--insidewrongcolor=$background \
-	--ringwrongcolor=$col9   \
+	--insidewrong-color=$background \
+	--ringwrong-color=$col9   \
 	\
-	--insidecolor=$background      \
-	--ringcolor=$col2        \
-	--linecolor=$background        \
-	--separatorcolor=$col11   \
+	--inside-color=$background      \
+	--ring-color=$col2        \
+	--line-color=$background        \
+	--separator-color=$col11   \
 	\
-	--verifcolor=$col4        \
-	--wrongcolor=$col4        \
-	--timecolor=$col4        \
-	--datecolor=$col4        \
-	--layoutcolor=$col4      \
-	--keyhlcolor=$col11       \
-	--bshlcolor=$col9        \
+	--verif-color=$col4        \
+	--wrong-color=$col4        \
+	--time-color=$col4        \
+	--date-color=$col4        \
+	--layout-color=$col4      \
+	--keyhl-color=$col11       \
+	--bshl-color=$col9        \
 	\
 	--blur 5              \
 	--clock               \
 	--indicator           \
-	--timestr="%H:%M:%S"  \
-	--datestr="%A, %m %Y" \
+	--time-str="%H:%M:%S"  \
+	--date-str="%A, %m %Y" \
 
 }
 
diff --git a/dot_dotfiles/polybar/config.tmpl b/dot_dotfiles/polybar/config.tmpl
index 65165d3..2d9b5f6 100644
--- a/dot_dotfiles/polybar/config.tmpl
+++ b/dot_dotfiles/polybar/config.tmpl
@@ -107,15 +107,15 @@ modules-center = temperature battery xkeyboard memory cpu filesystem updates-aur
 modules-right = net wifi0 vpn powermenu 
 
 ; TRAY MANAGEMENT
-;tray-position = right
-tray-position = ${env:TRAY_POSITION:none}
+tray-position = right
+;tray-position = ${env:TRAY_POSITION:none}
 tray-transparent = false
 tray-detached = false
 tray-maxsize = 16 
 ;tray-background = ${colors.background-alt}
 ;this makes sure that the tray doesn't run off to the right of the monitor - only enable this when the bar's width is a bit off
 tray-offset-x = 0 
-tray-offset-y = 27
+tray-offset-y = 32
 tray-padding = 2
 tray-scale = 1.0 
 padding-left = 2 
@@ -539,7 +539,7 @@ bar-volume-empty-foreground = ${colors.bright_green}
 type = internal/battery
 battery = BAT0
 adapter = AC
-full-at = 98
+full-at = 97
 
 time-format = %H:%M