diff --git a/defaults/base/default.nix b/defaults/base/default.nix
index 83bab42..f6b5cf6 100644
--- a/defaults/base/default.nix
+++ b/defaults/base/default.nix
@@ -33,7 +33,11 @@ in {
   boot.tmp.useTmpfs = true;
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
+
+  catppuccin.flavour = "mocha";
+
   console.keyMap = "de_CH-latin1";
+  console.catppuccin.enable = true;
   i18n.defaultLocale = "en_US.UTF-8";
 
   users.mutableUsers = false;
diff --git a/flake.lock b/flake.lock
index 4d9da52..e4d5820 100644
--- a/flake.lock
+++ b/flake.lock
@@ -42,11 +42,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1712462372,
-        "narHash": "sha256-WA3bbBWhd3o1wAgyHZNypjb/LG4oq+IWxFq8ey8yNPU=",
+        "lastModified": 1712688495,
+        "narHash": "sha256-NrVLXkpT9ZigiI8md6NIzHS+3lE4QTj30IgXG57O9iM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a561ad6ab38578c812cc9af3b04f2cc60ebf48c9",
+        "rev": "b00d0e4fe9cba0047f54e77418ddda5f17e6ef2c",
         "type": "github"
       },
       "original": {
@@ -58,11 +58,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1712324865,
-        "narHash": "sha256-+BatEWd4HlMeK7Ora+gYIkarjxFVCg9oKrIeybHIIX4=",
+        "lastModified": 1712695607,
+        "narHash": "sha256-rXb3onsPMiv00FrGSpIJyYa8x53W0dlbJ5Ka3xvje/c=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "f3b959627bca46a9f7052b8fbc464b8323e68c2c",
+        "rev": "05aa46a1f3b5ac92bfe84807868ba9670d48b031",
         "type": "github"
       },
       "original": {
@@ -73,11 +73,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1712439257,
-        "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=",
+        "lastModified": 1712608508,
+        "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599",
+        "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6",
         "type": "github"
       },
       "original": {
@@ -89,11 +89,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1712439257,
-        "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=",
+        "lastModified": 1712608508,
+        "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599",
+        "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6",
         "type": "github"
       },
       "original": {
diff --git a/home/fhauser/applications/alacritty.nix b/home/fhauser/applications/alacritty.nix
deleted file mode 100644
index e1599eb..0000000
--- a/home/fhauser/applications/alacritty.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ pkgs, ... }: {
-  programs.alacritty = {
-    enable = true;
-    settings.window.opacity = 0.95;
-  };
-}
diff --git a/home/fhauser/applications/catppuccin.nix b/home/fhauser/applications/catppuccin.nix
new file mode 100644
index 0000000..f51763a
--- /dev/null
+++ b/home/fhauser/applications/catppuccin.nix
@@ -0,0 +1,3 @@
+{ pkgs, lib, ... }: {
+  catppuccin.flavour = "mocha";
+}
diff --git a/home/fhauser/applications/default.nix b/home/fhauser/applications/default.nix
index 4b6ca0d..1d160de 100644
--- a/home/fhauser/applications/default.nix
+++ b/home/fhauser/applications/default.nix
@@ -7,6 +7,7 @@
     ./firefox.nix
     ./gpg.nix
     ./ssh.nix
+    ./catppuccin.nix
     ./scripts.nix
     ./webapps.nix
     ./vim.nix
@@ -14,7 +15,7 @@
     ./waybar.nix
     ./psql.nix
     ./mako.nix
-    ./alacritty.nix
+    ./kitty.nix
     ./shell.nix
     ./swaylock.nix
     ./kanshi.nix
diff --git a/home/fhauser/applications/git.nix b/home/fhauser/applications/git.nix
index 77fb13c..d664ae5 100644
--- a/home/fhauser/applications/git.nix
+++ b/home/fhauser/applications/git.nix
@@ -19,6 +19,7 @@
     };
     #delta = {
     #  enable = true;
+    #  catppuccin.enable = true;
     #  options = {
     #    side-by-side = "true";
 
diff --git a/home/fhauser/applications/gpg.nix b/home/fhauser/applications/gpg.nix
index 753925d..04ac644 100644
--- a/home/fhauser/applications/gpg.nix
+++ b/home/fhauser/applications/gpg.nix
@@ -35,7 +35,7 @@
     enableScDaemon = true;
     enableSshSupport = true;
     enableExtraSocket = true;
-    pinentryFlavor = null;
+    # TODO: pinentryPackage = 
     extraConfig = let
       pinentryBemenu = pkgs.writeShellApplication {
         name = "pinentry-bemenu-with-env";
diff --git a/home/fhauser/applications/kitty.nix b/home/fhauser/applications/kitty.nix
new file mode 100644
index 0000000..d485d0d
--- /dev/null
+++ b/home/fhauser/applications/kitty.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }: {
+  programs.kitty = {
+    enable = true;
+    catppuccin.enable = true;
+  };
+}
diff --git a/home/fhauser/applications/mako.nix b/home/fhauser/applications/mako.nix
index 3b15c26..d8a8480 100644
--- a/home/fhauser/applications/mako.nix
+++ b/home/fhauser/applications/mako.nix
@@ -1,7 +1,8 @@
 { pkgs, ... }: {
   services.mako = {
     enable = true;
-    backgroundColor = "#CCCCCCCC"; # TODO: Make layout colors in a central place
+    catppuccin.enable = true;
+    #backgroundColor = "#CCCCCCCC"; # TODO: Make layout colors in a central place
     borderSize = 0;
     #borderColor = "#4C7899FF";
     defaultTimeout = 1500;
diff --git a/home/fhauser/applications/sway.nix b/home/fhauser/applications/sway.nix
index fb0d28f..15f467d 100644
--- a/home/fhauser/applications/sway.nix
+++ b/home/fhauser/applications/sway.nix
@@ -31,6 +31,7 @@ in rec {
     systemd.enable = true;
     xwayland = true;
     wrapperFeatures = { gtk = true; };
+    catppuccin.enable = true;
     extraSessionCommands = ''
       #export XDG_CURRENT_DESKTOP=Unity
       export XDG_CURRENT_DESKTOP=sway
@@ -50,7 +51,7 @@ in rec {
         };
         "*" = { xkb_numlock = "enable"; };
       };
-      terminal = "${pkgs.alacritty}/bin/alacritty";
+      terminal = "${pkgs.kitty}/bin/kitty";
       menu = "${bemenuLauncher}/bin/bemenuLauncher";
       gaps.inner = 8;
       modifier = "Mod4";
@@ -159,6 +160,7 @@ in rec {
       name = "hicolor";
     };
     gtk3.extraConfig.gtk-menu-images = true;
+    catppuccin.enable = true;
   };
 
   dconf.settings = { "org/gnome/desktop/interface".menus-have-icons = true; };
diff --git a/home/fhauser/applications/swaylock.nix b/home/fhauser/applications/swaylock.nix
index da97606..a30f16b 100644
--- a/home/fhauser/applications/swaylock.nix
+++ b/home/fhauser/applications/swaylock.nix
@@ -30,4 +30,6 @@
     };
     Install = { WantedBy = [ "sway-session.target" ]; };
   };
+
+  programs.swaylock.catppuccin.enable = true;
 }
diff --git a/home/fhauser/applications/vim.nix b/home/fhauser/applications/vim.nix
index bc7426d..78d4864 100644
--- a/home/fhauser/applications/vim.nix
+++ b/home/fhauser/applications/vim.nix
@@ -1,13 +1,22 @@
 { pkgs, ... }: {
-  programs.vim = {
+  programs.neovim = {
     enable = true;
+    defaultEditor  = true;
+    viAlias = true;
+    vimAlias = true;
+    vimdiffAlias = true;
+    catppuccin.enable = true;
     extraConfig = ''
-      colorscheme elflord
+      " colorscheme elflord
       set autoindent
       set ruler
       set pastetoggle=<F2>
       set splitbelow
       set splitright
+      set mouse=
+      set hidden
+      set expandtab
+      set ignorecase
 
       set tabstop=2
       set softtabstop=2
@@ -42,13 +51,5 @@
       syntax on
     '';
     plugins = with pkgs.vimPlugins; [ vim-sensible vim-airline ];
-    settings = {
-      background = "dark";
-      ignorecase = true;
-      mouse = "n";
-      hidden = true;
-      expandtab = true;
-    };
-
   };
 }