diff --git a/i3/config b/i3/config
index 84f836b..4735a53 100644
--- a/i3/config
+++ b/i3/config
@@ -162,7 +162,6 @@ client.focused_inactive #333333 #222222 #888888 #292d2e #eeeeee
 client.unfocused #333333 #222222 #888888 #292d2e #eeeeee
 
 # Startup Applications
-exec --no-startup-id xmodmap -e "remove Lock = Caps_Lock"
-exec --no-startup-id xmodmap -e "keycode 66 = Escape NoSymbol Escape"
+exec --no-startup-id "xmodmap $HOME/.Xmodmap"
 exec --no-startup-id "compton -b"
 exec --no-startup-id "polybar"
diff --git a/polybar/config.ini b/polybar/config.ini
index ac34c8b..97ed5ca 100644
--- a/polybar/config.ini
+++ b/polybar/config.ini
@@ -58,13 +58,12 @@ cursor-scroll = ns-resize
 
 enable-ipc = true
 
-; tray-position = right
+tray-position = right
 
 ; wm-restack = generic
 ; wm-restack = bspwm
-; wm-restack = i3
-
-; override-redirect = true
+wm-restack = i3
+;override-redirect = true
 
 [module/xworkspaces]
 type = internal/xworkspaces
@@ -148,8 +147,8 @@ label-full = %percentage%%
 label-charging = %percentage%% %time%
 label-discharging = %percentage%% %time%
 
-format-full-prefix = "BAT "
-format-charging-prefix = "BAT "
+format-full-prefix = "FULL "
+format-charging-prefix = "CHR "
 format-discharging-prefix = "BAT "
 format-full-prefix-foreground = ${colors.primary}
 format-charging-prefix-foreground = ${colors.primary}