diff --git a/roles/gpu/templates/xorg.conf.j2 b/roles/gpu/templates/xorg.conf.j2
index 060ad83e1425f70fa3dd259e2b3f4a0237a9469d..2fc5f043c03e710be306d3b740cb6f5963216860 100644
--- a/roles/gpu/templates/xorg.conf.j2
+++ b/roles/gpu/templates/xorg.conf.j2
@@ -9,13 +9,13 @@ Section "ServerLayout"
     #InputDevice    "Keyboard0" "CoreKeyboard"
     #InputDevice    "Mouse0" "CorePointer"
     Identifier      "Layout0"
-    {% for screen in item.screens -%}
-    {% if item.screens.index(screen) == 0 -%}
+    {% for screen in item.screens %}
+    {% if item.screens.index(screen) == 0 %}
     Screen 0        "Screen{{item.screens.index(screen)}}"
-    {%-else %}
-    Screen {{item.screens.index(screen)}}        "Screen{{item.screens.index(screen)}}" Right Of "Screen{{item.screens.index(screen)-1}}"
-    {%- endif -%}
-    {%- endfor %}
+    {% else %}
+    Screen {{item.screens.index(screen)}}        "Screen{{item.screens.index(screen)}}" RightOf "Screen{{item.screens.index(screen)-1}}"
+    {% endif %}
+    {% endfor %}
     #InputDevice    "Keyboard0" "CoreKeyboard"
     #InputDevice    "Mouse0" "CorePointer"
 EndSection