diff --git a/.config/i3/config b/.config/i3/config##class.arch_desktop
similarity index 95%
rename from .config/i3/config
rename to .config/i3/config##class.arch_desktop
index dd6084e..528efc1 100644
--- a/.config/i3/config
+++ b/.config/i3/config##class.arch_desktop
@@ -114,6 +114,7 @@ bindsym XF86AudioPrev exec playerctl previous
 # misc keyboard keys
 bindsym XF86Calculator exec --no-startup-id qalculate-gtk
 
+
 # Start Applications
 bindsym $mod+Ctrl+b exec $myTerm -e 'bmenu'
 bindsym $mod+F1 exec brave
@@ -129,6 +130,7 @@ bindsym $mod+Shift+Print --release exec --no-startup-id i3-scrot -s
 bindsym $mod+Ctrl+h exec xdg-open /usr/share/doc/manjaro/i3_help.pdf
 bindsym $mod+Ctrl+x --release exec --no-startup-id xkill
 
+
 # focus_follows_mouse no
 
 # change focus
@@ -309,10 +311,13 @@ bindsym $mod+Shift+r restart
 # Lock screen
 bindsym $mod+Ctrl+Shift+$alt+l exec --no-startup-id light-locker-command -l
 
-# Set shut down, restart and locking features
+# Set shut down, restart 
 bindsym $mod+Shift+Ctrl+$alt+h exec --no-startup-id systemctl hibernate
 bindsym $mod+Shift+Ctrl+$alt+s exec --no-startup-id systemctl suspend
 
+# set lock combination for i3lock
+bindsym $mod+Ctrl+l exec --no-startup-id i3lock -c 000000
+
 #bindsym $mod+0 mode "$mode_system"
 #set $mode_system (l)ock, (e)xit, switch_(u)ser, (s)uspend, (h)ibernate, (r)eboot, (Shift+s)hutdown
 #mode "$mode_system" {
@@ -351,6 +356,16 @@ mode "resize" {
         bindsym Return mode "default"
         bindsym Escape mode "default"
 }
+# machine specific startup commands
+exec --no-startup-id xset s 300 0
+exec --no-startup-id xset s noblank
+exec --no-startup-id xset -dpms
+exec --no-startup-id xsetroot -solid black
+exec --no-startup-id [[ -f $HOME/.Xmodmap ]] && xmodmap $HOME/.Xmodmap
+exec --no-startup-id systemd-run --user --on-calendar=minutely --unit=polybar_auto_hide /usr/bin/polybar-msg cmd hide
+exec --no-startup-id numlockx on
+
+
 
 # Autostart applications
 exec_always --no-startup-id $HOME/.config/polybar/launch.sh
@@ -361,6 +376,11 @@ exec --no-startup-id blueman-applet
 exec --no-startup-id picom -b
 exec --no-startup-id flameshot
 
+# locking specific startup applications
+#exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
+#exec --no-startup-id xautolock -time 1 -locker "i3lock" -detectsleep
+exec --no-startup-id xautolock -time 30 -locker "systemctl suspend" -detectsleep
+
 # sys config tools
 exec --no-startup-id xbindkeys
 
diff --git a/.xprofile##class.arch_desktop b/.xprofile##class.arch_desktop
index f695cd7..6a34ab8 100644
--- a/.xprofile##class.arch_desktop
+++ b/.xprofile##class.arch_desktop
@@ -3,13 +3,3 @@ export LUTRIS_RUNTIME=0
 
 xrandr --dpi 110 &
 xrdb -merge ~/.Xresources &
-
-xset s 300 0 & 
-xset s noblank & 
-xset -dpms & 
-xsetroot -solid black &
-
-numlockx on &
-
-[[ -f ~/.Xmodmap ]] && xmodmap ~/.Xmodmap &
-systemd-run --user --on-calendar=minutely --unit=polybar_auto_hide /usr/bin/polybar-msg cmd hide &
diff --git a/.zshrc b/.zshrc
index d9f2c24..3388aaf 100644
--- a/.zshrc
+++ b/.zshrc
@@ -147,7 +147,7 @@ bindkey '5D' backward-word
 bindkey '5C' forward-word
 bindkey '^[[3~' delete-char
 
-#powerline-config tmux setup
+powerline-config tmux setup
 
 alias vim=nvim
 alias sudo='sudo '