diff --git a/bash/.bashrc b/bash/.bashrc
index d83506e..5833cc7 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -141,7 +141,7 @@ stty -echoctl
 export _JAVA_AWT_WM_NONREPARENTING=1
 #export FZF_DEFAULT_COMMAND='ag --hidden --ignore .git -g ""'
 export M2_HOME=/home/jfm/Tools/apache-maven
-export PATH=$PATH:$M2_HOME/bin:/home/jfm/Tools/openshift-origin-client/:/home/jfm/Tools/aws/
+export PATH=$PATH:$M2_HOME/bin:/home/jfm/Tools/openshift-origin-client/:/home/jfm/Tools/aws/:/home/jfm/Tools/spin/
 export GIT_EDITOR=nvim
 export EDITOR="nvim"
 export VISUAL="nvim"
@@ -157,6 +157,7 @@ alias ssh="TERM=xterm-256color ssh"
 alias vim="nvim"
 alias vi="nvim"
 alias rtv="rtv --enable-media"
+alias spin="spin -k"
 alias k9s="/home/jfm/Tools/k9s/k9s"
 alias buildtool="/home/jfm/.buildtool/bin/buildtool"
 alias vpnup="nmcli con up id \"YouSee VPN\""
diff --git a/neovim/.config/nvim/init.vim b/neovim/.config/nvim/init.vim
index 546c152..b5e623f 100644
--- a/neovim/.config/nvim/init.vim
+++ b/neovim/.config/nvim/init.vim
@@ -43,6 +43,7 @@ Plug 'w0rp/ale'
 Plug 'ambv/black'
 " HTML
 Plug 'jonsmithers/vim-html-template-literals'
+Plug 'mxw/vim-jsx'
 Plug 'pangloss/vim-javascript'
 Plug 'alvan/vim-closetag'
 call plug#end()
diff --git a/sway/.config/sway/config b/sway/.config/sway/config
index f487ffd..b4e86c0 100644
--- a/sway/.config/sway/config
+++ b/sway/.config/sway/config
@@ -52,7 +52,7 @@ bindsym $mod+Ctrl+Mod1+9 exec "dbus-send --print-reply --dest=org.mpris.MediaPla
 bindsym $mod+Ctrl+Mod1+0 exec "dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Next"
 bindsym $mod+Ctrl+Mod1+8 exec "dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Previous"
 
-# focus_follows_mouse no
+focus_follows_mouse always
 
 # alternatively, you can use the cursor keys:
 bindsym $mod+Left focus left
@@ -180,7 +180,13 @@ mode $exitmenu {
 }
 bindsym $mod+backspace mode $exitmenu
 
+set $gnome-schema org.gnome.desktop.interface
+exec_always {
+    gsettings set $gnome-schema gtk-theme 'Papirus-Dark'
+    gsettings set $gnome-schema icon-theme 'Materia-dark'
+}
+
 #### Custom Config
-exec swayidle timeout 300 'swaylock -i ~/.config/sway/wallpapers/stars_3840x2160.jpg -s stretch' timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' before-sleep 'swaylock -i ~/.config/sway/wallpapers/stars_3840x2160.jpg -s stretch'
+exec swayidle timeout 300 'swaylock -i ~/.config/sway/wallpapers/stars_3840x2160.jpg -s stretch' timeout 1800 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' before-sleep 'swaylock -i ~/.config/sway/wallpapers/stars_3840x2160.jpg -s stretch'
 exec /home/jfm/.config/sway/scripts/start_layout.sh
 exec mako
diff --git a/sway/.config/sway/scripts/dock.sh b/sway/.config/sway/scripts/dock.sh
index cb935a1..c87b80d 100755
--- a/sway/.config/sway/scripts/dock.sh
+++ b/sway/.config/sway/scripts/dock.sh
@@ -1,14 +1,12 @@
 #!/bin/bash
+source ~/.config/sway/scripts/location-helper.sh
 
-CONNECTED_CMD="swaymsg -t get_outputs | jq -c '. | length'"
-monitors=`eval $CONNECTED_CMD`
-echo $monitors
-if [[ $monitors = 3 ]];
+if [ $LOCATION = "work" ];
 then
  echo "WORK"
  ~/.config/sway/scripts/work-sway.sh &
 fi
-if [[ $monitors = 2 ]];
+if [ $LOCATION = "home" ];
 then
  echo "HOME"
   ~/.config/sway/scripts/home-sway.sh &
diff --git a/sway/.config/sway/scripts/home-sway.sh b/sway/.config/sway/scripts/home-sway.sh
index ad132d1..3f63d5a 100755
--- a/sway/.config/sway/scripts/home-sway.sh
+++ b/sway/.config/sway/scripts/home-sway.sh
@@ -1,8 +1,12 @@
 #!/bin/bash
 
 swaymsg output DP-5 enable
+swaymsg output DP-4 enable
 swaymsg output eDP-1 disable
 swaymsg output DP-5 pos 0 0 res 3440 1440
+swaymsg output DP-4 pos 3440 0 res 1920 1200
+swaymsg output DP-4 transform 270
+swaymsg output DP-4 background ~/.config/sway/wallpapers/planet-surface-horizon-stars-galaxy_1200x1920.jpg fill
 swaymsg output DP-5 background ~/.config/sway/wallpapers/space_ultrawide.jpg fill
 
 killall waybar
diff --git a/sway/.config/sway/scripts/location-helper.sh b/sway/.config/sway/scripts/location-helper.sh
index 67bdcdb..4bf18dc 100755
--- a/sway/.config/sway/scripts/location-helper.sh
+++ b/sway/.config/sway/scripts/location-helper.sh
@@ -1,14 +1,17 @@
 #!/bin/bash
 CONNECTED_CMD="swaymsg -t get_outputs | jq -c '. | length'"
 monitors=`eval $CONNECTED_CMD`
-
+HOME_CMD="swaymsg -t get_outputs | grep SyncMaster | wc -l"
+is_home=`eval $HOME_CMD`
+total=$(($monitors + $is_home))
+echo $total
 if [[ $monitors = 1 ]];
 then
   export LOCATION="laptop"
-elif [[ $monitors = 2 ]];
+elif [[ $total = 4 ]];
 then
   export LOCATION="home"
-elif [[ $monitors = 3 ]];
+elif [[ $total = 3 ]];
 then
   export LOCATION="work"
 fi
diff --git a/sway/.config/sway/scripts/work-sway.sh b/sway/.config/sway/scripts/work-sway.sh
index c781924..07f5a62 100755
--- a/sway/.config/sway/scripts/work-sway.sh
+++ b/sway/.config/sway/scripts/work-sway.sh
@@ -3,9 +3,10 @@
 swaymsg output eDP-1 enable
 swaymsg output DP-4 enable
 swaymsg output DB-5 enable
+swaymsg output eDP-1 scale 1.5
 swaymsg output eDP-1 pos 0 0 res 2560 1440
-swaymsg output DP-5 pos 2560 0 res 1920 1080
-swaymsg output DP-4 pos 4480 0 res 1680 1050
+swaymsg output DP-5 pos 1706 0 res 1920 1080
+swaymsg output DP-4 pos 3626 0 res 1680 1050
 swaymsg output eDP-1 background ~/.config/sway/wallpapers/space_2560x1440.jpg fill
 swaymsg output DP-4 background ~/.config/sway/wallpapers/planet_rings_1680x1050.jpg fill
 swaymsg output DP-5 background ~/.config/sway/wallpapers/solar_eclipse_1920x1080.jpg fill
diff --git a/sway/.config/sway/wallpapers/planet-surface-horizon-stars-galaxy_1200x1920.jpg b/sway/.config/sway/wallpapers/planet-surface-horizon-stars-galaxy_1200x1920.jpg
new file mode 100644
index 0000000..1094bb7
Binary files /dev/null and b/sway/.config/sway/wallpapers/planet-surface-horizon-stars-galaxy_1200x1920.jpg differ
diff --git a/sway/.config/sway/workspaces/ws01.sh b/sway/.config/sway/workspaces/ws01.sh
index 55375a5..74ec0d8 100755
--- a/sway/.config/sway/workspaces/ws01.sh
+++ b/sway/.config/sway/workspaces/ws01.sh
@@ -5,9 +5,8 @@ if [ $LOCATION = "home" ];
 then
   swaymsg exec "google-chrome-stable --app=https://mail.google.com"
   swaymsg exec "google-chrome-stable --app=https://calendar.google.com"
-  swaymsg exec "google-chrome-stable --app=https://hangouts.google.com"
-  swaymsg exec "google-chrome-stable --app=https://messages.android.com"
-  swaymsg exec slack
+  swaymsg exec "google-chrome-stable --app=https://web.whatsapp.com"
+  swaymsg exec "google-chrome-stable --app=https://messages.google.com/web/"
 else
-  swaymsg "exec google-chrome-stable --proxy-pac-url=file:///home/jfm/Customers/TDC/Scripts/tdcproxy.js --no-default-browser-check --new-window https://www.toggl.com/app/timer https://mail.google.com/mail/u/0/#inbox https://calendar.google.com/calendar/r?tab=mc https://hangouts.google.com https://messages.android.com"
+  swaymsg "exec google-chrome-stable --no-default-browser-check --new-window https://www.toggl.com/app/timer https://mail.google.com/mail/u/0/#inbox https://calendar.google.com/calendar/r?tab=mc https://web.whatsapp.com https://messages.google.com/web/"
 fi
diff --git a/waybar/.config/waybar/home-config b/waybar/.config/waybar/home-config
index 27831e7..f551c1e 100644
--- a/waybar/.config/waybar/home-config
+++ b/waybar/.config/waybar/home-config
@@ -1,4 +1,4 @@
-{
+[{
     "layer": "top", // Waybar at top layer
     "output": "DP-5",
     "position": "bottom", // Waybar at the bottom of your screen
@@ -11,7 +11,7 @@
     // Modules configuration
      "sway/workspaces": {
          "disable-scroll": true,
-         "all-outputs": true,
+         "all-outputs": false,
          "format": "{name}"
      },
     "sway/mode": {
@@ -76,4 +76,18 @@
         "interval": 300,
         "exec": "$HOME/.config/waybar/scripts/updates-arch-combined.sh 2> /dev/null" // Script in resources folder
     }
+},
+{
+  "layer": "top", // Waybar at top layer
+  "output": "DP-4",
+  "position": "bottom", // Waybar at the bottom of your screen
+  "modules-left": ["sway/workspaces"],
+  "modules-center": [],
+  "modules-right": [],
+  "sway/workspaces": {
+    "disable-scroll": true,
+    "all-outputs": false,
+    "format": "{name}"
+  }
 }
+]