diff --git a/formatter.nix b/formatter.nix
index 2ca0f70..561417e 100644
--- a/formatter.nix
+++ b/formatter.nix
@@ -24,6 +24,7 @@ in {
           "gitignore"
           "age"
           "pub"
+          "svg"
         ])
       ];
     };
diff --git a/justfile b/justfile
index 0225263..cf12e93 100644
--- a/justfile
+++ b/justfile
@@ -7,7 +7,7 @@ nixcmd := "nix --experimental-features 'nix-command flakes'"
 
 [doc("Build a flake output")]
 build target *ARGS="":
-    @{{ nixcmd }} run {{ARGS}} nixpkgs#nix-output-monitor -- build {{ justfile_directory() }}#{{ target }}
+    @{{ nixcmd }} run {{ ARGS }} nixpkgs#nix-output-monitor -- build {{ justfile_directory() }}#{{ target }}
 
 [doc('Build a nixos configuration')]
 [group('deploy')]
diff --git a/modules/apps/pycharm.nix b/modules/apps/pycharm.nix
index da732a2..4b8ac6b 100644
--- a/modules/apps/pycharm.nix
+++ b/modules/apps/pycharm.nix
@@ -2,7 +2,7 @@
   environment.systemPackages = [
     (pkgsUnstable.jetbrains.pycharm-professional.override {
       vmopts = ''
-      -Dawt.toolkit.name=WLToolkit
+        -Dawt.toolkit.name=WLToolkit
       '';
     })
   ];
diff --git a/modules/desktop/fireproof-shell.nix b/modules/desktop/fireproof-shell.nix
index 27b8de3..3c4723f 100644
--- a/modules/desktop/fireproof-shell.nix
+++ b/modules/desktop/fireproof-shell.nix
@@ -1,4 +1,9 @@
-{config, inputs, pkgs, ...}: let 
+{
+  config,
+  inputs,
+  pkgs,
+  ...
+}: let
   primaryMonitorName =
     if builtins.length config.monitors > 0
     then (builtins.elemAt config.monitors 0).name
@@ -12,4 +17,4 @@ in {
     systemd = true;
     monitor.primary = primaryMonitorName;
   };
-}
\ No newline at end of file
+}
diff --git a/modules/desktop/gtk/theme.css b/modules/desktop/gtk/theme.css
index e69de29..e03b97e 100644
--- a/modules/desktop/gtk/theme.css
+++ b/modules/desktop/gtk/theme.css
@@ -0,0 +1,140 @@
+@define-color bg #1C1B1A;
+@define-color bg-alt #282726;
+@define-color fg #DAD8CE;
+@define-color fg-alt #B7B5AC;
+@define-color muted #878580;
+@define-color ui #343331;
+@define-color ui-alt #403E3C;
+@define-color black #100F0F;
+@define-color accent #CF6A4C;
+@define-color red #D14D41;
+@define-color red-alt #AF3029;
+@define-color orange #DA702C;
+@define-color orange-alt #BC5215;
+@define-color yellow #D0A215;
+@define-color yellow-alt #AD8301;
+@define-color green #879A39;
+@define-color green-alt #66800B;
+@define-color cyan #3AA99F;
+@define-color cyan-alt #24837B;
+@define-color blue #4385BE;
+@define-color blue-alt #205EA6;
+@define-color purple #8B7EC8;
+@define-color purple-alt #5E409D;
+@define-color magenta #CE5D97;
+@define-color magenta-alt #A02F6F;
+@define-color white #DAD8CE;
+@define-color white-alt #F2F0E5;
+
+/* Adwaita stuff */
+@define-color accent_color @accent;
+@define-color accent_bg_color @accent;
+@define-color accent_fg_color @fg;
+
+@define-color window_bg_color @bg;
+@define-color window_fg_color @fg;
+
+@define-color headerbar_bg_color @bg-alt;
+@define-color headerbar_fg_color @fg;
+
+@define-color popover_bg_color @bg-alt;
+@define-color popover_fg_color @fg;
+
+@define-color dialog_bg_color @popover_bg_color;
+@define-color dialog_fg_color @popover_fg_color;
+
+@define-color sidebar_bg_color @bg-alt;
+@define-color sidebar_fg_color @fg;
+@define-color sidebar_backdrop_color @bg-alt;
+@define-color sidebar_shade_color RGB(0 0 6 / 25%);
+@define-color sidebar_border_color RGB(0 0 6 / 36%);
+
+@define-color secondary_sidebar_bg_color @sidebar_backdrop_color;
+@define-color secondary_sidebar_fg_color @fg;
+@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
+@define-color secondary_sidebar_shade_color @sidebar_shade_color;
+@define-color secondary_sidebar_border_color @sidebar_border_color;
+
+@define-color view_bg_color @bg;
+@define-color view_fg_color @fg;
+
+@define-color card_bg_color @bg-alt;
+@define-color card_fg_color @fg;
+
+@define-color thumbnail_bg_color @bg-alt;
+@define-color thumbnail_fg_color @fg;
+
+@define-color warning_bg_color @red;
+@define-color warning_fg_color @fg;
+@define-color warning_color @red;
+@define-color error_bg_color @red;
+@define-color error_fg_color @fg;
+@define-color error_color @red;
+@define-color success_bg_color @green;
+@define-color success_fg_color @fg;
+@define-color success_color @green;
+@define-color destructive_bg_color @red;
+@define-color destructive_fg_color @fg;
+@define-color destructive_color @red;
+
+:root {
+  --accent-bg-color: @accent_bg_color;
+  --accent-fg-color: @accent_fg_color;
+
+  --destructive-bg-color: @destructive_bg_color;
+  --destructive-fg-color: @destructive_fg_color;
+
+  --success-bg-color: @success_bg_color;
+  --success-fg-color: @success_fg_color;
+
+  --warning-bg-color: @warning_bg_color;
+  --warning-fg-color: @warning_fg_color;
+
+  --error-bg-color: @error_bg_color;
+  --error-fg-color: @error_fg_color;
+
+  --window-bg-color: @window_bg_color;
+  --window-fg-color: @window_fg_color;
+
+  --view-bg-color: @view_bg_color;
+  --view-fg-color: @view_fg_color;
+
+  --headerbar-bg-color: @headerbar_bg_color;
+  --headerbar-fg-color: @headerbar_fg_color;
+  --headerbar-border-color: @headerbar_border_color;
+  --headerbar-backdrop-color: @headerbar_backdrop_color;
+  --headerbar-shade-color: @headerbar_shade_color;
+  --headerbar-darker-shade-color: @headerbar_darker_shade_color;
+
+  --sidebar-bg-color: @sidebar_bg_color;
+  --sidebar-fg-color: @sidebar_fg_color;
+  --sidebar-backdrop-color: @sidebar_backdrop_color;
+  --sidebar-border-color: @sidebar_border_color;
+  --sidebar-shade-color: @sidebar_shade_color;
+
+  --secondary-sidebar-bg-color: @secondary_sidebar_bg_color;
+  --secondary-sidebar-fg-color: @secondary_sidebar_fg_color;
+  --secondary-sidebar-backdrop-color: @secondary_sidebar_backdrop_color;
+  --secondary-sidebar-border-color: @secondary_sidebar_border_color;
+  --secondary-sidebar-shade-color: @secondary_sidebar_shade_color;
+
+  --card-bg-color: @card_bg_color;
+  --card-fg-color: @card_fg_color;
+  --card-shade-color: @card_shade_color;
+
+  --dialog-bg-color: @dialog_bg_color;
+  --dialog-fg-color: @dialog_fg_color;
+
+  --popover-bg-color: @popover_bg_color;
+  --popover-fg-color: @popover_fg_color;
+  --popover-shade-color: @popover_shade_color;
+
+  --thumbnail-bg-color: @thumbnail_bg_color;
+  --thumbnail-fg-color: @thumbnail_fg_color;
+
+  --shade-color: @shade_color;
+  --scrollbar-outline-color: @scrollbar_outline_color;
+
+  --thumbnail-bg-color: @thumbnail_bg_color;
+  --thumbnail-fg-color: @thumbnail_fg_color;
+}
diff --git a/modules/desktop/hyprland/default.nix b/modules/desktop/hyprland/default.nix
index 560e686..93d4a79 100644
--- a/modules/desktop/hyprland/default.nix
+++ b/modules/desktop/hyprland/default.nix
@@ -13,12 +13,21 @@ with lib; let
     else "";
 
   hyprPkgs = {
-    hyprland = inputs.hyprland.packages.${pkgs.system}.hyprland;
-    xdg-desktop-portal-hyprland = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
+    inherit (inputs.hyprland.packages.${pkgs.system}) hyprland;
+    inherit (inputs.hyprland.packages.${pkgs.system}) xdg-desktop-portal-hyprland;
     mesa = inputs.hyprland.inputs.nixpkgs.legacyPackages.${pkgs.system}.mesa.drivers;
     mesa32 = inputs.hyprland.inputs.nixpkgs.legacyPackages.${pkgs.system}.pkgsi686Linux.mesa.drivers;
   };
 
+  color = {
+    bg = "rgb(1C1B1A)";
+    bg-alt = "rgb(282726)";
+    fg = "rgb(DAD8CE)";
+    accent = "rgb(CF6A4C)";
+    black = "rgb(100F0F)";
+    transparent = "rgba(00000000)";
+  };
+
   record_script = pkgs.writeShellScriptBin "record_script" ''
     DIR="$HOME/recordings"
     FILE="$DIR/$(date '+%Y-%m-%d_%H.%M.%S').mp4"
@@ -179,8 +188,8 @@ in {
             gaps_in = 5;
             gaps_out = 10;
             border_size = 2;
-            "col.active_border" = "rgb(cf6a4c)";
-            "col.inactive_border" = "rgb(343331)";
+            "col.active_border" = color.accent;
+            "col.inactive_border" = color.bg;
             layout = "dwindle";
           };
           cursor = {
@@ -195,12 +204,10 @@ in {
           };
 
           decoration = {
-            rounding = 4;
+            rounding = 8;
+            rounding_power = 4;
             shadow = {
               enabled = true;
-              range = 4;
-              render_power = 3;
-              color = "rgba(1a1a1aee)";
             };
           };
           animations = {
@@ -220,6 +227,21 @@ in {
             force_split = 2;
             use_active_for_splits = true;
           };
+          group = {
+            "col.border_inactive" = color.bg;
+            "col.border_active" = color.accent;
+            groupbar = {
+              enabled = true;
+              font_size = 12;
+              gradients = false;
+              height = 16;
+              indicator_height = 2;
+              "col.inactive" = color.bg-alt;
+              "col.active" = color.accent;
+              "text_color" = color.fg;
+            };
+          };
+
           bind = [
             "SUPER, RETURN, exec, ${getExe config.programs.uwsm.package} app -- ${cfg.default-apps.terminal}"
             "SUPER, BACKSPACE, killactive"
@@ -284,7 +306,7 @@ in {
             "center,class:^(jetbrains-.*)$,title:^$,floating:1"
             "noinitialfocus,class:^(jetbrains-.*)$,title:^$,floating:1"
             "noanim,class:^(jetbrains-.*)$,title:^$,floating:1"
-            
+
             "center,class:^(jetbrains-.*)$,title:^(splash)$,floating:1"
             "nofocus,class:^(jetbrains-.*)$,title:^(splash)$,floating:1"
             "noborder,class:^(jetbrains-.*)$,title:^(splash)$,floating:1"
diff --git a/modules/dev/postgres.nix b/modules/dev/postgres.nix
index 7284e44..49d397e 100644
--- a/modules/dev/postgres.nix
+++ b/modules/dev/postgres.nix
@@ -2,4 +2,4 @@
   environment.systemPackages = [
     pkgs.postgresql
   ];
-}
\ No newline at end of file
+}