diff --git a/config/common/apps.yml b/config/common/apps.yml
deleted file mode 100644
index 1a8f158..0000000
--- a/config/common/apps.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-- type: rpm-ostree
-  install:
-    - papirus-icon-theme
-    - materia-gtk-theme
-    - krita
-    - blender
-    - inkscape
-    - ffmpeg
-    - ardour8
-    - audacity
-    - qtractor
-    - hydrogen
-    - yoshimi
-    - rakarrack
-    - supercollider
-    - csound
-    - kdenlive
-    - guitarix
-    - ladspa
-    - ladspa-autotalent-plugins
-    - ladspa-dsp-plugins
-    - ladspa-guitarix-plugins
-    - ladspa-amb-plugins
-    - ladspa-blop-plugins
-    - ladspa-caps-plugins
-    - ladspa-cmt-plugins
-    - ladspa-fil-plugins
-    - ladspa-mcp-plugins
-    - ladspa-rev-plugins
-    - ladspa-tap-plugins
-    - ladspa-vco-plugins
-    - ladspa-zam-plugins
-  remove:
-    - firefox
-    - firefox-langpacks
-
-- type: default-flatpaks
-  notify: true
-  system:
-    install:
-      - org.mozilla.firefox
-      - com.obsproject.Studio.Plugin.OBSVkCapture
-      - org.freedesktop.Platform.VulkanLayer.OBSVkCapture
-      - com.obsproject.Studio
-      - org.gimp.GIMP
-      - org.gimp.GIMP.Plugin.BIMP
-      - org.gimp.GIMP.Plugin.Fourier
-      - org.gimp.GIMP.Plugin.Lensfun
-      - org.gimp.GIMP.Plugin.LiquidRescale
-      - org.kde.digikam
-      - com.github.qarmin.czkawka
-      - org.darktable.Darktable
-
-- type: yafti
diff --git a/config/common/gnome-apps.yml b/config/common/gnome-apps.yml
index dd1f7aa..027167b 100644
--- a/config/common/gnome-apps.yml
+++ b/config/common/gnome-apps.yml
@@ -1,8 +1,3 @@
----
-- type: files
-  files:
-    - gnome: /usr
-
-- type: rpm-ostree
-  install:
-    - helvum
+type: rpm-ostree
+install:
+  - helvum
diff --git a/config/common/gnome-files.yml b/config/common/gnome-files.yml
new file mode 100644
index 0000000..c3c8e9a
--- /dev/null
+++ b/config/common/gnome-files.yml
@@ -0,0 +1,3 @@
+type: files
+files:
+  - gnome: /usr
\ No newline at end of file
diff --git a/config/common/plasma-apps.yml b/config/common/plasma-apps.yml
index 5fef7ba..c1773fe 100644
--- a/config/common/plasma-apps.yml
+++ b/config/common/plasma-apps.yml
@@ -1,9 +1,4 @@
----
-- type: files
-  files:
-    - plasma: /usr
-
-- type: rpm-ostree
+type: rpm-ostree
   install:
     - qpwgraph
     - materia-kde 
diff --git a/config/common/plasma-files.yml b/config/common/plasma-files.yml
new file mode 100644
index 0000000..3fe9507
--- /dev/null
+++ b/config/common/plasma-files.yml
@@ -0,0 +1,3 @@
+type: files
+files:
+  - plasma: /usr
diff --git a/config/common/shared-apps.yml b/config/common/shared-apps.yml
new file mode 100644
index 0000000..b8c77d4
--- /dev/null
+++ b/config/common/shared-apps.yml
@@ -0,0 +1,35 @@
+type: rpm-ostree
+install:
+  - papirus-icon-theme
+  - materia-gtk-theme
+  - krita
+  - blender
+  - inkscape
+  - ffmpeg
+  - ardour8
+  - audacity
+  - qtractor
+  - hydrogen
+  - yoshimi
+  - rakarrack
+  - supercollider
+  - csound
+  - kdenlive
+  - guitarix
+  - ladspa
+  - ladspa-autotalent-plugins
+  - ladspa-dsp-plugins
+  - ladspa-guitarix-plugins
+  - ladspa-amb-plugins
+  - ladspa-blop-plugins
+  - ladspa-caps-plugins
+  - ladspa-cmt-plugins
+  - ladspa-fil-plugins
+  - ladspa-mcp-plugins
+  - ladspa-rev-plugins
+  - ladspa-tap-plugins
+  - ladspa-vco-plugins
+  - ladspa-zam-plugins
+remove:
+  - firefox
+  - firefox-langpacks
\ No newline at end of file
diff --git a/config/common/shared-files.yml b/config/common/shared-files.yml
new file mode 100644
index 0000000..7b2a556
--- /dev/null
+++ b/config/common/shared-files.yml
@@ -0,0 +1,3 @@
+type: files
+files:
+  - shared: /usr
diff --git a/config/common/shared-sys.yml b/config/common/shared-sys.yml
deleted file mode 100644
index d7ac43f..0000000
--- a/config/common/shared-sys.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-- type: signing
-
-- type: files
-  files:
-    - shared: /usr
diff --git a/config/recipe-gnome-nvidia.yml b/config/recipe-gnome-nvidia.yml
index 83673ff..a38c747 100644
--- a/config/recipe-gnome-nvidia.yml
+++ b/config/recipe-gnome-nvidia.yml
@@ -5,6 +5,9 @@ base-image: ghcr.io/ublue-os/silverblue-nvidia
 image-version: latest
 
 modules:
-  - from-file: common/apps.yml
-  - from-file: common/shared-sys.yml
-  - from-file: common/apps-gnome.yml
+  - from-file: common/shared-apps.yml
+  - from-file: common/shared-files.yml
+  - from-file: common/gnome-apps.yml
+  - from-file: common/gnome-files.yml
+  - type: yafti
+  - type: signing
\ No newline at end of file
diff --git a/config/recipe-gnome.yml b/config/recipe-gnome.yml
index af3b490..7305867 100644
--- a/config/recipe-gnome.yml
+++ b/config/recipe-gnome.yml
@@ -5,6 +5,9 @@ base-image: ghcr.io/ublue-os/silverblue-main
 image-version: latest
 
 modules:
-  - from-file: common/apps.yml
-  - from-file: common/shared-sys.yml
-  - from-file: common/apps-gnome.yml
+  - from-file: common/shared-apps.yml
+  - from-file: common/shared-files.yml
+  - from-file: common/gnome-apps.yml
+  - from-file: common/gnome-files.yml
+  - type: yafti
+  - type: signing
\ No newline at end of file
diff --git a/config/recipe-nvidia.yml b/config/recipe-nvidia.yml
index 70ab694..35e17e0 100644
--- a/config/recipe-nvidia.yml
+++ b/config/recipe-nvidia.yml
@@ -5,6 +5,9 @@ base-image: ghcr.io/ublue-os/kinoite-nvidia
 image-version: latest
 
 modules:
-  - from-file: common/apps.yml
-  - from-file: common/shared-sys.yml
-  - from-file: common/apps-plasma.yml
+  - from-file: common/shared-apps.yml
+  - from-file: common/shared-files.yml
+  - from-file: common/plasma-apps.yml
+  - from-file: common/plasma-files.yml
+  - type: yafti
+  - type: signing
\ No newline at end of file
diff --git a/config/recipe.yml b/config/recipe.yml
index 12f5e8c..fd26277 100644
--- a/config/recipe.yml
+++ b/config/recipe.yml
@@ -5,6 +5,9 @@ base-image: ghcr.io/ublue-os/kinoite-main
 image-version: latest
 
 modules:
-  - from-file: common/apps.yml
-  - from-file: common/shared-sys.yml
-  - from-file: common/apps-plasma.yml
+  - from-file: common/shared-apps.yml
+  - from-file: common/shared-files.yml
+  - from-file: common/plasma-apps.yml
+  - from-file: common/plasma-files.yml
+  - type: yafti
+  - type: signing
\ No newline at end of file