diff --git a/host_vars/kronos b/host_vars/kronos
index a09bb13..6b6f080 100644
--- a/host_vars/kronos
+++ b/host_vars/kronos
@@ -1,5 +1,3 @@
-mobile_platform: false
-
 monitors:
   - desc: "LG Electronics LG ULTRAGEAR 311NTZN8J917"
     output: "DP-1"
diff --git a/roles/desktop-environment/templates/.config/hypr/hyprland.conf.j2 b/roles/desktop-environment/templates/.config/hypr/hyprland.conf.j2
index 5768e76..47fbef4 100644
--- a/roles/desktop-environment/templates/.config/hypr/hyprland.conf.j2
+++ b/roles/desktop-environment/templates/.config/hypr/hyprland.conf.j2
@@ -1,6 +1,6 @@
 # Monitor configuration (see https://wiki.hyprland.org/Configuring/Monitors/)
-{% for monitor in hostvars[ansible_hostname]['monitors'] -%}
-monitor=desc:{{ monitor['desc'] }}, {{ monitor['resolution'] }}, {{ monitor['position'] }}, 1
+{% for monitor in hostvars[ansible_hostname]['monitors'] %}
+monitor=desc:{{ monitor['desc'] }}, {{ monitor['resolution'] }}, {{ monitor['position'] | default('auto') }}, 1
 {% endfor %}
 
 # Programs to use
@@ -99,8 +99,9 @@ windowrulev2 = float,title:^(Application Finder)$
 windowrulev2 = size 500 500,title:^(Application Finder)$
 
 # Workspace rules
-{% for workspace in hostvars[ansible_hostname]['workspaces'] -%}
+{% for workspace in hostvars[ansible_hostname]['workspaces'] %}
 workspace = {{ workspace['id'] }}{% if 'monitor' in workspace %}, monitor:desc:{{ workspace['monitor'] }}{% endif %}{% if 'default' in workspace %}, default:{{ workspace['default'] }}{% endif %}{% if 'layoutopt_orientation' in workspace %}, layoutopt:orientation:{{ workspace['layoutopt_orientation'] }}{% endif %}{% if 'on_created_empty' in workspace %}, on-created-empty:{{ workspace['on_created_empty'] }}{% endif %}
+
 {% endfor %}
 
 # Execute apps at launch
@@ -109,7 +110,7 @@ exec-once = waybar & ~/.local/bin/hyprhelpr background & ~/.local/bin/hyprhelpr
 {% if 'nextcloud' in role_names %}
 exec-once = nextcloud --background
 {% endif %}
-{% for autostart in hostvars[ansible_hostname]['autostart'] -%}
+{% for autostart in hostvars[ansible_hostname]['autostart'] %}
 exec-once = {% if 'workspace' in autostart %}[workspace {{ autostart['workspace'] }}] {% endif %}{{ autostart['command'] }}
 {% endfor %}
 
diff --git a/roles/desktop-environment/templates/.config/waybar/config.j2 b/roles/desktop-environment/templates/.config/waybar/config.j2
index a1ac65f..8d2b71a 100644
--- a/roles/desktop-environment/templates/.config/waybar/config.j2
+++ b/roles/desktop-environment/templates/.config/waybar/config.j2
@@ -1,7 +1,7 @@
 {
     "modules-left":  ["hyprland/workspaces"],
     "modules-center": ["clock"],
-    "modules-right": ["cpu", "memory", "network", "pulseaudio", {% if isNotebook | bool %}"battery", {% endif %}"custom/power"],
+    "modules-right": ["cpu", "memory", "network", "pulseaudio", {% if (hostvars[ansible_hostname]['mobile_platform'] | default('false')) | bool %}"battery", {% endif %}"custom/power"],
     "hyprland/workspaces": {},
     "clock": {
         "format": "  {:%H:%M %d.%m.}",
@@ -27,12 +27,12 @@
         "format-icons": ["", "", ""],
         "reverse-scrolling": true,
         "on-click": "swaymsg exec amixer -q set Master toggle"
+    {% if (hostvars[ansible_hostname]['mobile_platform'] | default('false')) | bool %}
     },
-    {% if hostvars[ansible_hostname]['mobile_platform'] | bool %}
     "battery": {
         "format": "{icon}  {capacity}%",
         "format-charging": "  {capacity}%",
         "format-icons": ["", "", "", "", ""]
-    }
     {% endif %}
+    }
 }
diff --git a/roles/desktop-environment/templates/.local/bin/hyprhelpr.j2 b/roles/desktop-environment/templates/.local/bin/hyprhelpr.j2
index a9242f6..1753113 100644
--- a/roles/desktop-environment/templates/.local/bin/hyprhelpr.j2
+++ b/roles/desktop-environment/templates/.local/bin/hyprhelpr.j2
@@ -4,9 +4,10 @@ set -eu
 
 background() {
     swaybg \
-        {% for monitor in hostvars[ansible_hostname]['monitors'] -%}
-        -o "{{ monitor['desc'] }}" -i ~/.config/background/{{ monitor['background']['file'] }} -m {{ monitor['background']['mode'] }} {%- if not loop.last %}\{% endif %}
-        {% endfor %}
+{% for monitor in hostvars[ansible_hostname]['monitors'] %}
+        -o "{{ monitor['desc'] }}" -i ~/.config/background/{{ monitor['background']['file'] }} -m {{ monitor['background']['mode'] }} {%- if not loop.last %} \{% endif %}
+
+{% endfor %}
 }
 
 idle() {
@@ -23,9 +24,10 @@ lock() {
         exit 1
     else
         swaylock -f -e -s fill --indicator-radius 150 \
-            {% for monitor in hostvars[ansible_hostname]['monitors'] -%}
-            -i {{ monitor['output'] }}:~/.config/background/lock-{{ monitor['background']['file'] }} {%- if not loop.last %}\{% endif %}
-            {% endfor %}
+{% for monitor in hostvars[ansible_hostname]['monitors'] %}
+            -i {{ monitor['output'] }}:~/.config/background/lock-{{ monitor['background']['file'] }} {%- if not loop.last %} \{% endif %}
+
+{% endfor %}
     fi
 }
 
diff --git a/roles/desktop-environment/templates/bash_profile.j2 b/roles/desktop-environment/templates/bash_profile.j2
index 19f4cec..144e1f3 100644
--- a/roles/desktop-environment/templates/bash_profile.j2
+++ b/roles/desktop-environment/templates/bash_profile.j2
@@ -15,8 +15,8 @@ export GPG_TTY=$(tty)
 
 # Autostart Hyprland at login
 if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then
-    {% if hostvars[ansible_hostname]['virtual_machine'] | bool %}
+{% if (hostvars[ansible_hostname]['virtual_machine'] | default('false')) | bool %}
     export WLR_NO_HARDWARE_CURSORS=1
-    {% endif %}
+{% endif %}
     exec Hyprland
 fi
\ No newline at end of file