diff --git a/flake.nix b/flake.nix
index 957d5723..b5b0aaa8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -60,8 +60,8 @@
       osaka-linode-01  = libx.mkHost { hostname = "osaka-linode-01"; };
       framework-server = libx.mkHost { hostname = "framework-server"; };
       nuc-server       = libx.mkHost { hostname = "nuc-server"; };
-      nixos-desktop    = libx.mkHost { hostname = "nixos-desktop";   unfree = true; desktop = "hyprland"; theme = "gruvbox"; };
-      nixos-framework  = libx.mkHost { hostname = "nixos-framework"; unfree = true; desktop = "hyprland"; theme = "gruvbox"; };
+      nixos-desktop    = libx.mkHost { hostname = "nixos-desktop";   unfree = true; desktop = "hyprland"; theme = "tokyo-night"; };
+      nixos-framework  = libx.mkHost { hostname = "nixos-framework"; unfree = true; desktop = "hyprland"; theme = "sakura-night"; };
       backups-rpi4     = libx.mkHost { hostname = "backups-rpi4"; system = "aarch64-linux"; type = "small"; };
       piaware-rpi4     = libx.mkHost { hostname = "piaware-rpi4"; system = "aarch64-linux"; type = "small"; };
       quitman-rpi4     = libx.mkHost { hostname = "quitman-rpi4"; system = "aarch64-linux"; type = "small"; };
@@ -70,8 +70,8 @@
       "albert@osaka-linode-01"  = libx.mkHome { hostname = "osaka-linode-01"; };
       "albert@framework-server" = libx.mkHome { hostname = "framework-server"; };
       "albert@nuc-server"       = libx.mkHome { hostname = "nuc-server"; };
-      "albert@nixos-desktop"    = libx.mkHome { hostname = "nixos-desktop";   desktop = "hyprland"; theme = "gruvbox"; };
-      "albert@nixos-framework"  = libx.mkHome { hostname = "nixos-framework"; desktop = "hyprland"; theme = "gruvbox"; };
+      "albert@nixos-desktop"    = libx.mkHome { hostname = "nixos-desktop";   desktop = "hyprland"; theme = "tokyo-night"; };
+      "albert@nixos-framework"  = libx.mkHome { hostname = "nixos-framework"; desktop = "hyprland"; theme = "sakura-nightt"; };
       "albert@backups-rpi4"     = libx.mkHome { hostname = "backups-rpi4"; system = "aarch64-linux"; type = "small"; };
       "albert@piaware-rpi4"     = libx.mkHome { hostname = "piaware-rpi4"; system = "aarch64-linux"; type = "small"; };
       "albert@quitman-rpi4"     = libx.mkHome { hostname = "quitman-rpi4"; system = "aarch64-linux"; type = "small"; };
diff --git a/home-manager/common/software/cli/nixvim-base.nix b/home-manager/common/software/cli/nixvim-base.nix
index 49ec7e6d..0907df7b 100644
--- a/home-manager/common/software/cli/nixvim-base.nix
+++ b/home-manager/common/software/cli/nixvim-base.nix
@@ -17,9 +17,10 @@
 
     options = {
       number = true;
+      wrap = false;
       shiftwidth = 2;
       breakindent = true;
-      #  colorcolumn = "100";
+      colorcolumn = "100";
       showmode = false;
     };