diff --git a/config-files/polkit/00-polkit.rules b/config-files/polkit/00-polkit.rules
new file mode 100644
index 0000000..e83111f
--- /dev/null
+++ b/config-files/polkit/00-polkit.rules
@@ -0,0 +1,17 @@
+polkit.addRule(function(action, subject) 
+{
+	if (action.id == "org.freedesktop.policykit.exec" && action.lookup("program") == "/bin/shutdown" && subject.isInGroup("wheel"))
+		return polkit.Result.YES;
+});
+
+polkit.addRule(function(action, subject)
+{
+	if (action.id == "org.freedesktop.policykit.exec" && action.lookup("program") == "/bin/zzz" && subject.isInGroup("wheel"))
+		return polkit.Result.YES;
+});
+
+polkit.addRule(function(action, subject)
+{
+	if (action.id.startsWith("org.freedesktop.udisks2.") && subject.isInGroup("wheel"))
+		return polkit.Result.YES;
+});
diff --git a/config-files/waybar/config b/config-files/waybar/config
index 67007cd..7a35c4b 100755
--- a/config-files/waybar/config
+++ b/config-files/waybar/config
@@ -5,7 +5,7 @@
         "position": "top",
         "modules-left": ["wlr/taskbar"],
         "modules-center": ["clock"],
-        "modules-right": ["temperature","memory","tray","custom/search","custom/poweroff"],
+        "modules-right": ["memory","tray","custom/search","custom/poweroff"],
         "fixed-center": true,
         "spacing": 20,
         "custom/poweroff":
@@ -36,10 +36,6 @@
             "interval": 30,
             "format": " {}%"
         },
-        "temperature":
-        {
-            "format": " {temperatureC}°C"
-        },
         "wlr/taskbar":
         {
             "format": "{icon}",
diff --git a/config-files/wayfire/wayfire.ini b/config-files/wayfire/wayfire.ini
index a9cb982..eb21be0 100755
--- a/config-files/wayfire/wayfire.ini
+++ b/config-files/wayfire/wayfire.ini
@@ -19,12 +19,13 @@ zoom_enabled_for = none
 
 [autostart]
 audio = pipewire
-audio_notify = sleep 5; dbus-launch pa-notify -t 2
+audio_notify = sleep 5; pa-notify -t 2
+audio_player = playerctld daemon
 automount = udiskie -As
 autostart_wf_shell = false
 background = wf-background
 bar = waybar
-element = dbus-launch element-desktop --hidden --enable-features=UseOzonePlatform --ozone-platform=wayland
+element = element-desktop --hidden --enable-features=UseOzonePlatform --ozone-platform=wayland
 idle = swayidle -w timeout 590 gtklock before-sleep gtklock
 network = sleep 5; nm-applet --indicator
 notifications = mako
@@ -56,6 +57,9 @@ binding_kanshi = <super> KEY_K
 binding_launcher = <super> KEY_S
 binding_matrix = <super> KEY_E
 binding_mute = KEY_MUTE
+binding_next = KEY_NEXTSONG
+binding_playpause = KEY_PLAYPAUSE
+binding_previous = KEY_PREVIOUSSONG
 binding_screenshot = <shift> KEY_SYSRQ
 binding_screenshot_interactive = KEY_SYSRQ
 binding_terminal = <super> KEY_T
@@ -69,8 +73,11 @@ command_firefox = firefox
 command_gamma = wlsunset -l 52.0 -L 5.9 -t 3000
 command_kanshi = kanshi
 command_launcher = wofi --show drun
-command_matrix = dbus-launch element-desktop --enable-features=UseOzonePlatform --ozone-platform=wayland
+command_matrix = element-desktop --enable-features=UseOzonePlatform --ozone-platform=wayland
 command_mute = pamixer -t
+command_next = playerctl next
+command_playpause = playerctl play-pause
+command_previous = playerctl previous
 command_screenshot = grim $(date '+%F_%T').png
 command_screenshot_interactive = slurp | grim -g - $(date '+%F_%T').png
 command_terminal = foot
diff --git a/config-files/wlogout/layout b/config-files/wlogout/layout
index b2ad288..bcc51be 100755
--- a/config-files/wlogout/layout
+++ b/config-files/wlogout/layout
@@ -6,7 +6,7 @@
 }
 {
     "label" : "hibernate",
-    "action" : "loginctl hibernate",
+    "action" : "gtklock & pkexec /bin/zzz -Z",
     "text" : "Hibernate",
     "keybind" : "h"
 }
@@ -18,19 +18,19 @@
 }
 {
     "label" : "shutdown",
-    "action" : "loginctl poweroff",
+    "action" : "pkexec /bin/shutdown -P now",
     "text" : "Shutdown",
     "keybind" : "s"
 }
 {
     "label" : "suspend",
-    "action" : "loginctl suspend",
+    "action" : "gtklock & pkexec /bin/zzz -z",
     "text" : "Suspend",
     "keybind" : "u"
 }
 {
     "label" : "reboot",
-    "action" : "loginctl reboot",
+    "action" : "pkexec /bin/shutdown -r now",
     "text" : "Reboot",
     "keybind" : "r"
 }
diff --git a/void-desktop-install.txt b/void-desktop-install.txt
index 64b365f..69436f0 100755
--- a/void-desktop-install.txt
+++ b/void-desktop-install.txt
@@ -98,7 +98,7 @@ Post install:
     {
         # ln -s /etc/sv/NetworkManager /var/service
         # ln -s /etc/sv/dbus /var/service
-        # vim /etc/NetworkManager/conf.d/rand_mac.conf:
+        # vim /etc/NetworkManager/NetworkManager.conf:
         {
             > [device-mac-randomization]
             > wifi.scan-rand-mac-address=yes
@@ -185,9 +185,12 @@ Post install:
     }
     Session & login manager:
     {
-        # xbps-install -Sy elogind sddm sddm-kcm seatd wayland xorg-minimal xorg-fonts qt5-wayland qt6-wayland xorg-server-xwayland
+        # xbps-install -Sy polkit dumb_runtime_dir sddm sddm-kcm seatd wayland xorg-minimal xorg-fonts qt5-wayland qt6-wayland xorg-server-xwayland
         # ln -s /etc/sv/seatd /var/service/
         # ln -s /etc/sv/sddm /var/service/
+        # ln -s /etc/sv/polkitd /var/service/
+
+        # cp void-desktop/config-files/polkit/00-polkit.rules /etc/polkit-1/rules.d/
 
         (chili theme)
         # xbps-install -Sy qt5 qt5-quickcontrols qt5-graphicaleffects
@@ -207,7 +210,7 @@ Post install:
         {
             > [Desktop Entry]
             > Name=Wayfire
-            > Exec=dbus-run-session wayfire
+            > Exec=wayfire
             > TryExec=wayfire
             > Type=Application
             > DesktopnNames=Wayfire
@@ -278,7 +281,7 @@ Post install:
         {
             > [autostart]
             > audio = pipewire
-            > audio_notify = sleep 5; dbus-launch pa-notify -t 2
+            > audio_notify = sleep 5; pa-notify -t 2
         }
     }
     Lockscreen: