diff --git a/dotdrop b/dotdrop
index b56e8ea..fb07132 160000
--- a/dotdrop
+++ b/dotdrop
@@ -1 +1 @@
-Subproject commit b56e8ea00b107705d8c4235f3fef471b4c753224
+Subproject commit fb071321e94e3f5befc0d63ccb6fe73de1aebb5e
diff --git a/dotfiles/i3_config b/dotfiles/i3_config
index dad4957..3a695fb 100644
--- a/dotfiles/i3_config
+++ b/dotfiles/i3_config
@@ -203,9 +203,7 @@ client.urgent           #2f343a #900000 #ffffff #900000   #900000
 client.background       #ffffff
 
 # Keyboard lauyout shortcuts
-exec setxkbmap -layout us
-bindsym Ctrl+Shift+1 exec --no-startup-id setxkbmap us
-bindsym Ctrl+Shift+2 exec --no-startup-id setxkbmap de
+bindsym Ctrl+Shift+1 exec --no-startup-id setxkbmap za
 
 # Remove title bar
 new_window 1pixel
@@ -217,20 +215,12 @@ bindsym --release $mod+Shift+p exec"import ~/Screenshot-$(date '+%Y%m%d-%H%M%S')
 bindsym XF86MonBrightnessUp exec xbacklight -inc 20 # increase screen brightness
 bindsym XF86MonBrightnessDown exec xbacklight -dec 20 # decrease screen brightness
 
-
-# Background
-exec --no-startup-id picom
-
 # PC specific configurations:
 {%@@ if profile == "work" @@%}
 # Locking
 bindsym $mod+Shift+b exec "xlock -mode matrix -startCmd /share/bin/isweg -endCmd /share/bin/isda -bg '#6843bf' -info ''"
 
-# Wallpaper
-exec --no-startup-id feh --bg-scale ~/.wallpaper/wallpaper_genuaW.png
-
 # Custom Workspaces
-exec --no-startup-id "xterm"
 exec --no-startup-id "firefox"
 
 for_window [class="Firefox"] move container to workspace 9
@@ -253,10 +243,6 @@ bindsym $mod+Ctrl+2 move workspace to output $monitor2
 # Locking
 bindsym $mod+Shift+b exec "xlock -mode matrix -info ''"
 
-# Wallpaper
-exec --no-startup-id feh --bg-scale ~/.wallpaper/wallpaper.png
-
-
 # Custom Workspaces
 exec --no-startup-id "firefox"
 
diff --git a/dotfiles/xinitrc b/dotfiles/xinitrc
index 6295b17..164bf0f 100755
--- a/dotfiles/xinitrc
+++ b/dotfiles/xinitrc
@@ -1,7 +1,10 @@
 export TERM="xterm-256color"
 xrdb -load $HOME/.Xresources
 export SHELL="/bin/zsh"
-setxkbmap -layout us
+
+setxkbmap -layout za
+
+picom &
 
 export LANG="en_US.UTF-8"
 export LANGUAGE="en_US.UTF-8"
@@ -10,5 +13,11 @@ export LANGUAGE="en_US.UTF-8"
 /share/bin/isda
 ~/bin/.keyboard.scm &
 xrandr --output HDMI-2 --auto --right-of HDMI-1
-exec i3
+feh --bg-scale ~/.wallpaper/wallpaper_genuaW.png
+i3
+{%@@ endif @@%}
+
+{%@@ if profile == "laptop" @@%}
+feh --bg-scale ~/.wallpaper/wallpaper.png
+i3
 {%@@ endif @@%}