diff --git a/main.yml b/main.yml
index 7d3f62e..233012c 100644
--- a/main.yml
+++ b/main.yml
@@ -1,6 +1,6 @@
 - hosts: localhost
   roles:
     - common
-    - desktop-environment # WM, App Launcher etc.
+    - desktop-environment
     - 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/tasks/main.yml b/roles/desktop-environment/tasks/main.yml
index a9c1e66..fe6ebb9 100644
--- a/roles/desktop-environment/tasks/main.yml
+++ b/roles/desktop-environment/tasks/main.yml
@@ -11,7 +11,6 @@
       - xfce4-appfinder
       - pipewire
       - pipewire-pulse
-      - wireplumber
       - alsa-utils
       - brightnessctl
       - flatpak
diff --git a/roles/desktop-environment/templates/waybar-config.j2 b/roles/desktop-environment/templates/waybar-config.j2
index 458efa7..89abcc7 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", {% if isNotebook | bool %}"battery", {% endif %}"custom/power"],
+    "modules-right": ["cpu", "memory", "network", "pulseaudio", "battery", "custom/power"],
     "sway/workspaces": {
         "disable-scroll": true
     },