diff --git a/files/scripts/fixupstreamicdloaderbug.sh b/files/scripts/fixupstreamicdloaderbug.sh
new file mode 100644
index 00000000..7c9c5263
--- /dev/null
+++ b/files/scripts/fixupstreamicdloaderbug.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+# Tell build process to exit if there are any errors.
+set -oue pipefail
+
+# mitigate upstream packaging bug: https://bugzilla.redhat.com/show_bug.cgi?id=2332429
+# swap the incorrectly installed OpenCL-ICD-Loader for ocl-icd, the expected package
+rpm-ostree override replace \
+  --from repo='fedora' \
+  --experimental \
+  --remove=OpenCL-ICD-Loader \
+  ocl-icd \
+  || true
diff --git a/files/scripts/installrpmfusion.sh b/files/scripts/installrpmfusion.sh
index cf0fd8fc..790151d0 100644
--- a/files/scripts/installrpmfusion.sh
+++ b/files/scripts/installrpmfusion.sh
@@ -1,7 +1,3 @@
-#!/usr/bin/env bash
-
-# Tell build process to exit if there are any errors.
-set -oue pipefail
-
-rpm -q rpmfusion-free-release || rpm-ostree install https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-${OS_VERSION}.noarch.rpm
-rpm -q rpmfusion-nonfree-release || rpm-ostree install https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-${OS_VERSION}.noarch.rpm
+  rpm-ostree install \
+      https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-${OS_VERSION}.noarch.rpm \
+      https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-${OS_VERSION}.noarch.rpm
diff --git a/files/system/hyprland/etc/xdg/hypr/hypridle.conf b/files/system/hyprland/etc/xdg/hypr/hypridle.conf
index 88ae37a2..60a3d5f1 100644
--- a/files/system/hyprland/etc/xdg/hypr/hypridle.conf
+++ b/files/system/hyprland/etc/xdg/hypr/hypridle.conf
@@ -1,5 +1,5 @@
 general {
-    lock_cmd = pidof hyprlock || hyprlock       # avoid starting multiple hyprlock instances.
+    lock_cmd = pgrep -U $USER hyprlock || hyprlock       # avoid starting multiple hyprlock instances.
     before_sleep_cmd = loginctl lock-session    # lock before suspend.
     after_sleep_cmd = hyprctl dispatch dpms on  # to avoid having to press a key twice to turn on the display.
 }
diff --git a/files/system/hyprland/usr/share/hyprland/hyprland.conf b/files/system/hyprland/usr/share/hyprland/hyprland.conf
index f7d68c27..e7ed6148 100644
--- a/files/system/hyprland/usr/share/hyprland/hyprland.conf
+++ b/files/system/hyprland/usr/share/hyprland/hyprland.conf
@@ -184,12 +184,25 @@ bind = $mainMod, mouse_up, workspace, e-1
 bindm = $mainMod, mouse:272, movewindow
 bindm = $mainMod, mouse:273, resizewindow
 
+#
+# These services should be started by default by systemd when
+# graphical-session.target is reached. If you prefer to launch via tty, you'll
+# want to turn these back on, otherwise screensharing and the like may be
+# broken.
+#
+# For a complete list of units systemd spawns for you, run this command:
+#   systemctl --user list-dependencies graphical-session.target
+#
+# Any service under basic.target you'll get in a tty, but you'll need to log in
+# through your DM to get graphical-session.target
+#
+#exec-once = /usr/libexec/xdg-desktop-portal-hyprland
+#exec-once = /usr/libexec/xdg-desktop-portal-gtk
+#exec-once = /usr/libexec/xdg-desktop-portal
+#exec-once = dunst
 
-exec-once = /usr/libexec/xdg-desktop-portal-hyprland
-exec-once = /usr/libexec/xdg-desktop-portal-gtk
-exec-once = /usr/libexec/xdg-desktop-portal
 exec-once = dbus-update-activation-environment --all
 exec-once = /usr/bin/gnome-keyring-daemon --start --components=secrets
 exec-once = exec /usr/libexec/pam_kwallet_init
-exec-once = waybar & /usr/libexec/xfce-polkit & dunst & nm-applet
+exec-once = waybar & /usr/libexec/xfce-polkit & nm-applet
 exec-once = hypridle -c /etc/xdg/hypr/hypridle.conf
diff --git a/recipes/common/common-modules.yml b/recipes/common/common-modules.yml
index 97a97715..751332a6 100644
--- a/recipes/common/common-modules.yml
+++ b/recipes/common/common-modules.yml
@@ -6,10 +6,11 @@ modules:
 #        - RUN rpm -q ublue-os-akmods-addons || rpm-ostree install /tmp/rpms/ublue-os/ublue-os-akmods-addons*.rpm
 #    - type: containerfile
 #      snippets:
-#        - COPY --from=ghcr.io/ublue-os/main-kernel:41 /tmp/rpms /tmp/rpms/kernel
+#       - COPY --from=ghcr.io/ublue-os/main-kernel:41 /tmp/rpms /tmp/rpms/kernel
 #    - type: script
 #      scripts:
 #        - installsignedkernel.sh
+#
 #    - type: containerfile
 #      snippets:
 #        - RUN rpm-ostree install just powerstat
@@ -18,13 +19,16 @@ modules:
 #        - COPY --from=ghcr.io/ublue-os/config:latest /rpms/ublue-os-signing.noarch.rpm /
 #        - COPY --from=ghcr.io/ublue-os/config:latest /rpms/ublue-os-luks.noarch.rpm /
 #        - COPY --from=ghcr.io/ublue-os/config:latest /rpms/ublue-os-just.noarch.rpm /
-#        - RUN rpm -q ublue-os-udev-rules || rpm -ivh /ublue-os-udev-rules.noarch.rpm
-#        - RUN rpm -q ublue-os-update-services || rpm -ivh /ublue-os-update-services.noarch.rpm
-#        - RUN rpm -q ublue-os-signing || rpm -ivh /ublue-os-signing.noarch.rpm
-#        - RUN rpm -q ublue-os-luks || rpm -ivh /ublue-os-luks.noarch.rpm
-#        - RUN rpm -q ublue-os-just || rpm -ivh /ublue-os-just.noarch.rpm
+#        - RUN rpm -ivh /ublue-os-udev-rules.noarch.rpm
+#        - RUN rpm -ivh /ublue-os-update-services.noarch.rpm
+#        - RUN rpm -ivh /ublue-os-signing.noarch.rpm
+#        - RUN rpm -ivh /ublue-os-luks.noarch.rpm
+#        - RUN rpm -ivh /ublue-os-just.noarch.rpm
+
+
     - type: script
       scripts:
+        - installandroidudev.sh
         - installrpmfusion.sh
     - from-file: common/common-packages.yml
     - type: script
@@ -61,3 +65,4 @@ modules:
           - power-profiles-daemon.service
 
     - type: ulxqt-signing
+      source: local