diff --git a/users/elise/home/gui/default.nix b/users/elise/home/gui/default.nix
index bf91b73..774f44a 100644
--- a/users/elise/home/gui/default.nix
+++ b/users/elise/home/gui/default.nix
@@ -1,16 +1,16 @@
-{ pkgs, ... }:
+{ inputs, pkgs, ... }:
 {
   imports = [
-    ./vscode
+    "${inputs.self}/users/shared/comms.nix"
+    "${inputs.self}/users/shared/games.nix"
+    "${inputs.self}/users/shared/sweet.nix"
     ./kitty.nix
+    ./vscode
   ];
 
   home.packages = with pkgs; [
-    candy-icons
     obs-studio
     obsidian
-    sweet-nova
-    util-linux
     vlc
     # graphics tools
     gimp3
@@ -18,18 +18,8 @@
     # browser
     chromium
     firefox
-    # communication
-    discord-canary
-    signal-desktop
-    zoom-us
     # 3d modeling
     blender
     prusa-slicer
-    # games
-    dwarf-fortress
-    endless-sky
-    osu-lazer
-    prismlauncher
-    tower-pixel-dungeon
   ];
 }
diff --git a/users/richie/home/gui/default.nix b/users/richie/home/gui/default.nix
index 8f02d7a..836116e 100644
--- a/users/richie/home/gui/default.nix
+++ b/users/richie/home/gui/default.nix
@@ -1,27 +1,24 @@
-{ pkgs, ... }:
+{ inputs, pkgs, ... }:
 {
   imports = [
+    "${inputs.self}/users/shared/comms.nix"
+    "${inputs.self}/users/shared/games.nix"
+    "${inputs.self}/users/shared/sweet.nix"
     ./firefox
-    ./vscode
     ./kitty.nix
+    ./vscode
   ];
 
   home.packages = with pkgs; [
-    candy-icons
-    chromium
     gimp
     mediainfo
     obs-studio
     obsidian
     prismlauncher
     prusa-slicer
-    sweet-nova
-    util-linux
     vlc
-    # comms
-    discord-canary
-    signal-desktop
-    zoom-us
+    # browser
+    chromium
     # dev tools
     claude-code
     gparted
@@ -29,9 +26,5 @@
     antigravity-fhs
     proxychains
     opencode
-    # games
-    dwarf-fortress
-    tower-pixel-dungeon
-    endless-sky
   ];
 }
diff --git a/users/shared/comms.nix b/users/shared/comms.nix
new file mode 100644
index 0000000..88e606d
--- /dev/null
+++ b/users/shared/comms.nix
@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    discord-canary
+    signal-desktop
+    zoom-us
+  ];
+}
diff --git a/users/shared/games.nix b/users/shared/games.nix
new file mode 100644
index 0000000..853a372
--- /dev/null
+++ b/users/shared/games.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    dolphin-emu
+    dwarf-fortress
+    endless-sky
+    retroarch
+    ryubing
+    tower-pixel-dungeon
+  ];
+}
diff --git a/users/shared/sweet.nix b/users/shared/sweet.nix
new file mode 100644
index 0000000..e81ad65
--- /dev/null
+++ b/users/shared/sweet.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    sweet-nova
+    candy-icons
+  ];
+}