diff --git a/hosts/wildfire/configuration.nix b/hosts/wildfire/configuration.nix
index 70daaed..37ed97f 100644
--- a/hosts/wildfire/configuration.nix
+++ b/hosts/wildfire/configuration.nix
@@ -13,9 +13,6 @@
     ./hm/hyprpaper.nix
   ];
 
-  # Encrypted drive
-  boot.initrd.luks.devices."luks-1728f038-43a6-4e0d-b7dd-19a4c1083605".device = "/dev/disk/by-uuid/1728f038-43a6-4e0d-b7dd-19a4c1083605";
-
   networking.hostName = "wildfire";
 
   # AMD GPU support
diff --git a/hosts/wildfire/hardware-configuration.nix b/hosts/wildfire/hardware-configuration.nix
index bec5f4d..e8f3746 100644
--- a/hosts/wildfire/hardware-configuration.nix
+++ b/hosts/wildfire/hardware-configuration.nix
@@ -22,7 +22,9 @@
     fsType = "ext4";
   };
 
-  boot.initrd.luks.devices."luks-be9995ed-6b36-4f4d-a374-28a85fc50ed8".device = "/dev/disk/by-uuid/be9995ed-6b36-4f4d-a374-28a85fc50ed8";
+  # Encrypted drive
+  boot.initrd.luks.devices."luks-1728f038-43a6-4e0d-b7dd-19a4c1083605".device = "/dev/disk/by-uuid/1728f038-43a6-4e0d-b7dd-19a4c1083605"; # SWAP partition
+  boot.initrd.luks.devices."luks-be9995ed-6b36-4f4d-a374-28a85fc50ed8".device = "/dev/disk/by-uuid/be9995ed-6b36-4f4d-a374-28a85fc50ed8"; # main partition
 
   fileSystems."/boot" = {
     device = "/dev/disk/by-uuid/B7CE-982B";
diff --git a/modules/common.nix b/modules/common.nix
index d76fee4..e1b352c 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -5,7 +5,9 @@
   pkgs-unstable,
   inputs,
   ...
-}: {
+}: let
+  colors = import ./gruvbox-theme.nix;
+in {
   imports = [
     # Import Home Manager as a NixOS module for user-specific configurations
     inputs.home-manager.nixosModules.home-manager
@@ -65,9 +67,24 @@
   # BOOT CONFIGURATION
   # ================================
   boot = {
-    # Use systemd-boot (modern UEFI bootloader)
-    loader.systemd-boot.enable = true;
-    loader.efi.canTouchEfiVariables = true;
+    loader = {
+      efi = {
+        canTouchEfiVariables = true;
+        efiSysMountPoint = "/boot";
+      };
+      # Use GRUB (modern UEFI bootloader)
+      grub = {
+        enable = true;
+        efiSupport = true;
+        device = "nodev";
+        enableCryptodisk = false; # ← GRUB lives on the unencrypted ESP
+        memtest86.enable = true; # Enable memtest86 for hardware testing
+
+        # Styling
+        backgroundColor = "${colors.gruvbox.bg0}";
+        #splashImage = "";
+      };
+    };
     # Always use the latest kernel for best hardware support
     kernelPackages = pkgs.linuxPackages_latest;
   };