diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index 3e7f0a0..3b55875 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -78,9 +78,9 @@ bindsym $mod+4 workspace "4: Work"
 bindsym $mod+5 workspace "5: Media"
 bindsym $mod+6 workspace "6: REST"
 bindsym $mod+7 workspace "7: OC"
-bindsym $mod+8 workspace 8
-bindsym $mod+9 workspace 9
-bindsym $mod+0 workspace 10
+bindsym $mod+8 workspace "8: Logs"
+bindsym $mod+9 workspace "9: Terminals"
+bindsym $mod+0 workspace "10: Terminals"
 
 # move focused container to workspace
 bindsym $mod+Shift+1 move container to workspace 1
diff --git a/i3/.config/i3/scripts/dock.sh b/i3/.config/i3/scripts/dock.sh
new file mode 100755
index 0000000..576abd2
--- /dev/null
+++ b/i3/.config/i3/scripts/dock.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+. ~/.config/i3/env
+
+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"
+i3-msg "workspace 4: Work; move workspace to output $PRIMARY"
+i3-msg "workspace 5: Media; move workspace to output $LAPTOP"
+i3-msg "workspace 6: REST; move workspace to output $SECONDARY"
+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 c979b6a..bc8ba12 100755
--- a/i3/.config/i3/scripts/home-layout.sh
+++ b/i3/.config/i3/scripts/home-layout.sh
@@ -11,5 +11,4 @@ export LDPI_PROFILE="default"
 export HDPI_PROFILE="laptop"
 EOM
 
-feh --bg-scale --zoom fill ~/.config/i3/wallpaper/fedora_simple.jpg
 ~/.config/polybar/home-polybar.sh
\ 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 434a32f..fdc8e5b 100755
--- a/i3/.config/i3/scripts/laptop-layout.sh
+++ b/i3/.config/i3/scripts/laptop-layout.sh
@@ -11,5 +11,4 @@ export LDPI_PROFILE="laptop"
 export HDPI_PROFILE="laptop"
 EOM
 
-feh --bg-scale --zoom fill ~/.config/i3/wallpaper/fedora_simple.jpg
 ~/.config/polybar/laptop-polybar.sh
diff --git a/i3/.config/i3/scripts/undock.sh b/i3/.config/i3/scripts/undock.sh
new file mode 100755
index 0000000..fa1dd8d
--- /dev/null
+++ b/i3/.config/i3/scripts/undock.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+. ~/.config/i3/env
+
+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"
+i3-msg "workspace 4: Work; move workspace to output $LAPTOP"
+i3-msg "workspace 5: Media; move workspace to output $LAPTOP"
+i3-msg "workspace 6: REST; move workspace to output $LAPTOP"
+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 d934708..9ae9aeb 100755
--- a/i3/.config/i3/scripts/work-layout.sh
+++ b/i3/.config/i3/scripts/work-layout.sh
@@ -11,5 +11,4 @@ export LDPI_PROFILE="default"
 export HDPI_PROFILE="laptop"
 EOM
 
-feh --bg-scale --zoom fill ~/.config/i3/wallpaper/fedora_simple.jpg
 ~/.config/polybar/work-polybar.sh
\ No newline at end of file
diff --git a/polybar/.config/polybar/config b/polybar/.config/polybar/config
index cc9dd98..3676aec 100644
--- a/polybar/.config/polybar/config
+++ b/polybar/.config/polybar/config
@@ -1,5 +1,5 @@
 
-;=====================================================
+  ;=====================================================
 ;
 ;   To learn more about how to configure Polybar
 ;   go to https://github.com/jaagr/polybar
@@ -17,19 +17,19 @@ label-color = #BDBDBD
 
 visible-background = #263238
 visible-foreground = #009688 
-visible-underline = #009688
+visible-underline = #FF009688
 unfocused-background = #263238
 unfocused-foreground = #BDBDBD
-unfocused-underline= #BDBDBD
+unfocused-underline= #FFBDBDBD
 focused-background = #263238
 focused-foreground = #009688
-focused-underline = #009688
+focused-underline = #FF009688
 urgent-background = #263238
 urgent-foreground = #BF360C
-urgent-underline = #BF360C
+urgent-underline = #FFBF360C
 
-[bar/topbar1]
-monitor = eDP-1
+[bar/primary]
+monitor = ${env:PRIMARY}
 width = 100%
 height = 25
 offset-x = 0
@@ -37,17 +37,20 @@ offset-y = 0
 padding-right = 7
 padding-left = 7
 
+underline-size = 3
+underline-color = ${colors.visible-foreground}
+
 background = #263238
 foreground = #FFFFFF00
 
-font-0 = Roboto:size=11:weight=bold;2
+font-0 = Roboto:size=14:weight=bold;2
 font-1 = unifont:size=6:heavy:fontformat=truetype;-2
 font-2 = siji:pixelsize=10;0
 font-3 = FontAwesome:pixelsize=14;0
 
-modules-left = i3
-modules-center = date
-modules-right = 
+modules-left = date
+modules-center = i3
+modules-right = mpd
 
 tray-position = right
 tray-padding = 5
@@ -59,6 +62,66 @@ override-redirect = false
 scroll-up = i3wm-wsnext
 scroll-down = i3wm-wsprev
 
+[bar/secondary]
+monitor = ${env:SECONDARY}
+width = 100%
+height = 25
+offset-x = 0
+offset-y = 0
+padding-right = 7
+padding-left = 7
+
+underline-size = 3
+underline-color = ${colors.visible-foreground}
+
+background = #263238
+foreground = #00000000
+
+font-0 = Roboto:size=14:weight=bold;2
+font-1 = unifont:size=6:heavy:fontformat=truetype;-2
+font-2 = siji:pixelsize=10;0
+font-3 = FontAwesome:pixelsize=14;0
+
+modules-left = 
+modules-center = i3
+modules-right = 
+
+override-redirect = false
+;wm-restack = i3
+
+scroll-up = i3wm-wsnext
+scroll-down = i3wm-wsprev
+
+[bar/laptop]
+monitor = ${env:LAPTOP}
+width = 100%
+height = 25
+offset-x = 0
+offset-y = 0
+padding-right = 7
+padding-left = 7
+
+underline-size = 3
+underline-color = ${colors.visible-foreground}
+
+background = #263238
+foreground = #00000000
+
+font-0 = Roboto:size=14:weight=bold;2
+font-1 = unifont:size=6:heavy:fontformat=truetype;-2
+font-2 = siji:pixelsize=10;0
+font-3 = FontAwesome:pixelsize=14;0
+
+modules-left = 
+modules-center = i3
+modules-right = 
+
+override-redirect = false
+;wm-restack = i3
+
+scroll-up = i3wm-wsnext
+scroll-down = i3wm-wsprev
+
 [module/i3]
 type = internal/i3
 format = <label-state> <label-mode>
@@ -69,35 +132,34 @@ pin-workspaces = true
 
 label-mode-padding = 5
 
-label-indicator-padding = 0
-label-indicator-background = #BBBBBB
-label-indicator-underline = ${colors.focused-underline}
-
 label-visible-foreground = ${colors.visible-foreground}
 label-visible-background = ${colors.visible-background}
-label-visible-underline = ${colors.visible-underline}
 label-visible-padding = 1
 
 label-unfocused-foreground = ${colors.unfocused-foreground}
 label-unfocused-background = ${colors.unfocused-background}
 label-unfocused-underline = ${colors.unfocused-underline}
-label-unfocused-padding = 1
+label-unfocused-margin = 1
+label-unfocused-padding-right = 1
 
 label-focused-foreground = ${colors.focused-foreground}
 label-focused-background = ${colors.focused-background}
 label-focused-underline = ${colors.focused-underline}
-label-focused-padding = 1
+label-focused-margin = 1
+label-focused-padding-right = 1
 
 label-urgent-foreground = ${colors.urgent-foreground}
 label-urgent-background = ${colors.urgent-background}
 label-urgent-underline = ${colors.urgent-underline}
-label-urgent-padding = 1
+label-urgent-margin = 1
+label-urgent-padding-right = 1
 
 [module/date]
 type = internal/date
 interval = 5
 
 label-foreground = ${colors.label-color}
+label-underline = ${colors.label-color} 
 
 date = "%d/%m-%y"
 date-alt = " %d"
@@ -107,17 +169,21 @@ time-alt =  %H:%M
 
 label = %date% %time%
 
-[module/wireless-network]
-type = internal/network
-interface = wlp4s0
+[module/mpd]
+type = internal/mpd
 
-format-connected = <label-connected>
-format-disconnected = <label-disconnected>
-format-packetloss = <animation-packetloss> <label-connected>
+host = 127.0.0.1
+port = 6600
+#password = mysecretpassword
 
-label-connected-foreground = ${colors.label-color}
-label-connected-padding-right = 10
-label-connected = %essid% %downspeed:9%
+; Seconds to sleep between progressbar/song timer sync
+; Default: 1
+interval = 1
 
-label-disconnected-foreground = ${colors.label-color}
-label-disconnected = not connected
\ No newline at end of file
+format-online = <label-time>  <label-song>
+label-song = %artist% - %title%
+label-offline = MPD is offline
+
+label-time-foreground = ${colors.label-color}
+label-song-foreground = ${colors.label-color}
+label-offline-foreground = ${colors.label-color}
diff --git a/urxvt/.Xdefaults b/urxvt/.Xdefaults
index 2bce83e..f340544 100644
--- a/urxvt/.Xdefaults
+++ b/urxvt/.Xdefaults
@@ -1,22 +1,2 @@
-URxvt.termName: rxvt-unicode-256color
-
-URxvt.background: #263238
-URxvt.foreground: grey80
-
-URxvt.scrollBar: false
-URxvt.internalBorder:  10
-
-URxvt.font: xft:Roboto Mono for Powerline:size=12,\
-			xft:Roboto Mono:size=12,\
-            xft:Noto Color Emoji:Regular:size=8
-
-URxvt.boldFont: xft:Roboto Mono for Powerline:bold:size=12,xft:Roboto Mono:bold:size=12
-URxvt.italicFont: xft:Roboto Mono for Powerline:italic:size=12,xft:Roboto Mono:italic:size=12
-URxvt.bolditalicFont: xft:Roboto Mono for Powerline:bold:italic:size=12, xft:Roboto Mono:bold:italic:size=12
-
-URxvt.letterSpace: -1
-URxvt.antialias: 1
-
-
-URxvt*color1: #009688
-URxvt*color2: #263238
+Xft.dpi: 120
+Xcursor.size: 16
\ No newline at end of file