diff --git a/main.yml b/main.yml
index 233012c..7d3f62e 100644
--- a/main.yml
+++ b/main.yml
@@ -1,6 +1,6 @@
 - hosts: localhost
   roles:
     - common
-    - desktop-environment
+    - desktop-environment # WM, App Launcher etc.
     - essential-tools # Thunar File Manager, Firefox, KeePassXC, Nextcloud Desktop
     #- media-tools # Spotify, VLC
\ No newline at end of file
diff --git a/roles/desktop-environment/templates/waybar-config.j2 b/roles/desktop-environment/templates/waybar-config.j2
index 89abcc7..458efa7 100644
--- a/roles/desktop-environment/templates/waybar-config.j2
+++ b/roles/desktop-environment/templates/waybar-config.j2
@@ -1,7 +1,7 @@
 {
     "modules-left":  ["sway/workspaces", "sway/mode"],
     "modules-center": ["clock"],
-    "modules-right": ["cpu", "memory", "network", "pulseaudio", "battery", "custom/power"],
+    "modules-right": ["cpu", "memory", "network", "pulseaudio", {% if isNotebook | bool %}"battery", {% endif %}"custom/power"],
     "sway/workspaces": {
         "disable-scroll": true
     },