diff --git a/nixos/hosts/Eclipse/configuration.nix b/nixos/hosts/Eclipse/configuration.nix
index 554f432..19fe6ce 100644
--- a/nixos/hosts/Eclipse/configuration.nix
+++ b/nixos/hosts/Eclipse/configuration.nix
@@ -2,6 +2,7 @@
   imports = [
     ./hardware-configuration.nix
     ./secrets/secrets.nix
+    ./modules/grub.nix
     ../../packages.nix
     ../../modules/bundle.nix
     ../../modules/gamemode.nix
diff --git a/nixos/hosts/Eclipse/modules/grub.nix b/nixos/hosts/Eclipse/modules/grub.nix
new file mode 100644
index 0000000..0ad09e8
--- /dev/null
+++ b/nixos/hosts/Eclipse/modules/grub.nix
@@ -0,0 +1,13 @@
+{ pkgs, ... }: let
+   theme = pkgs.fetchFromGitHub {
+    owner = "OliveThePuffin";
+    repo = "yorha-grub-theme";
+    rev = "4d9cd37baf56c4f5510cc4ff61be278f11077c81";
+    hash = "sha256-XVzYDwJM7Q9DvdF4ZOqayjiYpasUeMhAWWcXtnhJ0WQ=";
+   };
+in {
+  boot.loader.grub = {
+    gfxmodeEfi = "1920x1080";
+    theme = "${theme}/yorha-1920x1080";
+  };
+}
diff --git a/nixos/hosts/Rias/configuration.nix b/nixos/hosts/Rias/configuration.nix
index 39a3025..2eb2e5b 100644
--- a/nixos/hosts/Rias/configuration.nix
+++ b/nixos/hosts/Rias/configuration.nix
@@ -2,6 +2,7 @@
   imports = [
     ./hardware-configuration.nix
     ./secrets/secrets.nix
+    ./modules/grub.nix
     ../../packages.nix
     ../../modules/bundle.nix
     ../../modules/adb.nix
diff --git a/nixos/hosts/Rias/modules/grub.nix b/nixos/hosts/Rias/modules/grub.nix
new file mode 100644
index 0000000..6ddc7fe
--- /dev/null
+++ b/nixos/hosts/Rias/modules/grub.nix
@@ -0,0 +1,13 @@
+{ pkgs, ... }: let
+   theme = pkgs.fetchFromGitHub {
+    owner = "OliveThePuffin";
+    repo = "yorha-grub-theme";
+    rev = "4d9cd37baf56c4f5510cc4ff61be278f11077c81";
+    hash = "sha256-XVzYDwJM7Q9DvdF4ZOqayjiYpasUeMhAWWcXtnhJ0WQ=";
+   };
+in {
+  boot.loader.grub = {
+    gfxmodeEfi = "3440x1440";
+    theme = "${theme}/yorha-2560x1440";
+  };
+}
diff --git a/nixos/modules/bootloader.nix b/nixos/modules/bootloader.nix
index 7bd2677..ac6cf66 100644
--- a/nixos/modules/bootloader.nix
+++ b/nixos/modules/bootloader.nix
@@ -2,21 +2,29 @@
   boot = {
     loader = {
       timeout = 3;
-      systemd-boot.enable = true;
-      efi.canTouchEfiVariables = true;
-    };
-    initrd = {
-      verbose = false;
-      # systemd.enable = true;
+      # systemd-boot.enable = true;
+      efi.efiSysMountPoint = "/boot";
+      
+       grub = {
+        enable = true;
+        efiSupport = true;
+        efiInstallAsRemovable = true;
+        device = "nodev";
+      };
+      # efi.canTouchEfiVariables = true;
     };
+    # initrd = {
+    #   verbose = false;
+    #   # systemd.enable = true;
+    # };
     consoleLogLevel = 0;
     kernelParams = [
-      "quiet"
+      # "quiet"
       "splash"
       "boot.shell_on_fail"
       "loglevel=3"
-      "rd.systemd.show_status=false"
-      "rd.udev.log_level=3"
+      # "rd.systemd.show_status=false"
+      # "rd.udev.log_level=3"
       "udev.log_priority=0"
     ];
     plymouth = {