diff --git a/hosts/kim/default.nix b/hosts/kim/default.nix
index bae0057..d02df06 100644
--- a/hosts/kim/default.nix
+++ b/hosts/kim/default.nix
@@ -64,9 +64,11 @@ inputs.nixpkgs.lib.nixosSystem {
       services.openssh.enable = true;
       services.flatpak.enable = true;
       # Apps
+      bambu-studio.enable = true;
       discord.enable = true;
       element.enable = true;
       firefox.enable = true;
+      freecad.enable = true;
       kcalc.enable = true;
       kitty.enable = true;
       # netbird.enable = true; See netbird.nix (I can't access the sops stuff from here?)
diff --git a/modules/common/applications/bambu-studio.nix b/modules/common/applications/bambu-studio.nix
deleted file mode 100644
index f16fae1..0000000
--- a/modules/common/applications/bambu-studio.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ config, pkgs, lib, ... }:
-{
-  options = {
-    bambu-studio = {
-      enable = lib.mkEnableOption {
-        description = "Enable Bambu Studio";
-        default = false;
-      };
-    };
-  };
-  config = lib.mkIf (config.gui.enable && config.bambu-studio.enable) {
-    home-manager.users.${config.user} = {
-      home.packages = [
-        pkgs.bambu-studio
-      ];
-    };
-  };
-}
\ No newline at end of file
diff --git a/modules/common/applications/default.nix b/modules/common/applications/default.nix
index dca9540..6a07ce1 100644
--- a/modules/common/applications/default.nix
+++ b/modules/common/applications/default.nix
@@ -4,13 +4,14 @@
     ./discord.nix
     ./element.nix
     ./firefox.nix
+    ./freecad.nix
     ./kcalc.nix
     ./kitty.nix
     ./lutris.nix
     ./netbird.nix
     ./obsidian.nix
     ./openrgb.nix
-    ./prusa-slicer.nix
+    ./slicers.nix
     ./spotifyd.nix
     ./thunderbird.nix
   ];
diff --git a/modules/common/applications/freecad.nix b/modules/common/applications/freecad.nix
new file mode 100644
index 0000000..0ccc4f1
--- /dev/null
+++ b/modules/common/applications/freecad.nix
@@ -0,0 +1,16 @@
+{ config, pkgs, lib, ... }:
+{
+  options = {
+    freecad = {
+      enable = lib.mkEnableOption {
+        description = "Enable FreeCAD";
+        default = false;
+      };
+    };
+  };
+  config = lib.mkIf (config.gui.enable && config.freecad.enable) {
+    environment.systemPackages = [
+      pkgs.freecad
+    ];
+  };
+}
diff --git a/modules/common/applications/slicers.nix b/modules/common/applications/slicers.nix
index c22b92f..48e0a19 100644
--- a/modules/common/applications/slicers.nix
+++ b/modules/common/applications/slicers.nix
@@ -14,18 +14,19 @@
       };
     };
   };
-  config = lib.mkIf (config.gui.enable && config.prusa-slicer.enable) {
-    home-manager.users.${config.user} = {
-      home.packages = [
-        pkgs.prusa-slicer
-      ];
-    };
-  };
-  config = lib.mkIf (config.gui.enable && config.bambu-studio.enable) {
-    home-manager.users.${config.user} = {
-      home.packages = [
-        pkgs.bambu-studio
-      ];
-    };
+  config = lib.mkIf (config.gui.enable) {
+    home-manager.users.${config.user} = lib.mkMerge [
+      {}
+      (lib.mkIf (config.prusa-slicer.enable) {
+        home.packages = [
+          pkgs.prusa-slicer
+        ];
+      })
+      (lib.mkIf (config.bambu-studio.enable) {
+        home.packages = [
+          pkgs.bambu-studio
+        ];
+      })
+    ];
   };
 }