diff --git a/machines/kharbranth/hardware.nix b/machines/kharbranth/hardware.nix
index ccbeb92e..0888fd80 100644
--- a/machines/kharbranth/hardware.nix
+++ b/machines/kharbranth/hardware.nix
@@ -68,13 +68,15 @@
   hardware = {
     cpu.intel.updateMicrocode = true;
     enableRedistributableFirmware = true;
-    opengl.enable = true;
-    opengl.extraPackages = with pkgs; [
-      vaapiIntel
-      vaapiVdpau
-      libvdpau-va-gl
-      intel-media-driver
-    ];
+    graphics =  {
+      enable = true;
+      extraPackages = with pkgs; [
+        vaapiIntel
+        vaapiVdpau
+        libvdpau-va-gl
+        intel-media-driver
+      ];
+    };
   };
   services.fstrim.enable = true;
 }
diff --git a/machines/kholinar/hardware.nix b/machines/kholinar/hardware.nix
index 1897a691..8b69cba7 100644
--- a/machines/kholinar/hardware.nix
+++ b/machines/kholinar/hardware.nix
@@ -63,13 +63,15 @@
   hardware = {
     cpu.intel.updateMicrocode = true;
     enableRedistributableFirmware = true;
-    opengl.enable = true;
-    opengl.extraPackages = with pkgs; [
-      vaapiIntel
-      vaapiVdpau
-      libvdpau-va-gl
-      intel-media-driver
-    ];
+    graphics = {
+      enable = true;
+      extraPackages = with pkgs; [
+        vaapiIntel
+        vaapiVdpau
+        libvdpau-va-gl
+        intel-media-driver
+      ];
+    };
   };
   services.fstrim.enable = true;
 }
diff --git a/modules/games/steam/default.nix b/modules/games/steam/default.nix
index 6d3bff03..b28bfdf9 100644
--- a/modules/games/steam/default.nix
+++ b/modules/games/steam/default.nix
@@ -7,8 +7,8 @@
   };
 
   config = lib.mkIf config.chvp.games.steam.enable {
-    hardware.opengl = {
-      driSupport32Bit = true;
+    hardware.graphics = {
+      enable32Bit = true;
       extraPackages = with pkgs.pkgsi686Linux; [ libva ];
     };
     services.pipewire.alsa.support32Bit = true;
diff --git a/modules/games/zeroad/default.nix b/modules/games/zeroad/default.nix
index 99b16dc5..add550fa 100644
--- a/modules/games/zeroad/default.nix
+++ b/modules/games/zeroad/default.nix
@@ -20,7 +20,7 @@
     ];
 
     # Needs to be here, since a headless server probably doesn't have this enabled yet.
-    hardware.opengl.enable = true;
+    hardware.graphics.enable = true;
     home-manager.users.charlotte = { pkgs, ... }: {
       home.packages = [ pkgs.zeroad ];
     };