diff --git a/files/scripts/install-cosmic-comp.sh b/files/scripts/install-cosmic-comp.sh
new file mode 100644
index 0000000..109df56
--- /dev/null
+++ b/files/scripts/install-cosmic-comp.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+apt-get update && apt-get install -y git libudev-dev libseat-dev libxkbcommon-dev libinput-dev libgbm-dev
+
+mkdir -p /src/
+cd /src/
+
+git clone https://github.com/pop-os/cosmic-comp.git
+cd cosmic-comp
+
+make vendor
+make all DEBUG=1 VENDOR=1
+
+mkdir -p /out/
+mv target/debug/cosmic-comp /out/cosmic-comp
diff --git a/recipes/common/cosmic-comp.yml b/recipes/common/cosmic-comp.yml
new file mode 100644
index 0000000..895904d
--- /dev/null
+++ b/recipes/common/cosmic-comp.yml
@@ -0,0 +1,14 @@
+---
+# yaml-language-server: $schema=https://schema.blue-build.org/module-stage-list-v1.json
+stages:
+  - name: cosmic-comp
+    from: rust
+    modules:
+      - type: script
+        scripts:
+          - install-cosmic-comp.sh
+modules:
+  - type: copy
+    from: cosmic-comp
+    src: /out/cosmic-comp
+    dest: /usr/bin/cosmic-comp
diff --git a/recipes/common/gaming.yml b/recipes/common/gaming.yml
index d7fab39..c5acf31 100644
--- a/recipes/common/gaming.yml
+++ b/recipes/common/gaming.yml
@@ -5,13 +5,13 @@ modules:
     files:
       - source: steam-firewall
         destination: /
-  - type: bling
-    source: ghcr.io/blue-build/modules/bling:343-featbling-add-rpmfusion-install-script
-    install:
-      - negativo17
-  - type: script
-    scripts:
-      - install-steam.sh
+  # - type: bling
+  #   source: ghcr.io/blue-build/modules/bling:343-featbling-add-rpmfusion-install-script
+  #   install:
+  #     - negativo17
+  # - type: script
+  #   scripts:
+  #     - install-steam.sh
   - type: rpm-ostree
     # There's a bug preventing me from doing a separate optfix call
     # https://github.com/blue-build/modules/issues/365
diff --git a/recipes/common/jp-common.yml b/recipes/common/jp-common.yml
index bef7eb5..d18611c 100644
--- a/recipes/common/jp-common.yml
+++ b/recipes/common/jp-common.yml
@@ -1,3 +1,5 @@
+---
+# yaml-language-server: $schema=https://schema.blue-build.org/module-list-v1.json
 modules:
   - from-file: common/common.yml
   - from-file: common/pipewire-tweaks.yml
diff --git a/recipes/common/jp-desktop.yml b/recipes/common/jp-desktop.yml
index 1d713f4..8b8b5b1 100644
--- a/recipes/common/jp-desktop.yml
+++ b/recipes/common/jp-desktop.yml
@@ -1,3 +1,5 @@
+---
+# yaml-language-server: $schema=https://schema.blue-build.org/module-list-v1.json
 modules:
   - type: files
     files:
diff --git a/recipes/jp-desktop-nvidia.yml b/recipes/jp-desktop-nvidia.yml
index 3e5a4c8..427e4e0 100644
--- a/recipes/jp-desktop-nvidia.yml
+++ b/recipes/jp-desktop-nvidia.yml
@@ -1,12 +1,15 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: jp-desktop-nvidia
-base-image: ghcr.io/ublue-os/kinoite-nvidia
+# base-image: ghcr.io/ublue-os/kinoite-nvidia
+base-image: ghcr.io/ublue-os/bazzite-nvidia
 image-version: 41
 description: The image of Wunker OS for JP's desktop gaming.
 stages:
   - from-file: common/helix.yml
+  - from-file: common/cosmic-comp.yml
 modules:
   - from-file: common/jp-desktop.yml
   - from-file: common/cosmic.yml
   - from-file: common/helix.yml
+  - from-file: common/cosmic-comp.yml
diff --git a/recipes/jp-laptop.yml b/recipes/jp-laptop.yml
index d1bc36a..f3d3f7f 100644
--- a/recipes/jp-laptop.yml
+++ b/recipes/jp-laptop.yml
@@ -1,7 +1,8 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: jp-laptop
-base-image: ghcr.io/ublue-os/kinoite-main
+# base-image: ghcr.io/ublue-os/kinoite-main
+base-image: ghcr.io/ublue-os/bazzite
 image-version: 40
 description: The image of Wunker OS for JP's Laptop.
 stages: