diff --git a/home/gwen/grovetender.nix b/home/gwen/grovetender.nix
index 17c2e4fc..7c9de080 100644
--- a/home/gwen/grovetender.nix
+++ b/home/gwen/grovetender.nix
@@ -1,6 +1,6 @@
 { inputs, pkgs, ... }:
 {
-  theme = "paradise";
+  theme = "mountain";
 
   imports = [
     inputs.stylix.homeManagerModules.stylix
diff --git a/hosts/grovetender/hardware-configuration.nix b/hosts/grovetender/hardware-configuration.nix
index 4a31a977..eb775dc2 100644
--- a/hosts/grovetender/hardware-configuration.nix
+++ b/hosts/grovetender/hardware-configuration.nix
@@ -1,28 +1,42 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+  boot.initrd.availableKernelModules = [
+    "nvme"
+    "xhci_pci"
+    "usb_storage"
+    "sd_mod"
+    "rtsx_pci_sdmmc"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/04623ded-95b5-4310-ae4b-88e773a69a5a";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/04623ded-95b5-4310-ae4b-88e773a69a5a";
+    fsType = "ext4";
+  };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/FBCD-9A49";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/FBCD-9A49";
+    fsType = "vfat";
+    options = [
+      "fmask=0077"
+      "dmask=0077"
+    ];
+  };
 
   swapDevices = [ ];
 
diff --git a/modules/home/core/style/tokyonight.yaml b/modules/home/core/style/tokyonight.yaml
index 143fc69d..dab79414 100644
--- a/modules/home/core/style/tokyonight.yaml
+++ b/modules/home/core/style/tokyonight.yaml
@@ -1,18 +1,18 @@
 scheme: 'Tokyonight'
 author: 'Folke Lemaitre (https://github.com/folke)'
 base00: '1A1B26'
-base01: '3b4261'
-base02: '3b4261'
-base03: '545c7e'
-base04: '565c64'
-base05: 'a9b1d6'
-base06: 'bbc5f0'
-base07: 'c0caf5'
-base08: 'f7768e'
-base09: 'ff9e64'
-base0A: 'e0af68'
-base0B: '9ece6a'
-base0C: '2ac3de'
-base0D: '7aa2f7'
-base0E: '9d7cd8'
-base0F: '9abdf5'
+base01: '16161E'
+base02: '2F3549'
+base03: '444B6A'
+base04: '787C99'
+base05: 'A9B1D6'
+base06: 'CBCCD1'
+base07: 'D5D6DB'
+base08: 'C0CAF5'
+base09: 'A9B1D6'
+base0A: '0DB9D7'
+base0B: '9ECE6A'
+base0C: 'B4F9F8'
+base0D: '2AC3DE'
+base0E: 'BB9AF7'
+base0F: 'F7768E'
diff --git a/modules/home/opt/bin/default.nix b/modules/home/opt/bin/default.nix
index 4d45e540..e8b78e29 100644
--- a/modules/home/opt/bin/default.nix
+++ b/modules/home/opt/bin/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, ... }:
 {
   home = {
     file = {
diff --git a/modules/home/opt/nvim/nixvim.nix b/modules/home/opt/nvim/nixvim.nix
index 273dedc0..c8f5af4b 100644
--- a/modules/home/opt/nvim/nixvim.nix
+++ b/modules/home/opt/nvim/nixvim.nix
@@ -8,6 +8,7 @@ let
   nixvim' = inputs.nixvim.packages."x86_64-linux".default;
   nixvim = nixvim'.extend {
     config = {
+      theme = lib.mkForce "${config.theme}";
       colorschemes.base16 = {
         colorscheme = lib.mkForce {
           inherit (config.lib.stylix.colors.withHashtag)
@@ -33,7 +34,8 @@ let
       };
       plugins.obsidian.enable = lib.mkForce true;
       plugins.indent-blankline.enable = lib.mkForce false;
-      assistant = "copilot";
+      assistant = "
+        copilot ";
     };
   };
 in
diff --git a/modules/nixos/opt/pkgs.nix b/modules/nixos/opt/pkgs.nix
index 697d5474..1b9c77d1 100644
--- a/modules/nixos/opt/pkgs.nix
+++ b/modules/nixos/opt/pkgs.nix
@@ -43,7 +43,6 @@
     xdg-utils
     yaml-language-server
     yq
-    wshowkeys
   ];
   nixpkgs.config = {
     allowUnfree = true;
diff --git a/modules/nixos/opt/programs/default.nix b/modules/nixos/opt/programs/default.nix
index db31568b..44e2d645 100644
--- a/modules/nixos/opt/programs/default.nix
+++ b/modules/nixos/opt/programs/default.nix
@@ -11,6 +11,7 @@
     };
     zsh.enable = true;
     dconf.enable = true;
+    wshowkeys.enable = true;
   };
   imports = [ ./steam.nix ];
 }