diff --git a/flake.lock b/flake.lock
index f8b8d72..9e476cc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -164,11 +164,11 @@
     },
     "themes": {
       "locked": {
-        "lastModified": 1701030543,
-        "narHash": "sha256-wjGW7Zkzw3L/jBfg7pI7yzO5aVFspwUiZjByXftctlc=",
+        "lastModified": 1701157732,
+        "narHash": "sha256-q1EWrb1PLWEloHVKk4rl8wC2uTsiQxuhsok1sI3xBJw=",
         "owner": "RGBCube",
         "repo": "ThemeNix",
-        "rev": "75f65de9384a0b3698e4cfa537a5f843a604cda6",
+        "rev": "f51353fe8a47059e8019058ffc64c5dd4f60e662",
         "type": "github"
       },
       "original": {
diff --git a/machines/enka/bat/default.nix b/machines/enka/bat/default.nix
index 4e1b645..4be36cd 100644
--- a/machines/enka/bat/default.nix
+++ b/machines/enka/bat/default.nix
@@ -12,7 +12,7 @@ homeConfiguration [ "nixos" "root" ] {
   };
 
   programs.bat = with upkgs.theme; enabled {
-    config.theme   = slug;
-    themes.${slug} = tmTheme;
+    config.theme   = "default";
+    themes.default = tmTheme;
   };
 }
diff --git a/machines/enka/dunst/default.nix b/machines/enka/dunst/default.nix
index 7b4a4ca..80f07fe 100644
--- a/machines/enka/dunst/default.nix
+++ b/machines/enka/dunst/default.nix
@@ -17,8 +17,8 @@ homeConfiguration "nixos" {
       frame_width     = 2;
       seperator_color = "frame";
 
-      background = background;
-      foreground = lightForeground;
+      background = base00;
+      foreground = base05;
 
       alignment = "center";
       font      = "OpenSans 12";
diff --git a/machines/enka/fuzzel/default.nix b/machines/enka/fuzzel/default.nix
index 60c9585..ad9917e 100644
--- a/machines/enka/fuzzel/default.nix
+++ b/machines/enka/fuzzel/default.nix
@@ -17,12 +17,12 @@ homeConfiguration "nixos" {
     };
 
     settings.colors = with upkgs.theme; {
-      background     = background      + "FF";
-      text           = lightForeground + "FF";
-      match          = base0A          + "FF";
-      selection      = lightForeground + "FF";
-      selection-text = background      + "FF";
-      border         = base0A          + "FF";
+      background     = base00 + "FF";
+      text           = base05 + "FF";
+      match          = base0A + "FF";
+      selection      = base05 + "FF";
+      selection-text = base00 + "FF";
+      border         = base0A + "FF";
     };
 
     settings.border = {
diff --git a/machines/enka/gtk/default.nix b/machines/enka/gtk/default.nix
index f862216..ea5f275 100644
--- a/machines/enka/gtk/default.nix
+++ b/machines/enka/gtk/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, systemConfiguration, homeConfiguration, enabled, ... }: lib.recursiveUpdate
+{ lib, pkgs, upkgs, systemConfiguration, homeConfiguration, enabled, ... }: lib.recursiveUpdate
 
 (systemConfiguration {
   programs.dconf = enabled {};
@@ -18,9 +18,14 @@
     };
 
     theme = {
-      name    = "Gruvbox-Dark-BL";
-      package = pkgs.gruvbox-gtk-theme;
+      name    = "Adwaita-Dark";
+      package = pkgs.gnome-themes-extra;
     };
   };
+
+  xdg.configFile = {
+    "gtk-3.0/gtk.css".text = upkgs.theme.adwaitaGtkCss;
+    "gtk-4.0/gtk.css".text = upkgs.theme.adwaitaGtkCss;
+  };
 })
 
diff --git a/machines/enka/hyprland/default.nix b/machines/enka/hyprland/default.nix
index 5ff1682..09c6cd1 100644
--- a/machines/enka/hyprland/default.nix
+++ b/machines/enka/hyprland/default.nix
@@ -41,20 +41,20 @@
     +
     ''
       binde = SUPER, left,  movefocus, l
-      binde = SUPER, up,    movefocus, u
       binde = SUPER, down,  movefocus, d
+      binde = SUPER, up,    movefocus, u
       binde = SUPER, right, movefocus, r
 
       binde = SUPER, h, movefocus, l
-      binde = SUPER, k, movefocus, u
       binde = SUPER, j, movefocus, d
+      binde = SUPER, k, movefocus, u
       binde = SUPER, l, movefocus, r
     ''
     +
     ''
       binde = SUPER+CTRL, left,  resizeactive, -10 0
-      binde = SUPER+CTRL, up,    resizeactive, 0 -10
       binde = SUPER+CTRL, down,  resizeactive, 0 10
+      binde = SUPER+CTRL, up,    resizeactive, 0 -10
       binde = SUPER+CTRL, right, resizeactive, 10 0
 
       binde = SUPER+CTRL, h, resizeactive, -10 0
@@ -65,13 +65,13 @@
     +
     ''
       bind = SUPER+ALT, left,  movewindow, l
-      bind = SUPER+ALT, up,    movewindow, u
       bind = SUPER+ALT, down,  movewindow, d
+      bind = SUPER+ALT, up,    movewindow, u
       bind = SUPER+ALT, right, movewindow, r
 
       bind = SUPER+ALT, h, movewindow, l
-      bind = SUPER+ALT, j, movewindow, u
-      bind = SUPER+ALT, k, movewindow, d
+      bind = SUPER+ALT, j, movewindow, d
+      bind = SUPER+ALT, k, movewindow, u
       bind = SUPER+ALT, l, movewindow, r
     ''
     +
diff --git a/machines/enka/kitty/default.nix b/machines/enka/kitty/default.nix
index 700131c..3d01611 100644
--- a/machines/enka/kitty/default.nix
+++ b/machines/enka/kitty/default.nix
@@ -22,8 +22,8 @@ homeConfiguration "nixos" {
       scrollback_lines = 100000;
       scrollback_pager = "bat --chop-long-lines";
 
-      cursor             = lightForeground;
-      cursor_theme_color = background;
+      cursor             = base05;
+      cursor_theme_color = base00;
       cursor_shape       = "beam";
 
       url_color = base0D;
@@ -36,20 +36,20 @@ homeConfiguration "nixos" {
       inactive_border_color = base01;
       window_border_width   = "0pt";
 
-      background = background;
-      foreground = lightForeground;
+      background = base00;
+      foreground = base05;
       
-      selection_background = lightForeground;
-      selection_foreground = background;
+      selection_background = base02;
+      selection_foreground = base00;
 
       tab_bar_edge  = "top";
       tab_bar_style = "powerline";
 
-      active_tab_background = background;
-      active_tab_foreground = lightForeground;
+      active_tab_background = base00;
+      active_tab_foreground = base05;
 
-      inactive_tab_background = lighterBackground;
-      inactive_tab_foreground = lightForeground;
+      inactive_tab_background = base01;
+      inactive_tab_foreground = base05;
 
       color0  = base00;
       color1  = base08;
diff --git a/machines/enka/waybar/default.nix b/machines/enka/waybar/default.nix
index fdeea09..4ac685b 100644
--- a/machines/enka/waybar/default.nix
+++ b/machines/enka/waybar/default.nix
@@ -124,8 +124,8 @@ homeConfiguration "nixos" {
       }
 
       #waybar {
-        background: ${background};
-        color: ${lightForeground};
+        background: ${base00};
+        color: ${base05};
       }
 
       #waybar:hover {