diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index 3b55875..f78510e 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -183,9 +183,7 @@ bindsym Print exec scrot '%Y-%m-%d-%s_screenshot_$wx$h.jpg' -e 'mv $f ~/Pictures
 ### Rofi234
 bindsym $mod+d exec --no-startup-id rofi -show drun -config ~/.config/rofi/config
 
-#Bars
-exec --no-startup-id ~/.config/polybar/polybar.sh
-
 # System Scripts
+exec --no-startup-id ~/.config/i3/scripts/undock.sh
 exec --no-startup-id ~/.config/i3/scripts/applets.sh
 exec --no-startup-id ~/.config/i3/scripts/music.sh
diff --git a/i3/.config/i3/scripts/dock.sh b/i3/.config/i3/scripts/dock.sh
index 576abd2..9fb450a 100755
--- a/i3/.config/i3/scripts/dock.sh
+++ b/i3/.config/i3/scripts/dock.sh
@@ -1,6 +1,22 @@
 #!/bin/bash
 . ~/.config/i3/env
 
+if [[ $(iwgetid -r) = *adazio* ]]; 
+then
+  echo "@Work"
+  ~/.config/i3/scripts/work-layout.sh &
+fi
+if [[ $(iwgetid -r) = *moerks.dk* ]]; 
+then
+  echo "@Home"
+  ~/.config/i3/scripts/home-layout.sh &
+fi
+
+echo $PRIMARY
+echo $SECONDARY
+echo $LAPTOP
+
+sleep 1
 i3-msg "workspace 1: Comms; move workspace to output $SECONDARY"
 i3-msg "workspace 2: Web; move workspace to output $PRIMARY"
 i3-msg "workspace 3: IDE; move workspace to output $PRIMARY"
@@ -11,18 +27,3 @@ i3-msg "workspace 7: OC; move workspace to output $PRIMARY"
 i3-msg "workspace 8: Logs; move workspace to output $PRIMARY"
 i3-msg "workspace 9: Terminals; move workspace to output $PRIMARY"
 i3-msg "workspace 10: Terminals; move workspace to output $PRIMARY"
-
-
-sleep 1
-if [[ $(iwgetid -r) = *adazio* ]]; 
-then
-  echo "@Work"
-  . ~/.config/i3/scripts/work-layout.sh
-fi
-if [[ $(iwgetid -r) = *moerks.dk* ]]; 
-then
-  echo "@Home"
-  . ~/.config/i3/scripts/home-layout.sh
-fi
-
-feh --bg-scale --zoom fill ~/.config/i3/wallpaper/fedora_simple.jpg
\ No newline at end of file
diff --git a/i3/.config/i3/scripts/home-layout.sh b/i3/.config/i3/scripts/home-layout.sh
index bc8ba12..7d31131 100755
--- a/i3/.config/i3/scripts/home-layout.sh
+++ b/i3/.config/i3/scripts/home-layout.sh
@@ -11,4 +11,5 @@ export LDPI_PROFILE="default"
 export HDPI_PROFILE="laptop"
 EOM
 
-~/.config/polybar/home-polybar.sh
\ No newline at end of file
+~/.config/polybar/home-polybar.sh
+feh --bg-scale --zoom fill ~/.config/i3/wallpaper/fedora_simple.jpg
\ No newline at end of file
diff --git a/i3/.config/i3/scripts/laptop-layout.sh b/i3/.config/i3/scripts/laptop-layout.sh
index fdc8e5b..930ba6e 100755
--- a/i3/.config/i3/scripts/laptop-layout.sh
+++ b/i3/.config/i3/scripts/laptop-layout.sh
@@ -11,4 +11,5 @@ export LDPI_PROFILE="laptop"
 export HDPI_PROFILE="laptop"
 EOM
 
-~/.config/polybar/laptop-polybar.sh
+~/.config/polybar/laptop-polybar.sh &
+
diff --git a/i3/.config/i3/scripts/undock.sh b/i3/.config/i3/scripts/undock.sh
index fa1dd8d..5a988b5 100755
--- a/i3/.config/i3/scripts/undock.sh
+++ b/i3/.config/i3/scripts/undock.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 . ~/.config/i3/env
 
+~/.config/i3/scripts/laptop-layout.sh &
+
 i3-msg "workspace 1: Comms; move workspace to output $LAPTOP"
 i3-msg "workspace 2: Web; move workspace to output $LAPTOP"
 i3-msg "workspace 3: IDE; move workspace to output $LAPTOP"
@@ -11,8 +13,3 @@ i3-msg "workspace 7: OC; move workspace to output $LAPTOP"
 i3-msg "workspace 8: Logs; move workspace to output $LAPTOP"
 i3-msg "workspace 9: Terminals; move workspace to output $LAPTOP"
 i3-msg "workspace 10: Terminals; move workspace to output $LAPTOP"
-
-sleep 1
-. ~/.config/i3/scripts/laptop-layout.sh
-
-feh --bg-scale --zoom fill ~/.config/i3/wallpaper/fedora_simple.jpg
\ No newline at end of file
diff --git a/i3/.config/i3/scripts/work-layout.sh b/i3/.config/i3/scripts/work-layout.sh
index 9ae9aeb..6c0d9a1 100755
--- a/i3/.config/i3/scripts/work-layout.sh
+++ b/i3/.config/i3/scripts/work-layout.sh
@@ -11,4 +11,5 @@ export LDPI_PROFILE="default"
 export HDPI_PROFILE="laptop"
 EOM
 
-~/.config/polybar/work-polybar.sh
\ No newline at end of file
+~/.config/polybar/work-polybar.sh
+feh --bg-scale --zoom fill ~/.config/i3/wallpaper/fedora_simple.jpg
\ No newline at end of file
diff --git a/polybar/.config/polybar/laptop-polybar.sh b/polybar/.config/polybar/laptop-polybar.sh
index faa5a8a..01bb49e 100755
--- a/polybar/.config/polybar/laptop-polybar.sh
+++ b/polybar/.config/polybar/laptop-polybar.sh
@@ -2,3 +2,4 @@
 
 killall polybar
 polybar topbar1 -c ~/.config/polybar/laptop-config &
+feh --bg-scale --zoom fill ~/.config/i3/wallpaper/fedora_simple.jpg &
\ No newline at end of file