diff --git a/modules/home/packages.nix b/modules/home/packages.nix
index c039254..161c191 100644
--- a/modules/home/packages.nix
+++ b/modules/home/packages.nix
@@ -2,19 +2,6 @@
 {
   home.packages = with pkgs; [
     # Environment shit
-    tesseract
-    yubikey-touch-detector
-    wireguard-tools
-    openresolv
-    xdg-utils
-    killall
-    libnotify
-    openssl
-    pamixer
-    playerctl
-    wl-clipboard
-    cliphist
-    poweralertd
     ffmpeg
     zip
     unzip
@@ -23,16 +10,12 @@
     gcc
     gnumake
     python3
-    nautilus
     qbittorrent
 
     # CLI shit
     imagemagick
-    foot
-    # termpdfpy # shit broke again smfh
     vimv
     pass
-    lm_sensors
     neofetch
     hyfetch
     glow
@@ -54,29 +37,27 @@
     yarn
     cargo
     rustc
-    # wikit
-    # reader
     nmap
-    # speedtest-go
-    powertop
+    speedtest-go
     android-tools
     sshpass
     net-tools
     nmap
     aerc
+    w3m
 
-    aspell
-    aspellDicts.de
-    aspellDicts.nl
-    aspellDicts.uk
+    # aspell
+    # aspellDicts.de
+    # aspellDicts.nl
+    # aspellDicts.uk
 
     # Hunspell dictionaries for spell checking
-    hunspell
-    hunspellDicts.de_DE # German
-    hunspellDicts.en_GB-ise # UK English with -ise spellings
-    hunspellDicts.en_US
-    hunspellDicts.nl_NL # Dutch
-    hunspellDicts.nl_nl # Dutch (alternative)
+    # hunspell
+    # hunspellDicts.de_DE # German
+    # hunspellDicts.en_GB-ise # UK English with -ise spellings
+    # hunspellDicts.en_US
+    # hunspellDicts.nl_NL # Dutch
+    # hunspellDicts.nl_nl # Dutch (alternative)
 
     # Install pip packages
     # python3
@@ -84,12 +65,5 @@
     # (writeShellScriptBin "install-pip-packages" '' # This script does not run, yet.
     #   pip install --user --break-system-packages <package>
     # '')
-
-    # Email/calendar/etc
-    # neomutt
-    w3m
-    # khard
-    # khal
-    # vdirsyncer
   ];
 }
diff --git a/roles/desktop.nix b/roles/desktop.nix
index 23c75df..7ddfc59 100644
--- a/roles/desktop.nix
+++ b/roles/desktop.nix
@@ -22,6 +22,7 @@ in
         home.packages = with pkgs; [
           # Home packages
           swaylock
+          lm_sensors
         ];
       };
     };
@@ -39,7 +40,7 @@ in
       hardware.openrgb = {
         enable = true;
         package = pkgs.openrgb-with-all-plugins;
-        motherboard = "amd";
+        motherboard = "intel";
         server = {
           port = 6742;
           # autoStart = true;
diff --git a/roles/gui.nix b/roles/gui.nix
index 43eebda..006e896 100644
--- a/roles/gui.nix
+++ b/roles/gui.nix
@@ -82,6 +82,21 @@ in
         mpv
         kdePackages.kdeconnect-kde
         libgnome-keyring
+        foot
+        nautilus
+        tesseract
+        yubikey-touch-detector
+        wireguard-tools
+        openresolv
+        xdg-utils
+        killall
+        libnotify
+        openssl
+        pamixer
+        playerctl
+        wl-clipboard
+        cliphist
+        poweralertd
 
         # Gaming
         lunar-client
diff --git a/roles/laptop.nix b/roles/laptop.nix
index f747485..b89c345 100644
--- a/roles/laptop.nix
+++ b/roles/laptop.nix
@@ -25,6 +25,8 @@ in
         home.packages = with pkgs; [
           acpi
           brightnessctl
+          powertop
+          lm_sensors
         ];
       };
     };
diff --git a/roles/server.nix b/roles/server.nix
index 5a81e7d..1133281 100644
--- a/roles/server.nix
+++ b/roles/server.nix
@@ -20,6 +20,7 @@ in
       kitty.terminfo
       foot.terminfo
       powertop
+      lm_sensors
     ];
 
     services = {