diff --git a/nixos/modules/account.nix b/nixos/modules/account.nix
index 8d8a2ca..35b48ae 100644
--- a/nixos/modules/account.nix
+++ b/nixos/modules/account.nix
@@ -23,7 +23,7 @@
         })
         vesktop
         unstablePkgs.vscode
-        gimp
+        gimp3
         inkscape
         jitsi-meet-electron
         krita
diff --git a/nixos/modules/core-desktop.nix b/nixos/modules/core-desktop.nix
index 0d40ca5..d81ceec 100644
--- a/nixos/modules/core-desktop.nix
+++ b/nixos/modules/core-desktop.nix
@@ -8,7 +8,7 @@
   config = {
     services.printing.enable = true;
 
-    hardware.pulseaudio.enable = false;
+    services.pulseaudio.enable = false;
     security.rtkit.enable = true;
     services.pipewire = {
       enable = true;
@@ -103,7 +103,7 @@
     # Fonts
     fonts.packages = with pkgs; [
       corefonts
-      (nerdfonts.override { fonts = [ "Meslo" ]; })
+      nerd-fonts.meslo-lg
       roboto
     ];
 
diff --git a/nixos/modules/desktopManagers/cosmic.nix b/nixos/modules/desktopManagers/cosmic.nix
index 6dd7bbd..3e623cf 100644
--- a/nixos/modules/desktopManagers/cosmic.nix
+++ b/nixos/modules/desktopManagers/cosmic.nix
@@ -7,19 +7,24 @@
 }:
 
 let
-  cosmic-configuration = pkgs.substituteAllFiles {
+  cosmic-configuration = pkgs.stdenv.mkDerivation {
     name = "cosmic-configuration";
     src = ./cosmic-config;
-    files = [ "." ]; # All files
-    postInstall = ''
-      mkdir -p $share/share/cosmic
-      cp -rt $share/share/cosmic $out/*
-    '';
     outputs = [ "out" "share" ];
-
-    wallpaper = builtins.path { path = "${self}/media/wallpaper.png"; };
-    corner_radii_theme = "2.0";
-    corner_radii_panel = "2";
+    dontConfigure = true;
+    buildPhase = ''
+      for file in $(find . -type f); do
+        substituteInPlace "$file" \
+          --subst-var-by wallpaper "${builtins.path { path = "${self}/media/wallpaper.png"; }}" \
+          --subst-var-by corner_radii_theme "2.0" \
+          --subst-var-by corner_radii_panel "2"
+      done
+    '';
+    installPhase = ''
+      mkdir -p $out $share/share/cosmic
+      cp -r ./* $out/
+      cp -r ./* $share/share/cosmic/
+    '';
   };
 in