diff --git a/users/jordan/atlas.nix b/users/jordan/atlas.nix
new file mode 100644
index 0000000..5cbe984
--- /dev/null
+++ b/users/jordan/atlas.nix
@@ -0,0 +1,16 @@
+{
+  pkgs,
+  ...
+}:
+
+{
+  imports = [
+    ./common/optional/graphical/firefox.nix
+    ./common/optional/graphical/gnome.nix
+  ];
+
+  home.packages = with pkgs; [
+    jellyfin-media-player
+    qbittorrent
+  ];
+}
diff --git a/users/jordan/common/optional/graphical/default.nix b/users/jordan/common/optional/graphical/default.nix
deleted file mode 100644
index c105bf7..0000000
--- a/users/jordan/common/optional/graphical/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  lib,
-  pkgs,
-  osConfig,
-  ...
-}:
-
-{
-  imports =
-    [
-      ./firefox.nix
-      ./thunderbird.nix
-    ]
-    ++ lib.optionals osConfig.modules.system.desktop.gnome.enable [
-      ./gnome.nix
-    ]
-    ++ lib.optionals osConfig.modules.system.desktop.hyprland.enable [
-      ./hyprland
-    ];
-
-  home.packages = with pkgs; [
-    # ardour
-    # audacity
-    # blender
-    # gimp
-    # handbrake
-    # hunspell
-    # hunspellDicts.en-gb-large
-    # hunspellDicts.en-us-large
-    # inkscape
-    jellyfin-media-player
-    # krita
-    # libreoffice
-    # mkvtoolnix
-    # obs-studio
-    qbittorrent
-    # slack
-    # zoom-us
-  ];
-}
diff --git a/users/jordan/common/optional/graphical/libreoffice.nix b/users/jordan/common/optional/graphical/libreoffice.nix
new file mode 100644
index 0000000..cb09b44
--- /dev/null
+++ b/users/jordan/common/optional/graphical/libreoffice.nix
@@ -0,0 +1,13 @@
+{
+  pkgs,
+  ...
+}:
+
+{
+  home.packages = with pkgs; [
+    hunspell
+    hunspellDicts.en-gb-large
+    hunspellDicts.en-us-large
+    libreoffice
+  ];
+}
diff --git a/users/jordan/helios.nix b/users/jordan/helios.nix
new file mode 100644
index 0000000..8847442
--- /dev/null
+++ b/users/jordan/helios.nix
@@ -0,0 +1,15 @@
+{
+  pkgs,
+  ...
+}:
+
+{
+  imports = [
+    ./common/optional/graphical/firefox.nix
+    ./common/optional/graphical/gnome.nix
+  ];
+
+  home.packages = with pkgs; [
+    jellyfin-media-player
+  ];
+}
diff --git a/users/jordan/hypnos.nix b/users/jordan/hypnos.nix
new file mode 100644
index 0000000..9077610
--- /dev/null
+++ b/users/jordan/hypnos.nix
@@ -0,0 +1,15 @@
+{
+  pkgs,
+  ...
+}:
+
+{
+  imports = [
+    ./common/optional/graphical/firefox.nix
+    ./common/optional/graphical/gnome.nix
+  ];
+
+  home.packages = with pkgs; [
+    audacity
+  ];
+}
diff --git a/users/jordan/odyssey.nix b/users/jordan/odyssey.nix
index 0e3a41d..f7cbe06 100644
--- a/users/jordan/odyssey.nix
+++ b/users/jordan/odyssey.nix
@@ -1,11 +1,29 @@
 {
+  pkgs,
   ...
 }:
 
 {
   imports = [
-    ./common/optional/graphical
+    ./common/optional/graphical/firefox.nix
+    ./common/optional/graphical/hyprland
+    ./common/optional/graphical/libreoffice.nix
+    ./common/optional/graphical/thunderbird.nix
   ];
 
   programs.nh.enable = true;
+
+  home.packages = with pkgs; [
+    # ardour
+    audacity
+    blender
+    gimp
+    handbrake
+    inkscape
+    jellyfin-media-player
+    krita
+    mkvtoolnix
+    # obs-studio
+    qbittorrent
+  ];
 }