diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix
index 6f0823f..682f4b1 100644
--- a/hosts/thinkpad/default.nix
+++ b/hosts/thinkpad/default.nix
@@ -11,9 +11,12 @@
   nixpkgs.overlays = [ outputs.overlays.unstable-packages ];
 
   # Bootloader.
-  boot.loader = {
-    systemd-boot.enable = true;
-    efi.canTouchEfiVariables = true;
+  boot = {
+    kernelPackages = pkgs.linuxPackages_latest;
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
   };
 
   # Define a user account. Don't forget to set a password with 'passwd'.
diff --git a/hosts/thinkpad/home-manager/hyprland/hyprpanel.nix b/hosts/thinkpad/home-manager/hyprland/hyprpanel.nix
index dd6d3c0..68594c8 100644
--- a/hosts/thinkpad/home-manager/hyprland/hyprpanel.nix
+++ b/hosts/thinkpad/home-manager/hyprland/hyprpanel.nix
@@ -4,7 +4,7 @@
 }:
 
 {
-  programs.hyprpanel.layout."bar.layouts"."*".right = lib.mkDefault [
+  programs.hyprpanel.settings.layout."bar.layouts"."*".right = lib.mkDefault [
     "kbinput"
     "volume"
     "network"
diff --git a/hosts/thinkpad/home-manager/hyprland/hyprpaper.nix b/hosts/thinkpad/home-manager/hyprland/hyprpaper.nix
index 267e8e4..75f058a 100644
--- a/hosts/thinkpad/home-manager/hyprland/hyprpaper.nix
+++ b/hosts/thinkpad/home-manager/hyprland/hyprpaper.nix
@@ -7,7 +7,7 @@
 }:
 
 {
-  services.hyprpaper =
+  services.hyprpaper.settings =
     let
       monitor1 = builtins.toString theme.wallpaper.monitor1;
     in
diff --git a/hosts/thinkpad/home-manager/hyprland/settings.nix b/hosts/thinkpad/home-manager/hyprland/settings.nix
index eba45d4..0c5c79a 100644
--- a/hosts/thinkpad/home-manager/hyprland/settings.nix
+++ b/hosts/thinkpad/home-manager/hyprland/settings.nix
@@ -16,8 +16,8 @@
     ];
 
     input = {
-      sensitivity = 0.4; # -1.0 - 1.0, 0 means no modification.
-      touchpad.natural_scroll = true;
+      sensitivity = lib.mkDefault 0.4; # -1.0 - 1.0, 0 means no modification.
+      touchpad.natural_scroll = lib.mkDefault true;
     };
 
     gestures = lib.mkDefault {
diff --git a/hosts/thinkpad/modules/fonts.nix b/hosts/thinkpad/modules/fonts.nix
index c201c85..ad5af82 100644
--- a/hosts/thinkpad/modules/fonts.nix
+++ b/hosts/thinkpad/modules/fonts.nix
@@ -1,15 +1,11 @@
-{ pkgs, ... }:
+{ pkgs, theme, ... }:
 
 {
   environment.systemPackages = with pkgs; [
     font-awesome # Icons
   ];
 
-  fonts =
-    let
-      theme = import ../theme.nix;
-    in
-    {
+  fonts = {
       fontconfig.enable = true;
       packages = with pkgs; [
         (nerdfonts.override { fonts = [ theme.nerdFont ]; })
diff --git a/hosts/thinkpad/modules/networking.nix b/hosts/thinkpad/modules/networking.nix
index 23db0c6..cafa9fc 100644
--- a/hosts/thinkpad/modules/networking.nix
+++ b/hosts/thinkpad/modules/networking.nix
@@ -1,10 +1,9 @@
-let
-  common = import ../common.nix;
-in
+{ hostName, ... }:
+
 {
   networking = {
     networkmanager.enable = true;
-    hostName = common.hostname;
+    inherit hostName;
     # wireless.enable = true;  # Enables wireless support via wpa_supplicant.
   };
 
diff --git a/hosts/thinkpad/modules/sddm.nix b/hosts/thinkpad/modules/sddm.nix
index ea1ef65..f481f12 100644
--- a/hosts/thinkpad/modules/sddm.nix
+++ b/hosts/thinkpad/modules/sddm.nix
@@ -1,6 +1,5 @@
-{ pkgs, ... }:
+{ pkgs, theme, ... }:
 let
-  theme = import ../theme.nix;
   flavor = theme.flavor;
 in
 {
diff --git a/shared/home-manager/hyprland/hyprpanel/default.nix b/shared/home-manager/hyprland/hyprpanel/default.nix
index b0829a8..d8d2637 100644
--- a/shared/home-manager/hyprland/hyprpanel/default.nix
+++ b/shared/home-manager/hyprland/hyprpanel/default.nix
@@ -43,7 +43,7 @@
         network.label = false;
         volume =
           let
-            step = 1;
+            step = "1";
           in
           {
             scrollDown = "${pkgs.hyprpanel}/bin/hyprpanel 'vol -${step}'";
diff --git a/shared/secrets/weather-api-key b/shared/secrets/weather-api-key
index f1b9cc2..cfc8476 100644
Binary files a/shared/secrets/weather-api-key and b/shared/secrets/weather-api-key differ