diff --git a/home/programs/default.nix b/home/programs/default.nix
index f172296..ea8b060 100644
--- a/home/programs/default.nix
+++ b/home/programs/default.nix
@@ -3,12 +3,15 @@
   imports = [
     ./bitwarden.nix
     ./chromium.nix
+    ./dbeaver.nix
     ./discord.nix
     ./git.nix
     ./github.nix
     ./go.nix
+    ./microsoft-edge.nix
     ./mpv.nix
     ./neovide.nix
+    ./nextcloud.nix
     ./nnn.nix
     ./node.nix
     ./slack.nix
@@ -19,7 +22,6 @@
     ./vscode.nix
     ./whatsapp.nix
     ./zsh.nix
-    ./dbeaver.nix
   ];
 
   programs.fzf = {
@@ -35,10 +37,4 @@
   };
   programs.ripgrep.enable = true;
   programs.htop.enable = true;
-
-  home.packages = with pkgs; [
-    unstable.jellyfin-media-player
-    unstable.microsoft-edge
-    nextcloud-client
-  ];
 }
diff --git a/home/programs/microsoft-edge.nix b/home/programs/microsoft-edge.nix
new file mode 100644
index 0000000..fe5d2d8
--- /dev/null
+++ b/home/programs/microsoft-edge.nix
@@ -0,0 +1,9 @@
+{ config, lib, unstable, ... }:
+let
+  cfg = config.profile.microsoft-edge;
+in
+{
+  config = lib.mkIf cfg.enable {
+    home.packages = [ unstable.microsoft-edge ];
+  };
+}
diff --git a/home/programs/nextcloud.nix b/home/programs/nextcloud.nix
new file mode 100644
index 0000000..585ef6f
--- /dev/null
+++ b/home/programs/nextcloud.nix
@@ -0,0 +1,9 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.profile.nextcloud;
+in
+{
+  config = lib.mkIf cfg.enable {
+    home.packages = [ pkgs.nextcloud-client ];
+  };
+}
diff --git a/options/programs.nix b/options/programs.nix
index de37590..a65e3e0 100644
--- a/options/programs.nix
+++ b/options/programs.nix
@@ -67,5 +67,8 @@
     # For server option, see podman.nix.
     jellyfin.enable = lib.mkEnableOption "jellyfin";
     dbeaver.enable = lib.mkEnableOption "dbeaver";
+
+    microsoft-edge.enable = lib.mkEnableOption "microsoft-edge";
+    nextcloud.enable = lib.mkEnableOption "nextcloud";
   };
 }
diff --git a/profiles/castle.nix b/profiles/castle.nix
index 9f715c4..e76addf 100644
--- a/profiles/castle.nix
+++ b/profiles/castle.nix
@@ -73,5 +73,8 @@ in
     chromium.enable = true;
     bitwarden.enable = true;
     dbeaver.enable = true;
+
+    microsoft-edge.enable = true;
+    nextcloud.enable = true;
   };
 }