diff --git a/home/modules/baseline.nix b/home/modules/baseline.nix
index cfe2fb4..fd49b9b 100644
--- a/home/modules/baseline.nix
+++ b/home/modules/baseline.nix
@@ -12,5 +12,19 @@ in {
   };
   config = mkIf cfg.enable {
     xdg.enable = true;
+
+    home.packages = with pkgs; [
+      calc
+      file
+      git
+      htop
+      killall
+      man-pages
+      man-pages-posix
+      tree
+      units
+      unzip
+      zip
+    ];
   };
 }
diff --git a/home/modules/browsers.nix b/home/modules/browsers.nix
new file mode 100644
index 0000000..b7996ec
--- /dev/null
+++ b/home/modules/browsers.nix
@@ -0,0 +1,19 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; let
+  cfg = config.local.apps.browsers;
+in {
+  options.local.apps.browsers = {
+    enable = mkEnableOption "Browser home settings";
+  };
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      chromium
+      firefox
+    ];
+  };
+}
diff --git a/home/modules/default.nix b/home/modules/default.nix
index 8b1c228..f5bf6d5 100644
--- a/home/modules/default.nix
+++ b/home/modules/default.nix
@@ -8,5 +8,8 @@
     ./terminal
     ./neovim.nix
     ./baseline.nix
+    ./steam
+    ./yubikey.nix
+    ./browsers.nix
   ];
 }
diff --git a/home/modules/steam/default.nix b/home/modules/steam/default.nix
new file mode 100644
index 0000000..2360e6b
--- /dev/null
+++ b/home/modules/steam/default.nix
@@ -0,0 +1,21 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+with lib; let
+  cfg = config.local.apps.steam;
+in {
+  options.local.apps.steam = {
+    enable = mkEnableOption "Steam settings";
+  };
+  config = mkIf cfg.enable {
+    home.packages = [
+      (pkgs.callPackage ./package.nix {})
+      pkgs.protonup
+      pkgs.winetricks
+      pkgs.protontricks
+    ];
+  };
+}
diff --git a/home/platforms/fabian@posixlycorrect/apps/steam/package.nix b/home/modules/steam/package.nix
similarity index 100%
rename from home/platforms/fabian@posixlycorrect/apps/steam/package.nix
rename to home/modules/steam/package.nix
diff --git a/home/modules/yubikey.nix b/home/modules/yubikey.nix
new file mode 100644
index 0000000..b0b3595
--- /dev/null
+++ b/home/modules/yubikey.nix
@@ -0,0 +1,20 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; let
+  cfg = config.local.apps.yubikey;
+in {
+  options.local.apps.yubikey = {
+    enable = mkEnableOption "Yubikey home settings";
+  };
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      yubikey-manager
+      yubico-pam
+      yubikey-personalization
+    ];
+  };
+}
diff --git a/home/platforms/fabian@posixlycorrect/apps/default.nix b/home/platforms/fabian@posixlycorrect/apps.nix
similarity index 63%
rename from home/platforms/fabian@posixlycorrect/apps/default.nix
rename to home/platforms/fabian@posixlycorrect/apps.nix
index 9b071f6..7acf1d9 100644
--- a/home/platforms/fabian@posixlycorrect/apps/default.nix
+++ b/home/platforms/fabian@posixlycorrect/apps.nix
@@ -4,28 +4,27 @@
   pkgs,
   ...
 }: {
-  imports = [
-    ./steam
-  ];
+  local = {
+    baseline.enable = true;
+    apps = {
+      terminal.enable = true;
+      neovim.enable = true;
+      steam.enable = true;
+      yubikey.enable = true;
+      browsers.enable = true;
+    };
+  };
 
   home.packages = with pkgs; [
-    calc
     calibre
-    chromium
     darktable
     deluge
     discord
-    file
-    firefox
     gcc
     gwenview
-    htop
-    killall
     kdenlive
     libreoffice-fresh
     lutris
-    man-pages
-    man-pages-posix
     mpv
     obs-studio
     openrct2
@@ -36,18 +35,10 @@
     runelite
     spotify
     tdesktop
-    tree
-    units
-    unzip
     usbutils
     virt-manager
-    vlc
     vpsfree-client
     vscodium-fhs
-    yubikey-manager
-    yubico-pam
-    yubikey-personalization
-    zip
     zola
     zoom-us
   ];
diff --git a/home/platforms/fabian@posixlycorrect/apps/steam/default.nix b/home/platforms/fabian@posixlycorrect/apps/steam/default.nix
deleted file mode 100644
index 8ba18b9..0000000
--- a/home/platforms/fabian@posixlycorrect/apps/steam/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-with lib; {
-  home.packages = [
-    (pkgs.callPackage ./package.nix {})
-    pkgs.protonup
-    pkgs.winetricks
-    pkgs.protontricks
-  ];
-}
diff --git a/home/platforms/fabian@posixlycorrect/default.nix b/home/platforms/fabian@posixlycorrect/default.nix
index 0055a83..b24596e 100644
--- a/home/platforms/fabian@posixlycorrect/default.nix
+++ b/home/platforms/fabian@posixlycorrect/default.nix
@@ -6,16 +6,12 @@
   ...
 }: {
   imports = [
-    ./apps
+    ./apps.nix
     ./systemd
     ./gui
     ./isolation.nix
   ];
 
-  local.baseline = true;
-  local.apps.terminal.enable = true;
-  local.apps.neovim.enable = true;
-
   nix.registry = {
     "system".to = {
       type = "path";