diff --git a/.gitignore b/.gitignore
index f773ea1..63023a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,8 @@
 !machines/enka/steam/
 !machines/enka/steck/
 
+!themes/
+
 !flake.lock
 !.editorconfig
 !.gitignore
diff --git a/flake.nix b/flake.nix
index 78bd871..dac6ab3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -67,6 +67,8 @@
 
         hyprland = hyprland.packages.${hostPlatform}.hyprland;
 
+        theme = import ./themes/gruvbox.nix;
+
         # SYSTEM
         systemConfiguration = attributes: attributes;
 
diff --git a/machines/enka/dunst/default.nix b/machines/enka/dunst/default.nix
index d8d45ec..a5ae5c8 100644
--- a/machines/enka/dunst/default.nix
+++ b/machines/enka/dunst/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, homeConfiguration, enabled, ... }:
+{ pkgs, theme, homeConfiguration, enabled, ... }:
 
 homeConfiguration "nixos" {
   services.dunst = enabled {
@@ -11,29 +11,29 @@ homeConfiguration "nixos" {
       horizontal_padding = 10;
       padding            = 10;
 
-      frame_color     = "#D79921";
-      frame_width     = 1;
+      frame_color     = "#" + theme.activeHighlight;
+      frame_width     = 2;
       seperator_color = "frame";
 
-      background = "#1D2021";
-      foreground = "#DDC7A1";
+      background = "#" + theme.background;
+      foreground = "#" + theme.foreground;
 
       alignment = "left";
       font      = "JetBrainsMono 12";
     };
 
     settings.urgency_low = {
-      frame_color = "#94A6FF";
+      frame_color = "#" + theme.low;
       timeout     = 5;
     };
 
     settings.urgency_normal = {
-      frame_color = "#FAA41A";
+      frame_color = "#" + theme.medium;
       timeout     = 10;
     };
 
     settings.urgency_critical = {
-      frame_color = "#F15D22";
+      frame_color = "#" + theme.high;
       timeout     = 15;
     };
   };
diff --git a/machines/enka/fuzzel/default.nix b/machines/enka/fuzzel/default.nix
index 7772ae2..a86e9c3 100644
--- a/machines/enka/fuzzel/default.nix
+++ b/machines/enka/fuzzel/default.nix
@@ -1,4 +1,4 @@
-{ homeConfiguration, enabled, ... }:
+{ theme, homeConfiguration, enabled, ... }:
 
 homeConfiguration "nixos" {
   programs.fuzzel = enabled {
@@ -16,17 +16,17 @@ homeConfiguration "nixos" {
     };
 
     settings.colors = {
-      background     = "1D2021FF";
-      text           = "DDC7A1FF";
-      match          = "D79921FF";
-      selection      = "DDC7A1FF";
-      selection-text = "1D2021FF";
-      border         = "D79921FF";
+      background     = theme.background      + theme.transparency;
+      text           = theme.foreground      + theme.transparency;
+      match          = theme.activeHighlight + theme.transparency;
+      selection      = theme.text            + theme.transparency;
+      selection-text = theme.background      + theme.transparency;
+      border         = theme.activeHighlight + theme.transparency;
     };
 
     settings.border = {
       radius = 0;
-      width = 3;
+      width = 2;
     };
   };
 }
diff --git a/machines/enka/hyprland/default.nix b/machines/enka/hyprland/default.nix
index 40da285..19730fe 100644
--- a/machines/enka/hyprland/default.nix
+++ b/machines/enka/hyprland/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, hyprland, systemConfiguration, homeConfiguration, homePackages, enabled, ... }: lib.recursiveUpdate3
+{ lib, pkgs, hyprland, theme, systemConfiguration, homeConfiguration, homePackages, enabled, ... }: lib.recursiveUpdate3
 
 (systemConfiguration {
   hardware.opengl = enabled {};
@@ -35,15 +35,15 @@
       bind   = SUPER, A, submap, fastedit
       submap =                   fastedit
 
-      bind = , left,  movefocus, l
-      bind = , right, movefocus, t
-      bind = , up,    movefocus, u
-      bind = , down,  movefocus, d
+      binde = , left,  movefocus, l
+      binde = , right, movefocus, t
+      binde = , up,    movefocus, u
+      binde = , down,  movefocus, d
 
-      bind = CTRL, right, resizeactive, 10 0
-      bind = CTRL, left,  resizeactive, -10 0
-      bind = CTRL, up,    resizeactive, 0 -10
-      bind = CTRL, down,  resizeactive, 0 10
+      binde = CTRL, right, resizeactive, 10 0
+      binde = CTRL, left,  resizeactive, -10 0
+      binde = CTRL, up,    resizeactive, 0 -10
+      binde = CTRL, down,  resizeactive, 0 10
 
       bind = SHIFT, left,  movewindow, l
       bind = SHIFT, right, movewindow, r
@@ -64,21 +64,19 @@
       bind = SUPER, W, exec, firefox
       bind = SUPER, D, exec, discord
 
-      bind =      , Print, exec, sh -c 'grim -g "$(slurp)" - | wl-copy'
+      bind =      , Print, exec, grim -g "$(slurp)" - | wl-copy
       bind = SHIFT, Print, exec, kazam
 
-      $active_color   = 0xD79921
-      $inactive_color = 0x928374
-
       general {
-        gaps_in  = 5
-        gaps_out = 10
+        gaps_in     = 5
+        gaps_out    = 10
+        border_size = 2
 
-        col.active_border         = $active_color
-        col.nogroup_border_active = $active_color
+        col.active_border         = 0x${theme.transparency}${theme.activeHighlight}
+        col.nogroup_border_active = 0x${theme.transparency}${theme.activeHighlight}
 
-        col.inactive_border = $inactive_color
-        col.nogroup_border  = $inactive_color
+        col.inactive_border = 0x${theme.transparency}${theme.inactiveHighlight}
+        col.nogroup_border  = 0x${theme.transparency}${theme.inactiveHighlight}
 
         no_focus_fallback = true
         no_cursor_warps = true
diff --git a/machines/enka/kitty/default.nix b/machines/enka/kitty/default.nix
index 3e9e4f7..5642de6 100644
--- a/machines/enka/kitty/default.nix
+++ b/machines/enka/kitty/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, homeConfiguration, enabled, ... }:
+{ homeConfiguration, enabled, ... }:
 
 homeConfiguration "nixos" {
   programs.kitty = enabled {
@@ -9,6 +9,6 @@ homeConfiguration "nixos" {
     settings = {
       scrollback_lines = 100000;
       mouse_hide_wait  = 0;
-    }
+    };
   };
 }
diff --git a/themes/gruvbox.nix b/themes/gruvbox.nix
new file mode 100644
index 0000000..d7d71e4
--- /dev/null
+++ b/themes/gruvbox.nix
@@ -0,0 +1,13 @@
+{
+  transparency = "FF"; # OPAQUE
+
+  background = "1D2021";
+  text       = "DDC7A1";
+
+  activehighlight   = "D79921";
+  inactiveHighlight = "928374";
+
+  low    = "94A6FF";
+  medium = "FAA41A";
+  high   = "F15D22";
+}