diff --git a/flake.lock b/flake.lock
old mode 100644
new mode 100755
diff --git a/flake.nix b/flake.nix
index 38a0d77..4978ba6 100755
--- a/flake.nix
+++ b/flake.nix
@@ -20,6 +20,8 @@
         ./users/jsutter.nix
         ./modules/plasma.nix
         ./modules/dev.nix
+        ./modules/office.nix
+        ./modules/gaming.nix
         ];
       };
       aurora = nixpkgs.lib.nixosSystem {
diff --git a/modules/gaming.nix b/modules/gaming.nix
new file mode 100755
index 0000000..f71a5dd
--- /dev/null
+++ b/modules/gaming.nix
@@ -0,0 +1,17 @@
+{ config, pkgs, ... }:
+
+{
+
+environment.systemPackages = with pkgs; [
+  parsec
+  bottles
+  ];
+
+  # Steam
+  programs.steam = with pkgs; {
+    enable = true;
+    remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
+    dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
+  };
+
+}
diff --git a/modules/office.nix b/modules/office.nix
new file mode 100755
index 0000000..5c42428
--- /dev/null
+++ b/modules/office.nix
@@ -0,0 +1,11 @@
+{ config, pkgs, ... }:
+
+{
+
+environment.systemPackages = with pkgs; [
+  libreoffice-qt
+  gimp
+  calibre
+  vmware-horizon-client
+  ];
+}
diff --git a/users/aksutter.nix b/users/aksutter.nix
old mode 100644
new mode 100755
diff --git a/users/jsutter.nix b/users/jsutter.nix
index bbd33eb..1dddb13 100755
--- a/users/jsutter.nix
+++ b/users/jsutter.nix
@@ -27,13 +27,8 @@ in
     hashedPassword = "$6$tvkhGd24G6pVOsWr$j8ZAqSnXPTGwMGmIulU5Puzqd4iKdu8eAMSFis/cPqTW6u2xGQMqPHH1W9IZwKSL6.nS7Jc/NR2VwpPosyXDH/";
     openssh.authorizedKeys.keys  = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBNVUh+RrcOSMRV6qysnsdPs5AyK8dSm4QhhnwgpikyI jsutter@symbiotrip.com" ];
     packages = with pkgs; [
-      firefox
-      git
       tor-browser-bundle-bin
-      nextcloud-client
       vlc
-      steam
-      vmware-horizon-client
       kleopatra
       pinentry
       arc-theme
@@ -41,22 +36,11 @@ in
       slack
       direnv
       appimage-run
-      libreoffice-qt
       deluge
       signal-desktop
-      bottles
-      calibre
-      gimp
     ];
   };
 
-  # Steam
-  programs.steam = with pkgs; {
-    enable = true;
-    remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
-    dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
-  };
-
   # Android Dev
   programs.adb.enable = true;
 
diff --git a/users/openvpn/mgmt-dr1-fw01-UDP4-1194-jsutter-config.ovpn b/users/openvpn/mgmt-dr1-fw01-UDP4-1194-jsutter-config.ovpn
old mode 100644
new mode 100755
diff --git a/users/openvpn/mgmt-sfo-fw01-UDP4-1194-jsutter-config.ovpn b/users/openvpn/mgmt-sfo-fw01-UDP4-1194-jsutter-config.ovpn
old mode 100644
new mode 100755