diff --git a/modules/core/stylix.nix b/modules/core/stylix.nix
index 45af481..48e231a 100644
--- a/modules/core/stylix.nix
+++ b/modules/core/stylix.nix
@@ -7,6 +7,9 @@
   stylix = {
     enable = true;
     base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
-    targets.console.enable = false;
+    targets = {
+      console.enable = false;
+      grub.enable = false;
+    };
   };
 }
diff --git a/modules/home/gpg.nix b/modules/home/gpg.nix
index 57d5cd1..5c75d91 100644
--- a/modules/home/gpg.nix
+++ b/modules/home/gpg.nix
@@ -1,5 +1,10 @@
 {pkgs, ...}: {
-  programs.gpg.enable = true;
+  programs.gpg = {
+    enable = true;
+    settings = {
+      keyserver = "hkps://keys.openpgp.org";
+    };
+  };
   services.gpg-agent = {
     enable = true;
     enableSshSupport = true;
diff --git a/modules/home/retroarch.nix b/modules/home/retroarch.nix
index 09c2409..4bee7d2 100644
--- a/modules/home/retroarch.nix
+++ b/modules/home/retroarch.nix
@@ -1,12 +1,11 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
-    (retroarch.override {
-      cores = with libretro; [
+    (retroarch.withCores (cores:
+      with cores; [
         fceumm
         gambatte
         mgba
         snes9x
-      ];
-    })
+      ]))
   ];
 }