diff --git a/flake.lock b/flake.lock
index 5a7a190..cb67d7a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -384,11 +384,11 @@
         "wlroots": "wlroots"
       },
       "locked": {
-        "lastModified": 1662832677,
-        "narHash": "sha256-iznPgUPjzOt0j3zB3LUAhYLX5L+6k+UMsluDasa5p80=",
+        "lastModified": 1662922102,
+        "narHash": "sha256-5OZiMlsmN1SISveS0dsuuu38RX6k4QjcZoKmZFWplFw=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "f024d7114fe08f505ec9af40ee8cd471fbb6c09b",
+        "rev": "b49d7007b57a4890d63262fa031cf63ee09e0ed0",
         "type": "github"
       },
       "original": {
@@ -472,11 +472,11 @@
         "utils": "utils_3"
       },
       "locked": {
-        "lastModified": 1662774856,
-        "narHash": "sha256-vgvkBNzRs3Ukwc2sVAoPGeSglltNqLHEvbxmE89fB0I=",
+        "lastModified": 1662966897,
+        "narHash": "sha256-ZMxjO9eGPj/NnqqzNwaJQV7zwxOtYhm5bEW3u4isziE=",
         "owner": "jyooru",
         "repo": "nix-minecraft-servers",
-        "rev": "d5934f64d688bba60c633b8966170b575a220867",
+        "rev": "0812eb875aa86bd0da8eb27c30f4a96ecddd1406",
         "type": "github"
       },
       "original": {
@@ -583,11 +583,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1662901081,
-        "narHash": "sha256-FHd7a3ZfFTlcaYffeWhfDwPd4XeUsScjMEEoWHMqp44=",
+        "lastModified": 1662940775,
+        "narHash": "sha256-SIgHTMjM+PqXWaXDzXsy/XmrDuTu7zpPvizgS7C9n+M=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cc46999e0a45051412f736264cdf30da8d429460",
+        "rev": "faa93c4e19e79e7a6de31d6d3492b8f00760ca82",
         "type": "github"
       },
       "original": {
@@ -907,11 +907,11 @@
         "webcord": "webcord_2"
       },
       "locked": {
-        "lastModified": 1662901119,
-        "narHash": "sha256-tab8KTHTzJjAm7s/n0tk2ZsI6VNr69WqQiiVbQrUm2o=",
+        "lastModified": 1662959566,
+        "narHash": "sha256-rajDG3utME/F6TdwIUPs44soARIx59+NOZPNCJzeUqA=",
         "owner": "fufexan",
         "repo": "webcord-flake",
-        "rev": "529d1721ed91cc7166c2c7b81f8f4bd23ae678b7",
+        "rev": "f1f6a0a7278459bcbfe792ad8caf7e029eeb1c32",
         "type": "github"
       },
       "original": {
diff --git a/nixos/hosts/thalassa/null/home/default.nix b/nixos/hosts/thalassa/null/home/default.nix
index 4f87838..4dfb35f 100644
--- a/nixos/hosts/thalassa/null/home/default.nix
+++ b/nixos/hosts/thalassa/null/home/default.nix
@@ -7,7 +7,7 @@
 
   imports = [
     inputs.hyprland.homeManagerModules.default
-    ./hyprland
+    ./hyprland.nix
     ./eww
     ./theme.nix
   ];
@@ -107,22 +107,5 @@
 
   programs.zsh.enable = true;
 
-  gtk = {
-    enable = true;
-    theme = {
-      name = "Catppuccin-Pink-Dark";
-      package = pkgs.catppuccin-gtk;
-    };
-    iconTheme = {
-      name = "Arc";
-      package = pkgs.arc-icon-theme;
-    };
-    cursorTheme = {
-      name = "Catppuccin-Frappe-Pink-Cursors";
-      package = pkgs.catppuccin.cursors;
-      size = 32;
-    };
-  };
-
   services.syncthing.enable = true;
 }
diff --git a/nixos/hosts/thalassa/null/home/eww/eww.scss b/nixos/hosts/thalassa/null/home/eww/eww.scss
index 877db8f..d51ad00 100644
--- a/nixos/hosts/thalassa/null/home/eww/eww.scss
+++ b/nixos/hosts/thalassa/null/home/eww/eww.scss
@@ -1,29 +1,3 @@
-$rosewater: #f2d5cf;
-$flamingo: #eebebe;
-$pink: #f4b8e4;
-$mauve: #ca9ee6;
-$red: #e78284;
-$maroon: #ea999c;
-$peach: #ef9f76;
-$yellow: #e5c890;
-$green: #a6d189;
-$teal: #81c8be;
-$sky: #99d1db;
-$sapphire: #85c1dc;
-$blue: #8caaee;
-$lavender: #babbf1;
-$text: #c6d0f5;
-$subtext1: #b5bfe2;
-$subtext0: #a5adce;
-$overlay2: #949cbb;
-$overlay1: #838ba7;
-$overlay0: #737994;
-$surface2: #626880;
-$surface1: #51576d;
-$surface0: #414559;
-$base: #303446;
-$mantle: #292c3c;
-$crust: #232634;
 $light-gray: #9699b7;
 
 * {
diff --git a/nixos/hosts/thalassa/null/home/hyprland/default.nix b/nixos/hosts/thalassa/null/home/hyprland.nix
similarity index 95%
rename from nixos/hosts/thalassa/null/home/hyprland/default.nix
rename to nixos/hosts/thalassa/null/home/hyprland.nix
index e39d342..e37d85b 100644
--- a/nixos/hosts/thalassa/null/home/hyprland/default.nix
+++ b/nixos/hosts/thalassa/null/home/hyprland.nix
@@ -5,11 +5,6 @@
     wallpaper = eDP-1,~/cloud/Pictures/Wallpapers-Laptop/wallpaper-nix-pink.png
   '';
 
-  home.file.".xsettingsd".text = ''
-    Gtk/CursorThemeName "Catppuccin-Frappe-Pink-Cursors"
-    Net/ThemeName "Catppuccin-Pink-Dark"
-  '';
-
   wayland.windowManager.hyprland = {
     enable = true;
     extraConfig = ''
diff --git a/nixos/hosts/thalassa/null/home/theme.nix b/nixos/hosts/thalassa/null/home/theme.nix
index 870403f..d87b91d 100644
--- a/nixos/hosts/thalassa/null/home/theme.nix
+++ b/nixos/hosts/thalassa/null/home/theme.nix
@@ -1,6 +1,9 @@
-{ ... }:
+{ lib, ... }:
 let
-  # Catpuccin Frappe Pink
+  inherit (builtins) mapAttrs;
+
+  theme = "Catppuccin-Pink-Dark";
+  cursorTheme = "Catppuccin-Frappe-Pink-Cursors";
   colour = rec {
     rosewater = "f2d5cf";
     flamingo = "eebebe";
@@ -17,22 +20,44 @@ let
     blue = "8caaee";
     lavender = "babbf1";
     text = "c6d0f5";
-    subtext1 = "b5bfe2";
     subtext0 = "a5adce";
+    subtext1 = "b5bfe2";
     overlay2 = "949cbb";
-    overlay1 = "838ba7";
     overlay0 = "737994";
-    surface2 = "626880";
-    surface1 = "51576d";
+    overlay1 = "838ba7";
     surface0 = "414559";
+    surface1 = "51576d";
+    surface2 = "626880";
     base = "303446";
     mantle = "292c3c";
     crust = "232634";
 
-    hex = builtins.mapAttrs (name: value: "#${value}") colour;
+    hex = mapAttrs (name: value: "#${value}") colour;
   };
 in
 {
+  home.file.".xsettingsd".text = ''
+    Net/ThemeName "${theme}"
+    Gtk/CursorThemeName "${cursorTheme}"
+  '';
+
+  gtk = {
+    enable = true;
+    theme = {
+      name = theme;
+      package = pkgs.catppuccin-gtk;
+    };
+    iconTheme = {
+      name = "Arc";
+      package = pkgs.arc-icon-theme;
+    };
+    cursorTheme = {
+      name = cursorTheme;
+      package = pkgs.catppuccin.cursors;
+      size = 32;
+    };
+  };
+
   # Note, pink and blue are switched
   programs.foot.settings.colors = {
     foreground = colour.text; # Text
@@ -61,4 +86,33 @@ in
     textColor = colour.hex.text;
     borderRadius = 5;
   };
+
+  home.file.".config/eww/eww.scss".text = lib.mkBefore ''
+    $rosewater: ${colour.hex.rosewater};
+    $flamingo: ${colour.hex.flamingo};
+    $pink: ${colour.hex.pink};
+    $mauve: ${colour.hex.mauve};
+    $red: ${colour.hex.red};
+    $maroon: ${colour.hex.maroon};
+    $peach: ${colour.hex.peach};
+    $yellow: ${colour.hex.yellow};
+    $green: ${colour.hex.green};
+    $teal: ${colour.hex.teal};
+    $sky: ${colour.hex.sky};
+    $sapphire: ${colour.hex.sapphire};
+    $blue: ${colour.hex.blue};
+    $lavender: ${colour.hex.lavender};
+    $text: ${colour.hex.text};
+    $subtext0: ${colour.hex.subtext0};
+    $subtext1: ${colour.hex.subtext1};
+    $overlay0: ${colour.hex.overlay0};
+    $overlay1: ${colour.hex.overlay1};
+    $overlay2: ${colour.hex.overlay2};
+    $surface0: ${colour.hex.surface0};
+    $surface1: ${colour.hex.surface1};
+    $surface2: ${colour.hex.surface2};
+    $base: ${colour.hex.base};
+    $mantle: ${colour.hex.mantle};
+    $crust: ${colour.hex.crust};
+  '';
 }