diff --git a/configurations/home/toph@endurance/niri/autostart.nix b/configurations/home/toph@endurance/niri/autostart.nix
index c018a6f..cf3cd81 100644
--- a/configurations/home/toph@endurance/niri/autostart.nix
+++ b/configurations/home/toph@endurance/niri/autostart.nix
@@ -2,9 +2,9 @@
   programs.niri.settings.spawn-at-startup = [
     # this is a funny fix for xdg environment not properly being set and thus
     # xdg-open not working properly
-    {argv = ["systemctl --user restart xdg-desktop-portal"];}
+    {argv = ["sleep" "5;" "systemctl" "--user" "restart" "xdg-desktop-portal"];}
 
     # open fastfetch by default
-    {argv = ["kitty --title 'fastfetch' sh -c 'fastfetch; read'"];}
+    {argv = ["kitty" "--title" "'fastfetch'" "sh" "-c" "'fastfetch; read'"];}
   ];
 }
diff --git a/configurations/home/toph@endurance/niri/keybinds.nix b/configurations/home/toph@endurance/niri/keybinds.nix
index 6b2c62d..d4d89e8 100644
--- a/configurations/home/toph@endurance/niri/keybinds.nix
+++ b/configurations/home/toph@endurance/niri/keybinds.nix
@@ -10,7 +10,7 @@
       "Mod+space".action = spawn "fuzzel";
       "Mod+e".action = spawn "dolphin";
       "Mod+d".action = spawn "zeal"; # Documentation viewer
-      "Mod+c".action = spawn "${"spawn-term"}/bin/spawn-term";
+      "Mod+c".action = spawn "${pkgs.harbor.spawn-term}/bin/spawn-term";
       "Mod+g".action = spawn "${pkgs.harbor.hg-picker}/bin/hg-picker";
 
       "Mod+q".action = close-window;
diff --git a/configurations/home/toph@endurance/niri/shell.nix b/configurations/home/toph@endurance/niri/shell.nix
index 7797070..e63d3d9 100644
--- a/configurations/home/toph@endurance/niri/shell.nix
+++ b/configurations/home/toph@endurance/niri/shell.nix
@@ -52,7 +52,7 @@
         wallpaper = {
           enabled = true;
           overviewEnabled = false;
-          directory = "/nix/elements/fixtures/wallpapers";
+          directory = "/nix/harbor/desktops/configurations/home/toph@endurance/wallpapers";
           recursiveSearch = false;
           randomEnabled = true;
         };
diff --git a/configurations/home/toph@endurance/niri/window-rules.nix b/configurations/home/toph@endurance/niri/window-rules.nix
index 87dee0e..6d15ab4 100644
--- a/configurations/home/toph@endurance/niri/window-rules.nix
+++ b/configurations/home/toph@endurance/niri/window-rules.nix
@@ -45,10 +45,10 @@ in {
         open-floating = true;
         opacity = 1.0;
 
-        min-width = 400; # 115 x 26 columns
-        max-width = 400;
-        min-height = 400;
-        max-height = 400;
+        min-width = 800; # 115 x 26 columns
+        max-width = 800;
+        min-height = 800;
+        max-height = 800;
       }
       {
         matches = [{title = "ld.toph.so";}];
diff --git a/configurations/home/toph@endurance/stylix.nix b/configurations/home/toph@endurance/stylix.nix
index 1b378cc..26e0da8 100644
--- a/configurations/home/toph@endurance/stylix.nix
+++ b/configurations/home/toph@endurance/stylix.nix
@@ -15,7 +15,7 @@
     autoEnable = true;
 
     # TODO: Figure out a way for automatic dark-/light-mode switching
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine-moon.yaml";
+    base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine-dawn.yaml";
 
     targets.firefox.profileNames = ["default" "work" "streaming"];
 
diff --git a/configurations/nixos/endurance/hardware.nix b/configurations/nixos/endurance/hardware.nix
index 663ddc5..45806f4 100644
--- a/configurations/nixos/endurance/hardware.nix
+++ b/configurations/nixos/endurance/hardware.nix
@@ -34,7 +34,7 @@
     host = 10.3.0.1
     port = 7319
     user = christopher
-    key_file = /home/christopher/.ssh/id_ethnuc
+    key_file = /home/toph/.ssh/id_ethnuc
   '';
 
   fileSystems."/mnt/beryllium" = {
diff --git a/modules/nixos/services/lnxlink.nix b/modules/nixos/services/lnxlink.nix
index 7422766..55bc36a 100644
--- a/modules/nixos/services/lnxlink.nix
+++ b/modules/nixos/services/lnxlink.nix
@@ -1,45 +1,11 @@
 {
-  pkgs,
   config,
+  pkgs,
   lib,
-  inputs,
   ...
 }:
 with lib; let
   cfg = config.services.lnxlink;
-
-  lnxlink = pkgs.python3Packages.buildPythonApplication {
-    pname = "lnxlink";
-    version = "2025.7.0";
-    pyproject = true;
-
-    # Linking my fork here which allows for newer versions of setuptools and wheel.
-    # Also includes some fixes that make the program actually work with NixOS.
-    src = pkgs.fetchFromGitHub {
-      owner = "padarom";
-      repo = "lnxlink";
-      rev = "7202e48";
-      hash = "sha256-E2J1d9D5SJWGEutAPAo1BM98cMzH7QrqIz3yrlXpzGE=";
-    };
-
-    build-system = with pkgs.python3Packages; [setuptools wheel];
-    dependencies = with pkgs.python3Packages; [
-      distro
-      pyyaml
-      paho-mqtt
-      requests
-      psutil
-      inotify
-      jeepney
-    ];
-
-    meta = {
-      homepage = "https://github.com/bkbilly/lnxlink";
-      description = "Effortlessly manage your Linux machine using MQTT.";
-      license = licenses.mit;
-      mainProgram = "lnxlink";
-    };
-  };
 in {
   options.services = {
     lnxlink = {
@@ -48,8 +14,6 @@ in {
   };
 
   config = mkIf cfg.enable {
-    environment.systemPackages = [lnxlink];
-
     systemd.services.lnxlink = {
       enable = true;
       wantedBy = ["multi-user.target"];
@@ -57,7 +21,7 @@ in {
         # Note: Logging will also be done to the working directory, so logs will
         # be lost upon a restart.
         WorkingDirectory = "/tmp";
-        ExecStart = "${lnxlink}/bin/lnxlink -i -c ${./lnxlink.yaml}";
+        ExecStart = "${pkgs.harbor.lnxlink}/bin/lnxlink -i -c ${./lnxlink.yaml}";
       };
     };
   };
diff --git a/packages/lnxlink/package.nix b/packages/lnxlink/package.nix
new file mode 100644
index 0000000..31fd72a
--- /dev/null
+++ b/packages/lnxlink/package.nix
@@ -0,0 +1,37 @@
+{
+  pkgs,
+  lib,
+  ...
+}:
+pkgs.python3Packages.buildPythonApplication {
+  pname = "lnxlink";
+  version = "2025.7.0";
+  pyproject = true;
+
+  # Linking my fork here which allows for newer versions of setuptools and wheel.
+  # Also includes some fixes that make the program actually work with NixOS.
+  src = pkgs.fetchFromGitHub {
+    owner = "padarom";
+    repo = "lnxlink";
+    rev = "7202e48";
+    hash = "sha256-E2J1d9D5SJWGEutAPAo1BM98cMzH7QrqIz3yrlXpzGE=";
+  };
+
+  build-system = with pkgs.python3Packages; [setuptools wheel];
+  dependencies = with pkgs.python3Packages; [
+    distro
+    pyyaml
+    paho-mqtt
+    requests
+    psutil
+    inotify
+    jeepney
+  ];
+
+  meta = {
+    homepage = "https://github.com/bkbilly/lnxlink";
+    description = "Effortlessly manage your Linux machine using MQTT.";
+    license = lib.licenses.mit;
+    mainProgram = "lnxlink";
+  };
+}