diff --git a/.config/home-manager/theme.nix b/.config/home-manager/theme.nix
index f29abc3..1e020e1 100644
--- a/.config/home-manager/theme.nix
+++ b/.config/home-manager/theme.nix
@@ -4,8 +4,8 @@
 
   stylix = {
     enable = true;
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine-moon.yaml";
-    #base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
+    #base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine-moon.yaml";
+    base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
     polarity = "dark";
 
     fonts = {
@@ -26,8 +26,14 @@
     
     icons = {
       enable = true;
-      package = pkgs.papirus-icon-theme;
-      dark = "Papirus-Dark";
+
+      # Papyrus Dark
+      #package = pkgs.papirus-icon-theme;
+      #dark = "Papirus-Dark";
+      
+      # Fluent
+      package = pkgs.fluent-icon-theme;
+      dark = "Fluent";
     };
 
     targets.nixos-icons.enable = true;
@@ -37,7 +43,8 @@
     };
   };
 
-  programs.kitty.themeFile = "rose-pine-moon";
+  #programs.kitty.themeFile = "rose-pine-moon";
+  programs.kitty.themeFile = "Catppuccin-Mocha";
   programs.kitty.settings = {  
     background_opacity = lib.mkForce 0.8;
     confirm_os_window_close = 0;
diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index 76795bc..b859c31 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -50,7 +50,8 @@ exec-once = dms run
 exec-once = hypridle
 exec-once = nextcloud
 exec-once = systemctl --user start hyprpolkitagent
-exec-once = mailspring --password-store="gnome-libsecret"
+#exec-once = mailspring --password-store="gnome-libsecret"
+exec-once = geary
 exec-once = kitty
 exec-once = telegram-desktop
 exec-once = flatpak run app.zen_browser.zen 
diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf
index 1661401..63b78f3 120000
--- a/.config/kitty/kitty.conf
+++ b/.config/kitty/kitty.conf
@@ -1 +1 @@
-/nix/store/s5ay1yl5pcyjrgycsffjzhzlhnpv22yp-home-manager-files/.config/kitty/kitty.conf
\ No newline at end of file
+/nix/store/58yrg5dd8hrmj6vn5j28wmz08rjsx3jy-home-manager-files/.config/kitty/kitty.conf
\ No newline at end of file
diff --git a/.config/niri/config.kdl b/.config/niri/config.kdl
index 401b7e6..9941b34 100644
--- a/.config/niri/config.kdl
+++ b/.config/niri/config.kdl
@@ -153,6 +153,8 @@ spawn-at-startup "vesktop"
 spawn-at-startup "steam"
 spawn-at-startup "geary"
 spawn-at-startup "kitty"
+spawn-at-startup "kitty"
+spawn-at-startup "kitty"
 spawn-at-startup "app.zen_browser.zen"
 spawn-at-startup "nextcloud"
 spawn-at-startup "element-desktop"