diff --git a/machines/laptop.nix b/machines/laptop.nix
index 3b2d238..b4c81fc 100644
--- a/machines/laptop.nix
+++ b/machines/laptop.nix
@@ -19,7 +19,8 @@
       bluetooth.enable = true;
       power-saving.enable = false;
       pipewire.enable = true;
-      wpa_supplicant.enable = true;
+      networkmanager.enable = true;
+      # wpa_supplicant.enable = true;
     };
 
     # Hardware configuration
diff --git a/modules/base/default.nix b/modules/base/default.nix
index c37be96..9d527f5 100644
--- a/modules/base/default.nix
+++ b/modules/base/default.nix
@@ -61,7 +61,6 @@ in
       neovim.enable = true;
       systemd-boot.enable = true;
       tuigreet.enable = true;
-      networkmanager.enable = true;
     };
 
     # TODO: Remove everything below, it is here out of convenience and should be elsewhere
@@ -82,7 +81,7 @@ in
       "nvidia-settings"
     ];
     nix.settings.experimental-features = "nix-command flakes";
-    networking.useDHCP = true;
+    # networking.useDHCP = true;
     nixpkgs.hostPlatform = "x86_64-linux";
     networking.firewall.allowedTCPPortRanges = [
       {
diff --git a/modules/networkmanager/default.nix b/modules/networkmanager/default.nix
index 317423e..67b619d 100644
--- a/modules/networkmanager/default.nix
+++ b/modules/networkmanager/default.nix
@@ -6,7 +6,7 @@
 
 with lib;
 let
-  cfg = config.modules.power-saving;
+  cfg = config.modules.networkmanager;
 in
 {
   options.modules.networkmanager = {
diff --git a/user-modules/default.nix b/user-modules/default.nix
index 625fdf3..6b643fc 100644
--- a/user-modules/default.nix
+++ b/user-modules/default.nix
@@ -16,6 +16,7 @@
     ./fontconfig/default.nix
     ./gaming/default.nix
     ./git/default.nix
+    ./keyring/default.nix
     ./mako/default.nix
     ./neovim/default.nix
     ./obsidian/default.nix
diff --git a/user-modules/gaming/default.nix b/user-modules/gaming/default.nix
index 4f5ae53..9c36c47 100644
--- a/user-modules/gaming/default.nix
+++ b/user-modules/gaming/default.nix
@@ -2,6 +2,7 @@
 
 {
   imports = [
+    ./emulators/pcsx2.nix
     ./emulators/ryujinx.nix
     ./launchers/es-de.nix
     ./launchers/modrinth.nix
diff --git a/user-modules/gaming/emulators/pcsx2.nix b/user-modules/gaming/emulators/pcsx2.nix
new file mode 100644
index 0000000..2c08d8e
--- /dev/null
+++ b/user-modules/gaming/emulators/pcsx2.nix
@@ -0,0 +1,22 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.pcsx2;
+in
+{
+  options.modules.pcsx2 = {
+    enable = mkEnableOption "pcsx2";
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      pcsx2
+    ];
+  };
+}
diff --git a/user-modules/keyring/default.nix b/user-modules/keyring/default.nix
new file mode 100644
index 0000000..63734fa
--- /dev/null
+++ b/user-modules/keyring/default.nix
@@ -0,0 +1,23 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.keyring;
+in
+{
+  options.modules.keyring = {
+    enable = mkEnableOption "keyring";
+  };
+
+  config = mkIf cfg.enable {
+    # Development packages
+    home.packages = with pkgs; [
+      seahorse
+    ];
+  };
+}
diff --git a/user-modules/systemwide/default.nix b/user-modules/systemwide/default.nix
index 97d1c08..bc88457 100644
--- a/user-modules/systemwide/default.nix
+++ b/user-modules/systemwide/default.nix
@@ -4,6 +4,7 @@
   imports = [
     # Import systemwide configuration files.
     ./docker.nix
+    ./keyring.nix
     ./river.nix
     ./steam.nix
     ./waylock.nix
diff --git a/user-modules/systemwide/keyring.nix b/user-modules/systemwide/keyring.nix
new file mode 100644
index 0000000..dd7b0db
--- /dev/null
+++ b/user-modules/systemwide/keyring.nix
@@ -0,0 +1,18 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  enabled = any (user: user.modules.keyring.enable) (attrValues config.home-manager.users);
+in
+{
+  config = mkIf enabled {
+    services.gnome.gnome-keyring = {
+      enable = true;
+    };
+  };
+}
diff --git a/users/jan.nix b/users/jan.nix
index dee2b88..e6b3fd9 100644
--- a/users/jan.nix
+++ b/users/jan.nix
@@ -23,15 +23,15 @@
     ];
 
     # TODO: Move to gpg module
-    programs.gpg = {
-      enable = true;
-      mutableKeys = true;
-      mutableTrust = true;
-    };
-    services.gpg-agent = {
-      enable = true;
-      enableSshSupport = true;
-    };
+    # programs.gpg = {
+    #   enable = true;
+    #   mutableKeys = true;
+    #   mutableTrust = true;
+    # };
+    # services.gpg-agent = {
+    #   enable = true;
+    #   enableSshSupport = true;
+    # };
 
     # Enabled modules
     modules = {
@@ -66,6 +66,7 @@
       steam.enable = true;
       modrinth.enable = true;
       es-de.enable = true;
+      pcsx2.enable = true;
       ryujinx.enable = true;
 
       # Media
@@ -86,6 +87,7 @@
       obsidian.enable = true;
       zathura.enable = true;
       eduvpn.enable = true;
+      keyring.enable = true;
 
       # Development
       neovim.enable = true;
@@ -122,19 +124,10 @@
         fonts.extraFonts = [ ];
 
         # Color scheme
-        themes.oxocarbon = {
-          enable = false;
-          darkMode = false;
-        };
         themes.catppuccin = {
           enable = true;
           flavor = "mocha";
         };
-        themes.sakura.enable = false;
-        themes.nord = {
-          enable = false;
-          darkMode = true;
-        };
       };
 
     # TODO: Remove everything below, it is here out of convenience and should be elsewhere