diff --git a/user/alacritty.nix b/user/alacritty.nix
index 13a84f8..e671d98 100644
--- a/user/alacritty.nix
+++ b/user/alacritty.nix
@@ -1,5 +1,5 @@
 { config, pkgs, lib, ... }:
-let inherit (import ./variables.nix) key theme color accent font;
+let inherit (pkgs.uservars) key theme color accent font;
 in {
   config = {
     programs.alacritty = {
diff --git a/user/bmenu.nix b/user/bmenu.nix
index 155bc29..464abc9 100644
--- a/user/bmenu.nix
+++ b/user/bmenu.nix
@@ -1,5 +1,5 @@
 { config, pkgs, lib, inputs, ... }:
-let inherit (import ./variables.nix) key theme color accent font;
+let inherit (pkgs.uservars) key theme color accent font;
 in {
   # My bemenu wrapper
   xdg.configFile = {
diff --git a/user/firefox.nix b/user/firefox.nix
index c88d73e..7bb2c80 100644
--- a/user/firefox.nix
+++ b/user/firefox.nix
@@ -1,5 +1,5 @@
 { config, pkgs, lib, font, ... }:
-let inherit (import ./variables.nix) desktop browser;
+let inherit (pkgs.uservars) desktop browser;
 in {
   config = {
     programs.firefox = {
diff --git a/user/fish.nix b/user/fish.nix
index 9842b52..5311432 100644
--- a/user/fish.nix
+++ b/user/fish.nix
@@ -1,5 +1,5 @@
 { config, pkgs, lib, ... }:
-let inherit (import ./variables.nix) key theme color accent font;
+let inherit (pkgs.uservars) key theme color accent font;
 in {
   config = {
     programs.fish = {
diff --git a/user/fzf.nix b/user/fzf.nix
index 9264e52..00957ab 100644
--- a/user/fzf.nix
+++ b/user/fzf.nix
@@ -1,6 +1,6 @@
 { config, pkgs, lib, inputs, ... }:
 let
-  inherit (import ./variables.nix) key theme color accent font;
+  inherit (pkgs.uservars) key theme color accent font;
 
   colors = {
     "bg+" = color.bg_light;
diff --git a/user/git.nix b/user/git.nix
index 2776ae6..ae241f0 100644
--- a/user/git.nix
+++ b/user/git.nix
@@ -1,5 +1,5 @@
 { config, pkgs, lib, ... }:
-let inherit (import ./variables.nix) username mail;
+let inherit (pkgs.uservars) username mail;
 in {
   config = {
     programs.git = {
diff --git a/user/helix.nix b/user/helix.nix
index 99958d5..43ab147 100644
--- a/user/helix.nix
+++ b/user/helix.nix
@@ -1,5 +1,5 @@
 { config, pkgs, lib, font, ... }:
-let inherit (import ./variables.nix) key theme color accent font;
+let inherit (pkgs.uservars) key theme color accent font;
 in {
   config = {
     programs.helix = {
diff --git a/user/home.nix b/user/home.nix
index 2c21175..53bda56 100644
--- a/user/home.nix
+++ b/user/home.nix
@@ -1,6 +1,4 @@
-{ config, pkgs, lib, inputs, ... }:
-let inherit (import ./variables.nix) desktop;
-in {
+{ config, pkgs, lib, inputs, ... }: {
   imports = [
     ./controller.nix
     ./waybar.nix
@@ -30,9 +28,10 @@ in {
     ./zathura.nix
     ./man.nix
     ./mpd.nix
+    ./sway.nix
     inputs.hyprland.homeManagerModules.default
     inputs.nix-index-database.hmModules.nix-index
-  ] ++ lib.optional (desktop == "sway") ./sway.nix;
+  ];
 
   # Home Manager needs a bit of information about you and the
   # paths it should manage.
diff --git a/user/kakoune.nix b/user/kakoune.nix
index 8e549ea..afcf7a3 100644
--- a/user/kakoune.nix
+++ b/user/kakoune.nix
@@ -1,5 +1,5 @@
 { config, pkgs, lib, font, ... }:
-let inherit (import ./variables.nix) key theme color accent font dmenu;
+let inherit (pkgs.uservars) key theme color accent font dmenu;
 in {
   config = {
     programs.kakoune = {
diff --git a/user/man.nix b/user/man.nix
index b07f44d..d386e6a 100644
--- a/user/man.nix
+++ b/user/man.nix
@@ -1,5 +1,5 @@
 { config, pkgs, lib, inputs, ... }:
-let inherit (import ./variables.nix) key theme color accent font desktop;
+let inherit (pkgs.uservars) key theme color accent font desktop;
 in {
   config = {
     programs.man = {
diff --git a/user/mangohud.nix b/user/mangohud.nix
index 50aa2f2..0bb1cfc 100644
--- a/user/mangohud.nix
+++ b/user/mangohud.nix
@@ -1,5 +1,5 @@
 { config, pkgs, lib, font, ... }:
-let inherit (import ./variables.nix) key theme color accent font;
+let inherit (pkgs.uservars) key theme color accent font;
 in {
   config = {
     programs.mangohud = {
diff --git a/user/mimeapps.nix b/user/mimeapps.nix
index b7caacf..f2e64ab 100644
--- a/user/mimeapps.nix
+++ b/user/mimeapps.nix
@@ -1,5 +1,5 @@
 { config, pkgs, lib, font, ... }:
-let inherit (import ./variables.nix) browser;
+let inherit (pkgs.uservars) browser;
 in {
   config = {
     xdg.desktopEntries = {
diff --git a/user/rofi.nix b/user/rofi.nix
index 1e9f5a2..5192eea 100644
--- a/user/rofi.nix
+++ b/user/rofi.nix
@@ -1,5 +1,5 @@
 { config, pkgs, lib, font, ... }:
-let inherit (import ./variables.nix) key theme color accent font;
+let inherit (pkgs.uservars) key theme color accent font;
 in {
   config = {
     programs.rofi = {
diff --git a/user/sway.nix b/user/sway.nix
index 02d5885..44ef94d 100644
--- a/user/sway.nix
+++ b/user/sway.nix
@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }:
 let
-  inherit (import ./variables.nix) key theme color accent font;
+  inherit (pkgs.uservars) key theme color accent font;
   color_picker = pkgs.writeShellScript "color_picker" ''
     grim -g "$(slurp -b aabbcc00 -p)" - |
         convert - txt:- |
diff --git a/user/syncthing.nix b/user/syncthing.nix
index d8b3a9b..ff2d4db 100644
--- a/user/syncthing.nix
+++ b/user/syncthing.nix
@@ -1,5 +1,5 @@
 { config, pkgs, lib, inputs, ... }:
-let inherit (import ./variables.nix) key theme color accent font;
+let inherit (pkgs.uservars) key theme color accent font;
 in {
   services.syncthing = {
     enable = true;
diff --git a/user/variables.nix b/user/variables.nix
index ad69b0c..4d6cb82 100644
--- a/user/variables.nix
+++ b/user/variables.nix
@@ -79,6 +79,8 @@ let
   };
 in
 rec {
+  inherit themes;
+
   key = keys.colemak;
 
   theme = themes.dark;
diff --git a/user/waybar.nix b/user/waybar.nix
index c75e84f..58cfb72 100644
--- a/user/waybar.nix
+++ b/user/waybar.nix
@@ -1,5 +1,5 @@
 { config, pkgs, lib, font, ... }:
-let inherit (import ./variables.nix) key theme color accent font;
+let inherit (pkgs.uservars) key theme color accent font;
 in {
   config = {
     programs.waybar = {
diff --git a/user/zathura.nix b/user/zathura.nix
index 61cf1c9..f52d28f 100644
--- a/user/zathura.nix
+++ b/user/zathura.nix
@@ -1,5 +1,5 @@
 { config, pkgs, lib, font, ... }:
-let inherit (import ./variables.nix) key color accent font;
+let inherit (pkgs.uservars) key color accent font;
 in {
   config = {
     programs.zathura.enable = true;