diff --git a/machines/Dell-Laptop/default.nix b/machines/Dell-Laptop/default.nix
index 1d4e198..8d6efc2 100644
--- a/machines/Dell-Laptop/default.nix
+++ b/machines/Dell-Laptop/default.nix
@@ -25,4 +25,21 @@
   deviceSpecific.isShared = false;
   deviceSpecific.isGaming = true;
   deviceSpecific.enableVirtualisation = false;
+
+  boot.blacklistedKernelModules = [
+    "psmouse"
+  ];
+
+  services.fwupd.enable = true;
+
+  # systemd.services.unbind-usb2 = {
+  #   script = ''
+  #     echo 'usb2' | tee /sys/bus/usb/drivers/usb/unbind
+  #   '';
+  #   wantedBy = [ "multi-user.target" ];
+  # };
+
+  # boot.kernelParams = lib.mkIf (device == "Dell-Laptop") [
+  #   "mem_sleep_default=deep"
+  # ];
 }
diff --git a/modules/boot.nix b/modules/boot.nix
index df1d7ad..3174d97 100644
--- a/modules/boot.nix
+++ b/modules/boot.nix
@@ -12,15 +12,10 @@
 
     supportedFilesystems = [ "ntfs" ];
 
-    blacklistedKernelModules = lib.mkIf (config.device == "Dell-Laptop") [
-      "psmouse"
-    ];
-
-    initrd.kernelModules = if config.deviceSpecific.devInfo.gpu.vendor == "intel" then [ "iHD" ] else [ ];
-
-    # kernelParams = lib.mkIf (device == "Dell-Laptop") [
-    #   "mem_sleep_default=deep"
-    # ];
+    initrd.kernelModules = if config.deviceSpecific.devInfo.gpu.vendor == "intel" then
+      [ "i915" ]
+    else
+      [ ];
 
     extraModprobeConfig = lib.mkIf (config.device == "AMD-Workstation") ''
       options snd slots=snd_virtuoso,snd_usb_audio
diff --git a/modules/overlay.nix b/modules/overlay.nix
index f7cc13a..2d09ac8 100644
--- a/modules/overlay.nix
+++ b/modules/overlay.nix
@@ -22,12 +22,15 @@ in
         bpytop = pkgs.callPackage ./packages/bpytop.nix { };
         ibm-plex-powerline = pkgs.callPackage ./packages/ibm-plex-powerline.nix { };
         bibata-cursors = pkgs.callPackage ./packages/bibata-cursors.nix { };
-        # nix-prefetch-github = old.nix-prefetch-github;
-        # utillinux = old.utillinux;
-        # cifs-utils = old.cifs-utils;
-        # mount = old.mount;
+        # UPDATE
+        vivaldi = super.vivaldi.overrideAttrs (old: rec {
+          version = "3.6.2165.36-1";
+          src = super.fetchurl {
+            url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}_amd64.deb";
+            sha256 = "1wgxzggy5sg98k4lzd34k4hyw2jgc14db41z7s7j3c5whlnifh08";
+          };
+        });
 
-        # vivaldi = old.vivaldi;
         # material-icons = pkgs.callPackage ./packages/material-icons-inline.nix { };
         # rust-stable = pkgs.latest.rustChannels.stable.rust.override {
         #   extensions = [
diff --git a/modules/power.nix b/modules/power.nix
index 498d87c..81fb899 100644
--- a/modules/power.nix
+++ b/modules/power.nix
@@ -22,9 +22,11 @@ with config.deviceSpecific; {
     };
   };
 
-  services.undervolt = lib.mkIf (config.device == "Dell-Laptop") {
-    enable = true;
-    coreOffset = -120;
-    gpuOffset = -54;
-  };
+  # services.undervolt = lib.mkIf (config.device == "Dell-Laptop") {
+  #   enable = true;
+  #   coreOffset = -120;
+  #   gpuOffset = -54;
+  # };
+
+  services.thermald.enable = isLaptop;
 }
diff --git a/modules/services.nix b/modules/services.nix
index 81cd23e..2387ad5 100644
--- a/modules/services.nix
+++ b/modules/services.nix
@@ -37,8 +37,6 @@ with config.deviceSpecific; {
     interval = "weekly";
   };
 
-  services.fwupd.enable = (config.device == "Dell-Laptop");
-
   services.udev.packages = [ pkgs.stlink ];
 
   services.avahi = {