diff --git a/flake.lock b/flake.lock
index 14fd4bf..39879d6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -103,11 +103,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1786988494,
-        "narHash": "sha256-nZcYMi4nJxjqp8atEWkowCtRQplS6RuzqIxcPUqG0CA=",
+        "lastModified": 1786999651,
+        "narHash": "sha256-MTGMFlLDTklsXhCp4r5GXB4VAVadPdalXLvUjd/K7h0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ec161155d76f7ec25404c0da2fa9f5f133f6ae4c",
+        "rev": "353742587cbaf079b3caee743115d037bc51fea6",
         "type": "github"
       },
       "original": {
@@ -236,11 +236,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1786862985,
-        "narHash": "sha256-FBJRXmbGXiSUDvYEbfLYRkckayyZ6SK1UEqhCrIZ2Cs=",
+        "lastModified": 1787070829,
+        "narHash": "sha256-vXNVDVtvfiQuXthP0NHPFdNvvMTkGpx0UP8oddIWbNk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e5bdc4a41d4c072fe1e3787eaa0320a384741d44",
+        "rev": "0ae2bc1419c3f345984c2629e72e7a631820fa4d",
         "type": "github"
       },
       "original": {
@@ -294,15 +294,16 @@
         "nixpkgs": "nixpkgs_5"
       },
       "locked": {
-        "lastModified": 1786984599,
-        "narHash": "sha256-I7E/WigdUVzJ5qZWkexYbHE/EWntxGPTh2N+VBUdpzo=",
+        "lastModified": 1787106894,
+        "narHash": "sha256-ZLsON94GGmg7cAC/9Oyz0P+mPhemdvQIKwLcFEe785k=",
         "owner": "noctalia-dev",
         "repo": "noctalia",
-        "rev": "87b203c682045d0f81a3d92d418bb37caf728a1c",
+        "rev": "b38bf2dde1195e459b4b2a436bde970001d5d5ce",
         "type": "github"
       },
       "original": {
         "owner": "noctalia-dev",
+        "ref": "cachix",
         "repo": "noctalia",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index fa3ba6a..e9c9aa4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,7 +17,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    noctalia.url = "github:noctalia-dev/noctalia";
+    noctalia.url = "github:noctalia-dev/noctalia/cachix";
 
     noctalia-greeter.url = "github:noctalia-dev/noctalia-greeter";
 
diff --git a/modules/home/term/ghostty/ghostty/themes/noctalia b/modules/home/term/ghostty/ghostty/themes/noctalia
deleted file mode 100644
index 71afce7..0000000
--- a/modules/home/term/ghostty/ghostty/themes/noctalia
+++ /dev/null
@@ -1,22 +0,0 @@
-palette = 0=#4c4549
-palette = 1=#ffb4ab
-palette = 2=#d1c3ca
-palette = 3=#cdc4c7
-palette = 4=#d6c2c0
-palette = 5=#d1c3ca
-palette = 6=#cdc4c7
-palette = 7=#e6e1e1
-palette = 8=#978e93
-palette = 9=#ffb4ab
-palette = 10=#d1c3ca
-palette = 11=#cdc4c7
-palette = 12=#d6c2c0
-palette = 13=#d1c3ca
-palette = 14=#cdc4c7
-palette = 15=#e6e1e1
-background = #141313
-foreground = #e6e1e1
-cursor-color = #e6e1e1
-cursor-text = #141313
-selection-background = #4c4549
-selection-foreground = #cec4c8
diff --git a/modules/home/tools/helix/helix/themes/noctalia.toml b/modules/home/tools/helix/helix/themes/noctalia.toml
deleted file mode 100644
index a7f233d..0000000
--- a/modules/home/tools/helix/helix/themes/noctalia.toml
+++ /dev/null
@@ -1,161 +0,0 @@
-# Syntax highlighting
-# -------------------
-"attribute" = { fg = "primary", modifiers = ["bold"] }
-
-"type" = "primary"
-"type.enum.variant" = "secondary"
-
-"constructor" = "tertiary"
-
-"constant" = "secondary"
-"constant.character" = "secondaryContainer"
-"constant.character.escape" = "tertiaryContainer"
-
-"string" = { fg = "tertiary"}
-"string.regexp" = { fg = "tertiaryContainer" }
-"string.special" = { fg = "tertiary" }
-"string.special.symbol" = { fg = "tertiary" }
-"string.special.path" = { fg = "secondary", underline = { color = "secondary", style = "line" } }
-
-"path" = { fg = "secondary", underline = { color = "secondary", style = "line" } }
-
-"comment" = { fg = "outline", modifiers = ["italic"] }
-
-"variable" = "onSurface"
-"variable.builtin" = "secondary"
-"variable.parameter" = { fg = "onSurfaceVariant", modifiers = ["italic"] }
-"variable.other.member" = "primary"
-
-"label" = "secondary"
-
-"punctuation" = "outline"
-
-"keyword" = { fg = "primary", modifiers = ["bold"] }
-"keyword.control.conditional" = { fg = "tertiary", modifiers = ["italic", "bold"] }
-
-"operator" = { fg = "secondary", modifiers = ["bold"] }
-
-"function" = "tertiary"
-"function.macro" = "tertiary"
-
-"tag" = "secondary"
-
-"namespace" = { fg = "secondary", modifiers = ["italic"] }
-
-"special" = "secondary"
-
-"markup.heading" = "primary"
-"markup.list" = "onSurface"
-"markup.bold" = { fg = "secondary", modifiers = ["bold"] }
-"markup.italic" = { fg = "secondary", modifiers = ["italic"] }
-"markup.link.url" = { fg = "secondary", modifiers = ["italic", "underlined"] }
-"markup.link.label" = "primary"
-"markup.raw" = "onSurface"
-"markup.quote" = "secondary"
-
-"diff.plus" = "plus"
-"diff.minus" = "error"
-"diff.delta" = "delta"
-
-# User Interface
-# --------------
-"ui.background" = "none"
-
-"ui.cursor" = { fg = "onSecondary", bg = "secondary" }
-"ui.cursor.match" = { fg = "onTertiary", bg = "tertiary", modifiers = ["bold"] }
-"ui.cursor.primary" = { fg = "onPrimary", bg = "primary" }
-
-"ui.linenr" = { fg = "onSurfaceVariant" }
-"ui.linenr.selected" = { fg = "primary" }
-
-"ui.statusline" = { fg = "onSurface", bg = "surfaceContainerLow" }
-"ui.statusline.inactive" = { fg = "onSurface", bg = "surfaceContainerLowest" }
-"ui.statusline.normal" = { fg = "onPrimary", bg = "primary", modifiers = ["bold"] }
-"ui.statusline.insert" = { fg = "onTertiary", bg = "tertiary", modifiers = ["bold"] }
-"ui.statusline.select" = { fg = "onSecondary", bg = "secondary", modifiers = ["bold"] }
-
-"ui.bufferline" = { fg = "onSurface", bg = "surfaceContainerLowest" }
-"ui.bufferline.active" = { fg = "onSurface", bg = "surfaceContainer", underline = { color = "primary", style = "line" } }
-"ui.bufferline.background" = { bg = "surfaceContainerLowest" }
-
-"ui.popup" = { fg = "onSurface", bg = "surfaceContainerLow" }
-
-"ui.window" = { fg = "onSurface" }
-"ui.help" = { fg = "onSurface", bg = "surfaceContainerLow" }
-
-"ui.text" = { fg = "onBackground" }
-"ui.text.focus" = { fg = "onSurface", bg = "surfaceContainer", modifiers = ["bold"] }
-
-"ui.virtual" = "surfaceVariant"
-"ui.virtual.ruler" = { bg = "surfaceContainerLow" }
-"ui.virtual.indent-guide" = "surfaceVariant"
-"ui.virtual.inlay-hint" = { fg = "onSurfaceVariant", bg = "surfaceContainer", modifiers = ["dim"] }
-"ui.virtual.jump-label" = { fg = "primary", modifiers = ["bold"] }
-
-"ui.menu" = { fg = "onSurface", bg = "surfaceContainer" }
-"ui.menu.selected" = { fg = "onPrimary", bg = "primary", modifiers = ["bold"] }
-
-"ui.selection" = { bg = "primaryContainer", fg = "onPrimaryContainer" }
-
-"ui.highlight" = { bg = "primaryContainer", modifiers = ["bold"] }
-
-"ui.cursorline" = { bg = "surfaceContainerLowest" }
-"ui.cursorline.primary" = { bg = "surfaceContainerLow" }
-"ui.cursorline.secondary" = { bg = "surfaceContainerLow" }
-
-error = "error"
-warning = "warning"
-info = "info"
-hint = "hint"
-
-"diagnostic.hint" = { underline = { color = "hint", style = "curl" } }
-"diagnostic.info" = { underline = { color = "info", style = "curl" } }
-"diagnostic.warning" = { underline = { color = "warning", style = "curl" } }
-"diagnostic.error" = { underline = { color = "error", style = "curl" } }
-"diagnostic.unnecessary" = { modifiers = ["dim"] }
-
-[palette]
-# Constants to be used in syntax highlighting, not meant for template processor.
-warning = "#f9e2af"
-info = "#89dceb"
-hint = "#94e2d5"
-plus = "#a6e3a1"
-delta = "#89b4fa"
-
-# Template colors
-primary = "#d1c3ca"
-surfaceTint = "#d1c3ca"
-onPrimary = "#372e34"
-primaryContainer = "#b1a4ab"
-onPrimaryContainer = "#433a40"
-
-secondary = "#cdc4c7"
-onSecondary = "#342f32"
-secondaryContainer = "#4b4548"
-onSecondaryContainer = "#bbb3b6"
-
-tertiary = "#d6c2c0"
-onTertiary = "#3a2d2c"
-tertiaryContainer = "#b6a3a1"
-onTertiaryContainer = "#473938"
-
-error = "#ffb4ab"
-onError = "#690005"
-errorContainer = "#93000a"
-onErrorContainer = "#ffdad6"
-
-background = "#141313"
-onBackground = "#e6e1e1"
-surface = "#141313"
-onSurface = "#e6e1e1"
-surfaceVariant = "#4c4549"
-onSurfaceVariant = "#cec4c8"
-
-outline = "#978e93"
-outlineVariant = "#4c4549"
-
-surfaceContainerLowest = "#0f0e0e"
-surfaceContainerLow = "#1d1b1c"
-surfaceContainer = "#211f20"
-surfaceContainerHigh = "#2b292a"
-surfaceContainerHighest = "#363435"