diff --git a/machines/enka/fuzzel/default.nix b/machines/enka/fuzzel/default.nix
index 33be028..e14c7ec 100644
--- a/machines/enka/fuzzel/default.nix
+++ b/machines/enka/fuzzel/default.nix
@@ -1,8 +1,8 @@
 { upkgs, homeConfiguration, enabled, ... }:
 
 homeConfiguration "nixos" {
-  programs.fuzzel = enabled {
-    settings.main = with upkgs.theme; {
+  programs.fuzzel = with upkgs.theme; enabled {
+    settings.main = {
       dpi-aware  = false;
       font       = "${font.sans.name}:size=${toString font.size.big}";
       icon-theme = icons.name;
@@ -19,7 +19,7 @@ homeConfiguration "nixos" {
       inner-pad      = 10;
     };
 
-    settings.colors = with upkgs.theme; {
+    settings.colors = {
       background     = base00 + "FF";
       text           = base05 + "FF";
       match          = base0A + "FF";
@@ -28,7 +28,7 @@ homeConfiguration "nixos" {
       border         = base0A + "FF";
     };
 
-    settings.border = with upkgs.theme; {
+    settings.border = {
       radius = corner-radius;
       width  = border-width;
     };
diff --git a/machines/enka/kitty/default.nix b/machines/enka/kitty/default.nix
index 2249fac..a71b88e 100644
--- a/machines/enka/kitty/default.nix
+++ b/machines/enka/kitty/default.nix
@@ -1,8 +1,8 @@
 { upkgs, homeConfiguration, enabled, ... }:
 
 homeConfiguration "nixos" {
-  programs.kitty = enabled {
-    font = with upkgs.theme.font; {
+  programs.kitty = with upkgs.theme.withHashtag; enabled {
+    font = with font; {
       inherit (mono) name package;
 
       size = size.normal;
@@ -10,7 +10,7 @@ homeConfiguration "nixos" {
 
     theme = "Gruvbox Dark";
 
-    settings = with upkgs.theme.withHashtag; {
+    settings = {
       allow_remote_control    = true;
       confirm_os_window_close = 0;
       focus_follows_mouse     = true;
diff --git a/machines/enka/waybar/default.nix b/machines/enka/waybar/default.nix
index 190bf4a..0c1ee30 100644
--- a/machines/enka/waybar/default.nix
+++ b/machines/enka/waybar/default.nix
@@ -1,12 +1,12 @@
 { upkgs, homeConfiguration, enabled, ... }:
 
 homeConfiguration "nixos" {
-  programs.waybar = enabled {
+  programs.waybar = with upkgs.theme.withHashtag; enabled {
     systemd = enabled {};
 
     settings = [{
       layer  = "top";
-      height = 2 * upkgs.theme.corner-radius;
+      height = 2 * corner-radius;
 
       margin-right = 10;
       margin-left  = 10;
@@ -121,7 +121,7 @@ homeConfiguration "nixos" {
       };
     }];
 
-    style = with upkgs.theme; with withHashtag; ''
+    style = ''
       * {
         border: none;
         border-radius: ${toString corner-radius}px;