diff --git a/build_files/base/17-cleanup.sh b/build_files/base/17-cleanup.sh
index 502c400f..faa578b2 100755
--- a/build_files/base/17-cleanup.sh
+++ b/build_files/base/17-cleanup.sh
@@ -14,6 +14,7 @@ systemctl enable brew-setup.service
 systemctl enable brew-upgrade.timer
 systemctl enable brew-update.timer
 systemctl enable aurora-groups.service
+systemctl enable usr-share-sddm-themes.mount
 systemctl --global enable ublue-user-setup.service
 systemctl --global enable podman-auto-update.timer
 systemctl enable check-sb-key.service
diff --git a/just/aurora-apps.just b/just/aurora-apps.just
index 66515607..894ddeb5 100644
--- a/just/aurora-apps.just
+++ b/just/aurora-apps.just
@@ -138,7 +138,8 @@ install-opentabletdriver:
     flatpak --system install -y flathub net.opentabletdriver.OpenTabletDriver && \
     mkdir -p $HOME/.config/OpenTabletDriver && \
     flatpak override --user --filesystem=xdg-config/OpenTabletDriver net.opentabletdriver.OpenTabletDriver && \
-    curl -s https://raw.githubusercontent.com/flathub/net.opentabletdriver.OpenTabletDriver/refs/heads/master/scripts/opentabletdriver.service > ~/.config/systemd/user/opentabletdriver.service  && \
+    mkdir -p $HOME/.config/systemd/user && \
+    curl -s https://raw.githubusercontent.com/flathub/net.opentabletdriver.OpenTabletDriver/refs/heads/master/scripts/opentabletdriver.service > $HOME/.config/systemd/user/opentabletdriver.service  && \
     systemctl --user daemon-reload && \
     systemctl enable --user --now opentabletdriver.service
 
diff --git a/system_files/shared/usr/lib/systemd/system/usr-share-sddm-themes.mount b/system_files/shared/usr/lib/systemd/system/usr-share-sddm-themes.mount
new file mode 100644
index 00000000..af5f3e7d
--- /dev/null
+++ b/system_files/shared/usr/lib/systemd/system/usr-share-sddm-themes.mount
@@ -0,0 +1,20 @@
+# Workaround to allow KDE Discover to install sddm themes
+# TODO: Remove this whenever sddm allows installing themes other than in /usr/share.
+# See https://github.com/sddm/sddm/issues/1561
+
+[Unit]
+Description=KDE writable sddm workaround
+RequiresMountsFor=/usr /var
+ConditionPathExists=/usr/share/sddm
+ConditionPathExists=/var/sddm_themes/themes
+ConditionPathExists=/var/sddm_themes/themes.work
+PartOf=aurora-kde-themes-workaround.target
+
+[Mount]
+Type=overlay
+What=overlay
+Where=/usr/share/sddm/themes
+Options=lowerdir=/usr/share/sddm/themes,upperdir=/var/sddm_themes/themes,workdir=/var/sddm_themes/themes.work
+
+[Install]
+WantedBy=multi-user.target
diff --git a/system_files/shared/usr/lib/tmpfiles.d/usr-share-sddm-themes.conf  b/system_files/shared/usr/lib/tmpfiles.d/usr-share-sddm-themes.conf 
new file mode 100644
index 00000000..2048af8d
--- /dev/null
+++ b/system_files/shared/usr/lib/tmpfiles.d/usr-share-sddm-themes.conf 	
@@ -0,0 +1,6 @@
+# Workaround to allow KDE Discover to install sddm themes
+# TODO: Remove this whenever sddm allows installing themes other than in /usr/share.
+# See https://github.com/sddm/sddm/issues/1561
+
+d /var/sddm_themes/themes 0755 - - -
+d /var/sddm_themes/themes.work 0755 - - -