diff --git a/modules/home/programs/graphical/ghostty/config/ghostty.conf b/modules/home/programs/graphical/ghostty/config/ghostty.conf
index f755411..b22f7c1 100755
--- a/modules/home/programs/graphical/ghostty/config/ghostty.conf
+++ b/modules/home/programs/graphical/ghostty/config/ghostty.conf
@@ -33,24 +33,26 @@ keybind = cmd+9=goto_tab:9
 keybind = performable:cmd+c=copy_to_clipboard
 keybind = performable:cmd+v=paste_from_clipboard
 
-# Melange Dark - Adapted From: https://github.com/savq/melange-nvim/blob/master/term/kitty/melange_dark.conf
-palette = 0=#34302C
-palette = 1=#BD8183
-palette = 2=#78997A
-palette = 3=#E49B5D
-palette = 4=#7F91B2
-palette = 5=#B380B0
-palette = 6=#7B9695
-palette = 7=#C1A78E
-palette = 8=#867462
-palette = 9=#D47766
-palette = 10=#85B695
-palette = 11=#EBC06D
-palette = 12=#A3A9CE
-palette = 13=#CF9BC2
-palette = 14=#89B3B6
-palette = 15=#ECE1D7
-background = 292522
-foreground = ECE1D7
-selection-background = 403A36
-selection-foreground = ECE1D7
+# https://github.com/catppuccin/ghostty/blob/main/themes/catppuccin-mocha.conf
+palette = 0=#45475a
+palette = 1=#f38ba8
+palette = 2=#a6e3a1
+palette = 3=#f9e2af
+palette = 4=#89b4fa
+palette = 5=#f5c2e7
+palette = 6=#94e2d5
+palette = 7=#bac2de
+palette = 8=#585b70
+palette = 9=#f38ba8
+palette = 10=#a6e3a1
+palette = 11=#f9e2af
+palette = 12=#89b4fa
+palette = 13=#f5c2e7
+palette = 14=#94e2d5
+palette = 15=#a6adc8
+background = 1e1e2e
+foreground = cdd6f4
+cursor-color = f5e0dc
+cursor-text = 1e1e2e
+selection-background = 353749
+selection-foreground = cdd6f4
diff --git a/modules/home/programs/graphical/ghostty/default.nix b/modules/home/programs/graphical/ghostty/default.nix
index 59aa419..f82e214 100755
--- a/modules/home/programs/graphical/ghostty/default.nix
+++ b/modules/home/programs/graphical/ghostty/default.nix
@@ -20,12 +20,14 @@ in
       profileExtra = ''
         SHELL="$BASH"
         PATH=~/.bin:$PATH
+        bind "set show-mode-in-prompt on"
+
+        set -o vi || true
         VISUAL=vim
         EDITOR="$VISUAL"
-        eval "$(thefuck --alias)"
-        set -o vi || true
-        bind "set show-mode-in-prompt on"
+
         fastfetch
+        eval "$(thefuck --alias)"
       '';
     };
 
@@ -72,6 +74,5 @@ in
         [ "@BASH_PATH@" ]
         [ bashPath ]
         (builtins.readFile ./config/ghostty.conf);
-
   };
 }
diff --git a/modules/home/programs/terminal/nvim/config/lua/base.lua b/modules/home/programs/terminal/nvim/config/lua/base.lua
index b9678c6..cfd6dac 100755
--- a/modules/home/programs/terminal/nvim/config/lua/base.lua
+++ b/modules/home/programs/terminal/nvim/config/lua/base.lua
@@ -2,10 +2,11 @@
 -- vim.g.nord_borders = true
 -- vim.g.nord_contrast = true
 -- vim.cmd('colorscheme nord')
-vim.cmd('colorscheme melange')
+-- vim.cmd('colorscheme melange')
+vim.cmd("colorscheme catppuccin-mocha")
 
 -- Set Leader
-vim.keymap.set("n", "<Space>", "<Nop>", {silent = true})
+vim.keymap.set("n", "<Space>", "<Nop>", { silent = true })
 vim.g.mapleader = " "
 
 -- Set Timeout
@@ -38,29 +39,31 @@ vim.opt.foldlevel = 2
 -- Diagnostics Mappings
 local diagnostics_active = true
 local toggle_diagnostics = function()
-    diagnostics_active = not diagnostics_active
-    if diagnostics_active then
-        vim.diagnostic.enable()
-    else
-        vim.diagnostic.disable()
-    end
+	diagnostics_active = not diagnostics_active
+	if diagnostics_active then
+		vim.diagnostic.enable()
+	else
+		vim.diagnostic.disable()
+	end
 end
 
 local diagnostics_loclist_active = false
 local toggle_diagnostics_loclist = function()
-    diagnostics_loclist_active = not diagnostics_loclist_active
-    if diagnostics_loclist_active then
-        vim.diagnostic.setloclist()
-    else
-        vim.cmd('lclose')
-    end
+	diagnostics_loclist_active = not diagnostics_loclist_active
+	if diagnostics_loclist_active then
+		vim.diagnostic.setloclist()
+	else
+		vim.cmd("lclose")
+	end
 end
 
-local opts = {noremap = true, silent = true}
-vim.keymap.set('n', '<leader>qt', toggle_diagnostics, opts)
-vim.keymap.set('n', '<leader>qN',
-               function() vim.diagnostic.goto_prev({float = false}) end, opts)
-vim.keymap.set('n', '<leader>qn',
-               function() vim.diagnostic.goto_next({float = false}) end, opts)
-vim.keymap.set('n', '<leader>qq', toggle_diagnostics_loclist, opts)
-vim.keymap.set('n', '<leader>qe', vim.diagnostic.open_float, opts)
+local opts = { noremap = true, silent = true }
+vim.keymap.set("n", "<leader>qt", toggle_diagnostics, opts)
+vim.keymap.set("n", "<leader>qN", function()
+	vim.diagnostic.goto_prev({ float = false })
+end, opts)
+vim.keymap.set("n", "<leader>qn", function()
+	vim.diagnostic.goto_next({ float = false })
+end, opts)
+vim.keymap.set("n", "<leader>qq", toggle_diagnostics_loclist, opts)
+vim.keymap.set("n", "<leader>qe", vim.diagnostic.open_float, opts)
diff --git a/modules/home/programs/terminal/nvim/default.nix b/modules/home/programs/terminal/nvim/default.nix
index b1705f8..5ed0934 100755
--- a/modules/home/programs/terminal/nvim/default.nix
+++ b/modules/home/programs/terminal/nvim/default.nix
@@ -57,7 +57,8 @@ in
         lualine-nvim # Bottom Line
         noice-nvim # UI Tweaks
         # nord-nvim # Theme
-        melange-nvim # Theme
+        # melange-nvim # Theme
+        catppuccin-nvim # Theme
         nvim-notify # Noice Dependency
         nvim-web-devicons # Dev Icons
 
diff --git a/modules/nixos/services/avahi/default.nix b/modules/nixos/services/avahi/default.nix
index a3b918d..6ec05ba 100644
--- a/modules/nixos/services/avahi/default.nix
+++ b/modules/nixos/services/avahi/default.nix
@@ -23,5 +23,11 @@ in
         workstation = true;
       };
     };
+
+    # Cloud Init
+    systemd.services.avahi-daemon = mkIf config.${namespace}.services.cloud-init.enable {
+      after = [ "cloud-final.service" ];
+      requires = [ "cloud-final.service" ];
+    };
   };
 }