diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 19dcdcf..a9a0815 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -39,5 +39,11 @@
         'ghcr.io/ublue-os/aurora-wallpapers',
       ],
     },
+    {
+      matchDepNames: [
+        'docker.io/library/alpine',
+      ],
+      pinDigests: false,
+    },
   ],
 }
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4b5af7e..7bb4959 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ env:
 jobs:
   build_push:
     name: Build and push image
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-26.04
     permissions:
       contents: read
       packages: write
@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
         with:
           submodules: recursive
 
@@ -57,7 +57,7 @@ jobs:
           oci: true
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
+        uses: docker/login-action@c99871dec2022cc055c062a10cc1a1310835ceb4 # v4.3.0
         if: github.event_name != 'pull_request'
         with:
           registry: ghcr.io
@@ -82,7 +82,7 @@ jobs:
             --compression-format=zstd:chunked
 
       - name: Install Cosign
-        uses: sigstore/cosign-installer@7e8b541eb2e61bf99390e1afd4be13a184e9ebc5 # v3.10.1
+        uses: sigstore/cosign-installer@6f9f17788090df1f26f669e9d70d6ae9567deba6 # v4.1.2
         if: github.event_name != 'pull_request'
 
       - name: Sign container image
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d0ddcb2..eb412ff 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/validate-brewfiles.yml b/.github/workflows/validate-brewfiles.yml
index 3476e34..591ad70 100644
--- a/.github/workflows/validate-brewfiles.yml
+++ b/.github/workflows/validate-brewfiles.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
 
       - name: Set up Homebrew
         uses: Homebrew/actions/setup-homebrew@main
diff --git a/.github/workflows/validate-just.yml b/.github/workflows/validate-just.yml
index 596270a..f5fe076 100644
--- a/.github/workflows/validate-just.yml
+++ b/.github/workflows/validate-just.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
 
       - name: Setup Just
         uses: extractions/setup-just@53165ef7e734c5c07cb06b3c8e7b647c5aa16db3 # v4
diff --git a/.github/workflows/validate-renovate.yml b/.github/workflows/validate-renovate.yml
index 6056b3f..27d8e0a 100644
--- a/.github/workflows/validate-renovate.yml
+++ b/.github/workflows/validate-renovate.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
 
       - name: Setup Node.js
         uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
diff --git a/.gitmodules b/.gitmodules
index 2ffbd9c..919ee4b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "branding"]
 	path = branding
 	url = https://github.com/get-aurora-dev/branding.git
+[submodule "aurorafin-shared"]
+	path = aurorafin-shared
+	url = https://github.com/ublue-os/aurorafin-shared.git
diff --git a/Containerfile b/Containerfile
index 13af86b..f46d880 100644
--- a/Containerfile
+++ b/Containerfile
@@ -1,89 +1,122 @@
 FROM docker.io/library/alpine:latest AS builder
 
-RUN apk add --no-cache curl jq zstd tar coreutils imagemagick rsvg-convert
+RUN apk add --no-cache curl jq zstd tar coreutils imagemagick rsvg-convert just
 
-COPY --from=ghcr.io/ublue-os/aurora-wallpapers:latest / /wallpapers
+COPY --from=ghcr.io/ublue-os/aurora-wallpapers:latest@sha256:270b3b10cd6fd54e322407275e24b86655c2472738186b1a825786ce26d4ce50 / /wallpapers
 
 COPY /logos /logos
 
-RUN set -xeuo pipefail && \
-    cd /wallpapers && \
-    rm -rf kde/*/gnome-background-properties/ && \
-    mkdir -p /out/wallpapers/usr/share/wallpapers /out/wallpapers/usr/share/backgrounds && \
-    mv kde/ /out/wallpapers/usr/share/backgrounds/aurora/ && \
-    cd /out/wallpapers/usr/share/backgrounds && \
-    for dir in aurora/*; do \
-      ln -sr "/out/wallpapers/usr/share/backgrounds/${dir}" /out/wallpapers/usr/share/wallpapers/; \
-    done && \
-    ln -sr /out/wallpapers/usr/share/backgrounds/aurora/aurora-wallpaper-6/ /out/wallpapers/usr/share/backgrounds/aurora/aurora-wallpaper-1 && \
-    ln -sr /out/wallpapers/usr/share/backgrounds/aurora/aurora-wallpaper-1/ /out/wallpapers/usr/share/wallpapers/ && \
-    rm -rf /wallpapers
+RUN <<EOF
+set -xeuo pipefail
+
+cd /wallpapers
+rm -rf kde/*/gnome-background-properties/
+mkdir -p /out/wallpapers/usr/share/wallpapers /out/wallpapers/usr/share/backgrounds
+mv kde/ /out/wallpapers/usr/share/backgrounds/aurora/
+cd /out/wallpapers/usr/share/backgrounds
+
+for dir in aurora/*; do
+  ln -sr "/out/wallpapers/usr/share/backgrounds/${dir}" /out/wallpapers/usr/share/wallpapers/
+done
+
+ln -sr /out/wallpapers/usr/share/backgrounds/aurora/aurora-wallpaper-6/ /out/wallpapers/usr/share/backgrounds/aurora/aurora-wallpaper-1
+ln -sr /out/wallpapers/usr/share/backgrounds/aurora/aurora-wallpaper-1/ /out/wallpapers/usr/share/wallpapers/
+rm -rf /wallpapers
+EOF
 
 # Here we set our default wallpaper
-RUN set -xeuo pipefail && \
-    REV=12 && \
-    ln -sr /out/wallpapers/usr/share/backgrounds/aurora/aurora-wallpaper-"${REV}"/contents/images/3840x2160.jxl /out/wallpapers/usr/share/backgrounds/default.jxl && \
-    ln -sr /out/wallpapers/usr/share/backgrounds/aurora/aurora-wallpaper-"${REV}"/contents/images/3840x2160.jxl /out/wallpapers/usr/share/backgrounds/default-dark.jxl && \
-    ln -sr /out/wallpapers/usr/share/backgrounds/aurora/aurora-wallpaper-"${REV}" /out/wallpapers/usr/share/wallpapers/Aurora && \
-    ln -sr /out/wallpapers/usr/share/backgrounds/aurora/aurora.xml /out/wallpapers/usr/share/backgrounds/default.xml
+RUN <<EOF
+set -xeuo pipefail
 
-RUN set -xeuo pipefail && \
-    mkdir -p /out/logos/usr/share/icons/hicolor/scalable/apps && \
-    mkdir -p /out/logos/usr/share/icons/hicolor/scalable/places && \
-    mkdir -p /out/logos/usr/share/pixmaps && \
-    cp /logos/distributor-logo.svg /out/logos/usr/share/icons/hicolor/scalable && \
-    cp \
-      /logos/auroralogo-white.svg \
-      /logos/distributor-logo-symbolic.svg \
-      /logos/auroralogo-circle-symbolic.svg \
-      /logos/auroralogo-pride.svg \
-      /logos/auroralogo-pride-trans.svg \
-      /out/logos/usr/share/icons/hicolor/scalable/places/ && \
+REV=12
+ln -sr /out/wallpapers/usr/share/backgrounds/aurora/aurora-wallpaper-"${REV}"/contents/images/3840x2160.jxl /out/wallpapers/usr/share/backgrounds/default.jxl
+ln -sr /out/wallpapers/usr/share/backgrounds/aurora/aurora-wallpaper-"${REV}"/contents/images/3840x2160.jxl /out/wallpapers/usr/share/backgrounds/default-dark.jxl
+ln -sr /out/wallpapers/usr/share/backgrounds/aurora/aurora-wallpaper-"${REV}" /out/wallpapers/usr/share/wallpapers/Aurora
+ln -sr /out/wallpapers/usr/share/backgrounds/aurora/aurora.xml /out/wallpapers/usr/share/backgrounds/default.xml
+EOF
 
-    cp /logos/aurora-banner.svg /out/logos/usr/share/pixmaps/ && \
-    ln -sr /out/logos/usr/share/pixmaps/aurora-banner.svg /out/logos/usr/share/pixmaps/fedora-logo.svg && \
+RUN <<EOF
+set -xeuo pipefail
 
-    magick -background none /logos/aurora-banner.svg -quality 90 -resize $((400-10*2))x100 -gravity center -extent 400x100 /out/logos/usr/share/pixmaps/fedora-logo.png && \
-    magick -background none /logos/aurora-banner.svg -quality 90 -resize $((128-3*2))x32 -gravity center -extent 128x32 /out/logos/usr/share/pixmaps/fedora-logo-small.png && \
-    magick -background none /logos/aurora-banner.svg -quality 90 -resize $((200-5*2))x50 -gravity center -extent 200x100 /out/logos/usr/share/pixmaps/fedora_logo_med.png  && \
-    magick -background none /logos/distributor-logo.svg -quality 90 -resize 256x256! /out/logos/usr/share/pixmaps/system-logo.png  && \
-    magick -background none /logos/distributor-logo.svg -quality 90 -resize 128x128! /out/logos/usr/share/pixmaps/fedora-logo-sprite.png  && \
-    magick -background none /logos/distributor-logo.svg -quality 90 -resize 256x256! /out/logos/usr/share/pixmaps/system-logo-white.png  && \
+mkdir -p /out/logos/usr/share/icons/hicolor/scalable/apps
+mkdir -p /out/logos/usr/share/icons/hicolor/scalable/places
+mkdir -p /out/logos/usr/share/pixmaps
+cp /logos/distributor-logo.svg /out/logos/usr/share/icons/hicolor/scalable
+cp \
+  /logos/auroralogo-white.svg \
+  /logos/distributor-logo-symbolic.svg \
+  /logos/auroralogo-circle-symbolic.svg \
+  /logos/auroralogo-pride.svg \
+  /logos/auroralogo-pride-trans.svg \
+  /out/logos/usr/share/icons/hicolor/scalable/places/
 
-    ln -sr /out/logos/usr/share/pixmaps/aurora-banner.svg /out/logos/usr/share/pixmaps/fedora_whitelogo.svg && \
-    ln -sr /out/logos/usr/share/icons/hicolor/scalable/distributor-logo.svg /out/logos/usr/share/pixmaps/fedora-logo-sprite.svg && \
-    ln -sr /out/logos/usr/share/icons/hicolor/scalable/distributor-logo.svg /out/logos/usr/share/icons/hicolor/scalable/places/distributor-logo.svg && \
-    ln -sr /out/logos/usr/share/icons/hicolor/scalable/distributor-logo.svg /out/logos/usr/share/icons/hicolor/scalable/places/auroralogo-gradient.svg && \
-    ln -sr /out/logos/usr/share/icons/hicolor/scalable/places/distributor-logo-symbolic.svg /out/logos/usr/share/icons/hicolor/scalable/places/auroralogo-symbolic.svg && \
-    ln -sr /out/logos/usr/share/icons/hicolor/scalable/places/distributor-logo-symbolic.svg /out/logos/usr/share/icons/hicolor/scalable/places/distributor-logo-white.svg && \
-    ln -sr /out/logos/usr/share/icons/hicolor/scalable/places/distributor-logo-symbolic.svg /out/logos/usr/share/icons/hicolor/scalable/places/start-here.svg && \
-    ln -sr /out/logos/usr/share/icons/hicolor/scalable/places/distributor-logo-symbolic.svg /out/logos/usr/share/icons/hicolor/scalable/apps/start-here.svg
+cp /logos/aurora-banner.svg /out/logos/usr/share/pixmaps/
+ln -sr /out/logos/usr/share/pixmaps/aurora-banner.svg /out/logos/usr/share/pixmaps/fedora-logo.svg
 
-RUN set -xeuo pipefail && \
-  mkdir -p /out/logos/usr/share/plymouth/themes/spinner/ && \
-  magick -background none /out/logos/usr/share/pixmaps/aurora-banner.svg -quality 90 -resize $((128-3*2))x32 -gravity center -extent 128x32 /out/logos/usr/share/plymouth/themes/spinner/watermark.png && \
-  cp /out/logos/usr/share/plymouth/themes/spinner/watermark.png /out/logos/usr/share/plymouth/themes/spinner/kinoite-watermark.png && \
-  mkdir -p /out/logos/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/images/ && \
-  gzip -c /out/logos/usr/share/icons/hicolor/scalable/distributor-logo.svg > /out/logos/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/images/aurora_logo.svgz && \
-  curl -Lo /out/logos/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/images/busywidget.svgz https://invent.kde.org/plasma/plasma-workspace/-/raw/d3b5a422e586ee578efadfe462d0d0b5546aaa3b/lookandfeel/org.kde.breeze/contents/splash/images/busywidget.svgz && \
-  curl -Lo /out/logos/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/images/kde.svgz https://invent.kde.org/plasma/plasma-workspace/-/raw/d3b5a422e586ee578efadfe462d0d0b5546aaa3b/lookandfeel/org.kde.breeze/contents/splash/images/kde.svgz && \
-  curl -Lo /out/logos/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/images/plasma.svgz https://invent.kde.org/plasma/plasma-workspace/-/raw/d3b5a422e586ee578efadfe462d0d0b5546aaa3b/lookandfeel/org.kde.breeze/contents/splash/images/plasma.svgz && \
-  mkdir -p /out/logos/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents/splash/images && \
-  cp -r /out/logos/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash /out/logos/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents/
+magick -background none /logos/aurora-banner.svg -quality 90 -resize $((400-10*2))x100 -gravity center -extent 400x100 /out/logos/usr/share/pixmaps/fedora-logo.png
+magick -background none /logos/aurora-banner.svg -quality 90 -resize $((128-3*2))x32 -gravity center -extent 128x32 /out/logos/usr/share/pixmaps/fedora-logo-small.png
+magick -background none /logos/aurora-banner.svg -quality 90 -resize $((200-5*2))x50 -gravity center -extent 200x100 /out/logos/usr/share/pixmaps/fedora_logo_med.png
+magick -background none /logos/distributor-logo.svg -quality 90 -resize 256x256! /out/logos/usr/share/pixmaps/system-logo.png
+magick -background none /logos/distributor-logo.svg -quality 90 -resize 128x128! /out/logos/usr/share/pixmaps/fedora-logo-sprite.png
+magick -background none /logos/distributor-logo.svg -quality 90 -resize 256x256! /out/logos/usr/share/pixmaps/system-logo-white.png
+
+ln -sr /out/logos/usr/share/pixmaps/aurora-banner.svg /out/logos/usr/share/pixmaps/fedora_whitelogo.svg
+ln -sr /out/logos/usr/share/icons/hicolor/scalable/distributor-logo.svg /out/logos/usr/share/pixmaps/fedora-logo-sprite.svg
+ln -sr /out/logos/usr/share/icons/hicolor/scalable/distributor-logo.svg /out/logos/usr/share/icons/hicolor/scalable/places/distributor-logo.svg
+ln -sr /out/logos/usr/share/icons/hicolor/scalable/distributor-logo.svg /out/logos/usr/share/icons/hicolor/scalable/places/auroralogo-gradient.svg
+ln -sr /out/logos/usr/share/icons/hicolor/scalable/places/distributor-logo-symbolic.svg /out/logos/usr/share/icons/hicolor/scalable/places/auroralogo-symbolic.svg
+ln -sr /out/logos/usr/share/icons/hicolor/scalable/places/distributor-logo-symbolic.svg /out/logos/usr/share/icons/hicolor/scalable/places/distributor-logo-white.svg
+ln -sr /out/logos/usr/share/icons/hicolor/scalable/places/distributor-logo-symbolic.svg /out/logos/usr/share/icons/hicolor/scalable/places/start-here.svg
+ln -sr /out/logos/usr/share/icons/hicolor/scalable/places/distributor-logo-symbolic.svg /out/logos/usr/share/icons/hicolor/scalable/apps/start-here.svg
+EOF
+
+RUN <<EOF
+set -xeuo pipefail
+
+mkdir -p /out/logos/usr/share/plymouth/themes/spinner/
+magick -background none /out/logos/usr/share/pixmaps/aurora-banner.svg -quality 90 -resize $((128-3*2))x32 -gravity center -extent 128x32 /out/logos/usr/share/plymouth/themes/spinner/watermark.png
+cp /out/logos/usr/share/plymouth/themes/spinner/watermark.png /out/logos/usr/share/plymouth/themes/spinner/kinoite-watermark.png
+mkdir -p /out/logos/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/images/
+gzip -c /out/logos/usr/share/icons/hicolor/scalable/distributor-logo.svg > /out/logos/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/images/aurora_logo.svgz
+curl -Lo /out/logos/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/images/busywidget.svgz https://invent.kde.org/plasma/plasma-workspace/-/raw/d3b5a422e586ee578efadfe462d0d0b5546aaa3b/lookandfeel/org.kde.breeze/contents/splash/images/busywidget.svgz
+curl -Lo /out/logos/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/images/kde.svgz https://invent.kde.org/plasma/plasma-workspace/-/raw/d3b5a422e586ee578efadfe462d0d0b5546aaa3b/lookandfeel/org.kde.breeze/contents/splash/images/kde.svgz
+curl -Lo /out/logos/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/images/plasma.svgz https://invent.kde.org/plasma/plasma-workspace/-/raw/d3b5a422e586ee578efadfe462d0d0b5546aaa3b/lookandfeel/org.kde.breeze/contents/splash/images/plasma.svgz
+mkdir -p /out/logos/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents/splash/images
+cp -r /out/logos/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash /out/logos/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents/
+EOF
 COPY /system_files/shared /out/system_files/shared
 
 # Copy default dark variant things to light variant so that it is shared
 # Effectively are symlinks but we can't do that here because themes can't execute files of other themes
-RUN set -xeuo pipefail && \
-  cp -r /out/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/plasmoidsetupscripts/ /out/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents && \
-  cp -r /out/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/ /out/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents && \
-  cp -r /out/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/layouts /out/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents
+RUN <<EOF
+set -xeuo pipefail
 
-FROM ghcr.io/projectbluefin/common@sha256:6844adce0a79e18ab87c856a88115d03f957e2c67691e706882436f5625fa80b AS bluefin
+cp -r /out/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/plasmoidsetupscripts/ /out/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents
+cp -r /out/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/ /out/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents
+cp -r /out/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/layouts /out/system_files/shared/usr/share/plasma/look-and-feel/dev.getaurora.auroralight.desktop/contents
+EOF
+
+RUN <<EOF
+set -xeuo pipefail
+
+install -d /out/system_files/shared/usr/share/bash-completion/completions /out/system_files/shared/usr/share/zsh/site-functions /out/system_files/shared/usr/share/fish/vendor_completions.d/
+just --completions bash | sed -E 's/([\(_" ])just/\1ujust/g' > /out/system_files/shared/usr/share/bash-completion/completions/ujust
+just --completions zsh | sed -E 's/([\(_" ])just/\1ujust/g' > /out/system_files/shared/usr/share/zsh/site-functions/_ujust
+just --completions fish | sed -E 's/([\(_" ])just/\1ujust/g' > /out/system_files/shared/usr/share/fish/vendor_completions.d/ujust.fish
+EOF
+
+RUN <<EOF
+# FIXME: Renovate
+curl -fsSLo - https://codeberg.org/fabiscafe/game-devices-udev/archive/1.0.tar.gz | tar xzvf - -C tmp/
+for f in tmp/game-devices-udev/src/*.rules; do
+  install -Dpm0644 "$f" "out/system_files/shared/usr/lib/udev/rules.d/71-${f##*/}";
+done
+curl -fsSLo /out/system_files/shared/usr/lib/udev/rules.d/70-u2f.rules https://raw.githubusercontent.com/Yubico/libfido2/refs/heads/main/udev/70-u2f.rules
+EOF
 
 FROM scratch AS ctx
-COPY --from=bluefin /system_files/shared /system_files/shared
-COPY --from=bluefin /system_files/nvidia /system_files/nvidia
+COPY aurorafin-shared/system_files/shared /system_files/shared
+COPY aurorafin-shared/system_files/nvidia /system_files/nvidia
 COPY --from=builder /out/wallpapers /wallpapers
 COPY --from=builder /out/logos /logos
 COPY --from=builder /out/system_files/shared /system_files/shared
diff --git a/README.md b/README.md
index a6b246f..04a4010 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,17 @@
 # aurora-common
 
-Shared OCI layer containing configuration files for Aurora and Aurora-DX variants.
+Shared OCI layer containing configuration files for https://github.com/ublue-os/aurora.
 
-## Repository Structure
-
-This layer builds on top of `ghcr.io/projectbluefin/common` and `https://github.com/get-aurora-dev/branding` which includes:
+This repo builds on top of:
+- https://github.com/ublue-os/aurorafin-shared
+- https://github.com/get-aurora-dev/branding
+- https://github.com/ublue-os/artwork
 
 - `system_files/shared/` - Configuration shared between Aurora and Aurora-DX
 - `system_files/dx/` - Aurora-DX specific configuration
 - `wallpapers/` - Aurora wallpapers from [artwork repo](https://github.com/ublue-os/artwork)
 - `system_files/shared/usr/share/ublue-os/homebrew/` - Flatpak definitions used for including flatpaks for the ISOs and `ujust install-system-flatpaks` - [Yes, homebrew supports the installation of Flatpaks](https://github.com/Homebrew/brew/pull/21097)
-- `logos/` - Aurora Logos used in SDDM/Plasma Kickoff etc.
+- `logos/` - Aurora Logos used in PLM/Plasma Kickoff etc.
 
 Related work is on the [Fedora KDE-SIG](https://forge.fedoraproject.org/kde)
 
diff --git a/aurorafin-shared b/aurorafin-shared
new file mode 160000
index 0000000..81fae17
--- /dev/null
+++ b/aurorafin-shared
@@ -0,0 +1 @@
+Subproject commit 81fae1734f0d909e6d8b3d6d3695cbaf1f7ed1f2
diff --git a/branding b/branding
index a260910..0063d5c 160000
--- a/branding
+++ b/branding
@@ -1 +1 @@
-Subproject commit a2609104f6b20da64a29b002b7bf0428b466e251
+Subproject commit 0063d5ca18e2b7dfddd8af05af86e63604dbb737
diff --git a/system_files/shared/etc/bazaar/curated.yaml b/system_files/shared/etc/bazaar/curated.yaml
index f03ab5d..14d5958 100644
--- a/system_files/shared/etc/bazaar/curated.yaml
+++ b/system_files/shared/etc/bazaar/curated.yaml
@@ -157,7 +157,7 @@ rows:
           banner-height: 550
           appids:
             - io.github.vani_tty1.memerist
-            - com.pixelomer.ShijimaQt
+            - org.kde.drawy
             - org.kde.kstars
             - re.sonny.Eloquent
             - io.github.halfmexican.Mingle
diff --git a/system_files/shared/usr/bin/ublue-rollback-helper b/system_files/shared/usr/bin/ublue-rollback-helper
index c23d869..d63dcf1 100755
--- a/system_files/shared/usr/bin/ublue-rollback-helper
+++ b/system_files/shared/usr/bin/ublue-rollback-helper
@@ -24,8 +24,8 @@ IMAGE_NAME="$(gum choose --header="Select your image:" "${IMAGES[@]}" cancel)"
 
 base_image="${IMAGE_REGISTRY}/${IMAGE_NAME}"
 declare -a CHANNELS
-CHANNELS=(stable latest)
-  echo "The default selection is stable (weekly builds) and latest is for enthusiasts and testers."
+CHANNELS=(stable latest testing)
+  echo -e "\nstable: The default selection (weekly builds) with gated CoreOS kernel\nlatest: For enthusiast, stock Fedora kernel and latest updates\ntesting: Get a sneak peak into future Aurora builds and Fedora versions\n\nSee our docs: https://docs.getaurora.dev/guides/release-streams\n"
 
 channel_choice="$(gum choose "${CHANNELS[@]}" cancel)"
 [[ "$channel_choice" == "cancel" || "$channel_choice" == "" ]] && exit 0
diff --git a/system_files/shared/usr/lib/sddm/sddm.conf.d/kde_settings.conf b/system_files/shared/usr/lib/sddm/sddm.conf.d/kde_settings.conf
deleted file mode 100644
index 9980ee9..0000000
--- a/system_files/shared/usr/lib/sddm/sddm.conf.d/kde_settings.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[Theme]
-Current=01-breeze-aurora
-# The name comes from /usr/share/icons/breeze_cursors
-CursorTheme=breeze_cursors
-CursorSize=24
diff --git a/system_files/shared/usr/share/kde-settings/kde-profile/default/xdg/kwinrc b/system_files/shared/usr/share/kde-settings/kde-profile/default/xdg/kwinrc
index 7e061bd..b560944 100644
--- a/system_files/shared/usr/share/kde-settings/kde-profile/default/xdg/kwinrc
+++ b/system_files/shared/usr/share/kde-settings/kde-profile/default/xdg/kwinrc
@@ -1,6 +1,8 @@
+# Make sure to sync with: https://forge.fedoraproject.org/kde/kde-settings/src/branch/rawhide/usr/share/kde-settings/kde-profile/default/xdg/kwinrc
 [Wayland]
-InputMethod[$e]=/usr/share/applications/com.github.maliit.keyboard.desktop
+InputMethod[$e]=/usr/share/applications/org.kde.plasma.keyboard.desktop
 VirtualKeyboardEnabled=true
+EnablePrimarySelection=false
 
 [Plugins]
 blurEnabled=true
diff --git a/system_files/shared/usr/share/ublue-os/homebrew/system-flatpaks.Brewfile b/system_files/shared/usr/share/ublue-os/homebrew/system-flatpaks.Brewfile
index 6ac8d86..87609b8 100644
--- a/system_files/shared/usr/share/ublue-os/homebrew/system-flatpaks.Brewfile
+++ b/system_files/shared/usr/share/ublue-os/homebrew/system-flatpaks.Brewfile
@@ -8,6 +8,7 @@ flatpak "org.deskflow.deskflow"
 flatpak "org.fedoraproject.MediaWriter"
 flatpak "org.fkoehler.KTailctl"
 flatpak "org.gnome.DejaDup"
+flatpak "org.gnome.Firmware"
 flatpak "org.gtk.Gtk3theme.Breeze"
 flatpak "org.kde.gwenview"
 flatpak "org.kde.haruna"