diff --git a/arch-desktop.yaml b/arch-desktop.yaml
new file mode 100644
index 0000000..b42de53
--- /dev/null
+++ b/arch-desktop.yaml
@@ -0,0 +1,18 @@
+track: "https://git.ruds.io/rs2009/blendOS-tracks/raw/branch/main/arch.yaml"
+
+stages:
+  - module: exec
+    run: |
+      if [[ "$BASE_DESKTOP" = gnome ]]; then
+        pacman -Syqu --noconfirm gnome
+      elif [[ "$BASE_DESKTOP" = plasma ]]; then
+        pacman -Syqu --noconfirm plasma \
+                                 kde-accessibility-meta \
+                                 kde-multimedia-meta \
+                                 kde-system-meta \
+                                 kde-utilities-meta \
+                                 discover
+      fi
+
+env:
+  BASE_DESKTOP: gnome
diff --git a/arch.yaml b/arch.yaml
index 962347e..29d06c4 100644
--- a/arch.yaml
+++ b/arch.yaml
@@ -34,6 +34,7 @@ stages:
       - "dracut"
       - "skopeo"
       - "umoci"
+      - "flatpak"
       - "pacman-contrib"
       - "networkmanager"
       - "python"
@@ -82,11 +83,7 @@ stages:
 
       - |
         git clone --revision "$BASE_AKSHARA_REPO_COMMIT" --depth 1 "$BASE_AKSHARA_REPO" /akshara
-        cd /akshara
-        cp -a usr/lib/akshara /usr/lib/akshara
-        cp -a usr/lib/dracut/modules.d/10akshara /usr/lib/dracut/modules.d/10akshara
-        cp usr/bin/akshara /usr/bin/akshara
-      - rm -rf /akshara
+        cp -a /akshara/usr/* /usr
 
 post-stages:
   - module: exec
@@ -194,7 +191,7 @@ env:
   BASE_USE_IWD: "y"
   BASE_NVIDIA: "none"
   BASE_AKSHARA_REPO: "https://git.ruds.io/rs2009/akshara"
-  BASE_AKSHARA_REPO_COMMIT: "2fdf50dfd2eefcd1fe3d2c877056477ab93e6f0b"
+  BASE_AKSHARA_REPO_COMMIT: "4c1cfcfca9e54f00a12520f60b7f615036ea29f1"
 
 boot:
   type: uefi
diff --git a/ubuntu.yaml b/ubuntu.yaml
index 08a5a51..90e4ba7 100644
--- a/ubuntu.yaml
+++ b/ubuntu.yaml
@@ -23,11 +23,7 @@ stages:
     inputs:
       - |
         git clone --revision "$BASE_AKSHARA_REPO_COMMIT" --depth 1 "$BASE_AKSHARA_REPO" /akshara
-        cd /akshara
-        cp -a usr/lib/akshara /usr/lib/akshara
-        cp -a usr/lib/dracut/modules.d/10akshara /usr/lib/dracut/modules.d/10akshara
-        cp usr/bin/akshara /usr/bin/akshara
-      - rm -rf /akshara
+        cp -a /akshara/usr/* /usr
 
 post-stages:
   - module: exec
@@ -57,4 +53,4 @@ override:
 env:
   BASE_IMAGE_NAME: docker://ghcr.io/rudraswat/ubuntu-rolling-gnome:main
   BASE_AKSHARA_REPO: "https://git.ruds.io/rs2009/akshara"
-  BASE_AKSHARA_REPO_COMMIT: "2fdf50dfd2eefcd1fe3d2c877056477ab93e6f0b"
+  BASE_AKSHARA_REPO_COMMIT: "4c1cfcfca9e54f00a12520f60b7f615036ea29f1"