diff --git a/config/automatrop/roles/desktop_environment/tasks/main.yml b/config/automatrop/roles/desktop_environment/tasks/main.yml
index 31a7f92..ce68c8e 100644
--- a/config/automatrop/roles/desktop_environment/tasks/main.yml
+++ b/config/automatrop/roles/desktop_environment/tasks/main.yml
@@ -55,6 +55,7 @@
   register: base16_schemes
   tags:
     - color
+    - i3
 
 - name: Configure Alacritty
   template:
@@ -106,6 +107,7 @@
     - i3-reload
   tags:
     - color
+    - i3
   when: display_server == 'x11'
 
 - name: Set base16 theme for rofi
diff --git a/config/autorandr/postswitch b/config/autorandr/postswitch
index 145748f..bc03c7f 100755
--- a/config/autorandr/postswitch
+++ b/config/autorandr/postswitch
@@ -24,3 +24,9 @@ fi
 
 feh --no-fehbg --bg-fill "$filepath"
 
+# Make i3 distribute the workspaces on all screens
+monitors_json="$(xrandr --listmonitors | tail -n+2 | awk '{ print $4 }' | sed 's|.\+|"\0"|' | tr '\n' ',')"
+automatrop -e '{"x11_screens":['"$monitors_json"']}' --tags i3
+
+# TODO Make sure it goes from left to right
+# Either with the "main" display or using the geometry data