diff --git a/binaries-private.org b/binaries-private.org
index 354b1e5..8c40427 100644
--- a/binaries-private.org
+++ b/binaries-private.org
@@ -265,15 +265,17 @@ after_screen_change () {
 
 case "$option" in
     "Work")
-        xrandr --output eDP-1 --off --output DP-3-2 --primary --mode 2560x1440 --pos 0x0 --rotate normal && \
+        xrandr --output eDP-1 --off \
+            --output DP-3-2 --primary --mode 2560x1440 --pos 0x0 --rotate normal \
+            --output DP-3-1 --primary --mode 2560x1440 --pos 2560x0 --rotate normal && \
             after_screen_change
         ;;
     "Laptop")
-        xrandr --output DP-1-2 --off --output DP-3-2 --off --output eDP-1 --primary --mode 1920x1200 --pos 0x0 --rotate normal && \
+        xrandr --output DP-1-2 --off --output DP-3-1 --off --output DP-3-2 --off --output eDP-1 --primary --mode 1920x1200 --pos 0x0 --rotate normal && \
             after_screen_change
         ;;
     "Home")
-        xrandr --output eDP-1 --off --output DP-1-2 --primary --mode 2560x1440 --pos 0x0 --rotate normal && \
+        xrandr --output eDP-1 --off --output DP-3-2 --primary --mode 2560x1440 --pos 0x0 --rotate normal && \
             after_screen_change
         ;;
     ,*)
diff --git a/i3.org b/i3.org
index 7b91f42..bdeb9e6 100644
--- a/i3.org
+++ b/i3.org
@@ -12,6 +12,7 @@
 Set mod key (Mod1=<Alt>, Mod4=<Super>)
 #+BEGIN_SRC conf
 set $mod Mod4
+set $alt Mod1
 #+end_src
 
 * Border Style
@@ -23,7 +24,7 @@ for_window [class="^.*"] border pixel 2
 
 Hide borders
 #+begin_src conf
-hide_edge_borders smart
+hide_edge_borders none
 #+end_src
 
 * Font for window titles
@@ -68,6 +69,7 @@ Layout mode for new containers
 workspace_layout default
 #+end_src
 
+* Focus Configuration
 #+begin_src conf
 focus_follows_mouse no
 #+end_src
@@ -76,7 +78,7 @@ focus_follows_mouse no
 #+begin_src conf
 gaps inner 10
 gaps outer 1
-smart_gaps on
+smart_gaps off
 #+end_src
 
 * Workspace names
@@ -93,6 +95,19 @@ set $ws7 7
 set $ws8 8
 #+end_src
 
+#+begin_src conf
+workspace 1 output DP-3-2
+workspace 3 output DP-3-2
+workspace 5 output DP-3-2
+workspace 7 output DP-3-2
+workspace 9 output DP-3-2
+
+workspace 2 output DP-3-1
+workspace 4 output DP-3-1
+workspace 6 output DP-3-1
+workspace 8 output DP-3-1
+#+end_src
+
 * Use Mouse+$mod to drag floating windows
 #+begin_src conf
 floating_modifier $mod
@@ -109,7 +124,11 @@ workspace_auto_back_and_forth yes
 assign[title="^Fig"] $ws6 # Matlab Figures
 for_window [title="^Fig"] layout tabbed
 assign[title="^HG_Peer"] $ws6 # Name of window when export figure with matlab
+#+end_src
+
+#+begin_src conf
 assign[class="^RDP"] $ws7 # Remote
+for_window [class="^RDP"] layout tabbed
 #+end_src
 
 ** Open specific applications in floating mode
@@ -137,7 +156,7 @@ for_window [title="TexText"] floating enable, resize set 800 400, move position
 for_window [title="nmtui"] floating enable, resize set 800 600, move position center
 for_window [title="Xournal"] floating enable, resize set 1100 750, move position center
 for_window [title="esrf-phonebook"] floating enable, resize set 1400 400, move position center
-for_window [title="zoom "] floating enable
+for_window [title="^zoom$" class="[zoom]*"] floating enable
 for_window [title="F3D"] floating enable, resize set 800 600, move position center
 #+end_src