diff --git a/config/kitty/diff.conf b/config/kitty/diff.conf
new file mode 120000
index 0000000..848f6c3
--- /dev/null
+++ b/config/kitty/diff.conf
@@ -0,0 +1 @@
+/nix/store/p1324gwzjhbv6njfdv7wdfswgsdkv6jl-home-manager-files/.config/kitty/diff.conf
\ No newline at end of file
diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf
deleted file mode 100644
index 04fa82e..0000000
--- a/config/kitty/kitty.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-background_opacity 0.3
-enable_audio_bell no
-enable_wayland_portal no
-detect_system_theme no
-# BEGIN_KITTY_THEME
-# Rosé Pine Moon
-#include current-theme.conf
-# END_KITTY_THEME
diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf
new file mode 120000
index 0000000..e7b1bde
--- /dev/null
+++ b/config/kitty/kitty.conf
@@ -0,0 +1 @@
+/nix/store/p1324gwzjhbv6njfdv7wdfswgsdkv6jl-home-manager-files/.config/kitty/kitty.conf
\ No newline at end of file
diff --git a/config/kitty/kitty.conf.backup b/config/kitty/kitty.conf.backup
new file mode 100644
index 0000000..04fa82e
--- /dev/null
+++ b/config/kitty/kitty.conf.backup
@@ -0,0 +1,8 @@
+background_opacity 0.3
+enable_audio_bell no
+enable_wayland_portal no
+detect_system_theme no
+# BEGIN_KITTY_THEME
+# Rosé Pine Moon
+#include current-theme.conf
+# END_KITTY_THEME
diff --git a/flake.nix b/flake.nix
index c752683..9e8e59f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -71,7 +71,7 @@
         inputs.disko.nixosModules.disko
         stylix.nixosModules.stylix
         agenix.nixosModules.default
-        ./modules/home-manager/stylix.nix
+        #./modules/home-manager/stylix.nix
         {
           home-manager = {
             useGlobalPkgs = true;
@@ -80,7 +80,10 @@
             backupFileExtension = "backup";
 
             users.tulg = {
-              imports = [./modules/home-manager/home.nix];
+              imports = [
+                ./modules/home-manager/home.nix
+                stylix.homeModules.stylix
+              ];
             };
           };
         }
@@ -96,7 +99,7 @@
         inputs.disko.nixosModules.disko
         stylix.nixosModules.stylix
         agenix.nixosModules.default
-        ./modules/home-manager/stylix.nix
+        #./modules/home-manager/stylix.nix
         {
           home-manager = {
             useGlobalPkgs = true;
@@ -105,7 +108,10 @@
             backupFileExtension = "backup";
 
             users.tulg = {
-              imports = [./modules/home-manager/home.nix];
+              imports = [
+                ./modules/home-manager/home.nix
+                stylix.homeModules.stylix
+              ];
             };
           };
         }
@@ -121,7 +127,7 @@
         inputs.disko.nixosModules.disko
         agenix.nixosModules.default
         stylix.nixosModules.stylix
-        ./modules/home-manager/stylix.nix
+        #./modules/home-manager/stylix.nix
         {
           home-manager = {
             useGlobalPkgs = true;
@@ -130,7 +136,10 @@
             backupFileExtension = "backup";
 
             users.tulg = {
-              imports = [./modules/home-manager/home.nix];
+              imports = [
+                ./modules/home-manager/home.nix
+                stylix.homeModules.stylix
+              ];
             };
           };
         }
diff --git a/modules/home-manager/cli/default.nix b/modules/home-manager/cli/default.nix
index 891c57a..836c7a0 100644
--- a/modules/home-manager/cli/default.nix
+++ b/modules/home-manager/cli/default.nix
@@ -3,5 +3,6 @@
     ./yazi.nix
     ./shell.nix
     ./zellij.nix
+    ./fastfetch.nix
   ];
 }
diff --git a/modules/home-manager/cli/fastfetch.nix b/modules/home-manager/cli/fastfetch.nix
new file mode 100644
index 0000000..bf88289
--- /dev/null
+++ b/modules/home-manager/cli/fastfetch.nix
@@ -0,0 +1,87 @@
+{
+  programs.fastfetch = {
+    enable = false;
+    settings = {
+      display = {
+        separator = "  ";
+      };
+      modules = [
+        {
+          type = "os";
+          key = " OS";
+          keyColor = "yellow";
+        }
+        {
+          type = "kernel";
+          key = "│ ├";
+          keyColor = "yellow";
+        }
+        {
+          type = "packages";
+          key = "│ ├󰏖";
+          keyColor = "yellow";
+        }
+        {
+          type = "shell";
+          key = "│ └";
+          keyColor = "yellow";
+        }
+        {
+          type = "wm";
+          key = " wm";
+          keyColor = "blue";
+        }
+        {
+          type = "lm";
+          key = "│ ├󰧨";
+          keyColor = "blue";
+        }
+        {
+          type = "terminal";
+          key = "│ └";
+          keyColor = "blue";
+        }
+        {
+          type = "host";
+          key = " HOST";
+          keyColor = "green";
+        }
+        {
+          type = "cpu";
+          key = "│ ├";
+          keyColor = "green";
+        }
+        {
+          type = "gpu";
+          key = "│ ├󰍛";
+          keyColor = "green";
+        }
+        {
+          type = "disk";
+          key = "│ ├";
+          keyColor = "green";
+        }
+        {
+          type = "memory";
+          key = "│ ├󰑭";
+          keyColor = "green";
+        }
+        {
+          type = "swap";
+          key = "│ ├󰓡";
+          keyColor = "green";
+        }
+        {
+          type = "uptime";
+          key = "│ ├󰅐";
+          keyColor = "green";
+        }
+        {
+          type = "display";
+          key = "│ └󰍹";
+          keyColor = "green";
+        }
+      ];
+    };
+  };
+}
diff --git a/modules/home-manager/cli/shell.nix b/modules/home-manager/cli/shell.nix
index 0b5d6e7..2016856 100644
--- a/modules/home-manager/cli/shell.nix
+++ b/modules/home-manager/cli/shell.nix
@@ -14,7 +14,13 @@
       PS1="\[\e[38;5;177m\]\u\[\e[38;5;220m\]@\[\e[38;5;1m\]\h \[\e[38;5;33m\]\w \[\033[0m\]\$ "
     '';
   };
-
+  programs.kitty = {
+    enable = true;
+    extraConfig = ''
+      background_opacity 0.3
+      enable_audio_bell no
+    '';
+  };
   programs.git = {
     enable = true;
     settings = {
@@ -22,90 +28,6 @@
       user.email = "tulg@protonmail.ch";
     };
   };
-  programs.fastfetch = {
-    enable = true;
-    settings = {
-      display = {
-        separator = "  ";
-      };
-      modules = [
-        {
-          type = "os";
-          key = " OS";
-          keyColor = "yellow";
-        }
-        {
-          type = "kernel";
-          key = "│ ├";
-          keyColor = "yellow";
-        }
-        {
-          type = "packages";
-          key = "│ ├󰏖";
-          keyColor = "yellow";
-        }
-        {
-          type = "shell";
-          key = "│ └";
-          keyColor = "yellow";
-        }
-        {
-          type = "wm";
-          key = " wm";
-          keyColor = "blue";
-        }
-        {
-          type = "lm";
-          key = "│ ├󰧨";
-          keyColor = "blue";
-        }
-        {
-          type = "terminal";
-          key = "│ └";
-          keyColor = "blue";
-        }
-        {
-          type = "host";
-          key = " HOST";
-          keyColor = "green";
-        }
-        {
-          type = "cpu";
-          key = "│ ├";
-          keyColor = "green";
-        }
-        {
-          type = "gpu";
-          key = "│ ├󰍛";
-          keyColor = "green";
-        }
-        {
-          type = "disk";
-          key = "│ ├";
-          keyColor = "green";
-        }
-        {
-          type = "memory";
-          key = "│ ├󰑭";
-          keyColor = "green";
-        }
-        {
-          type = "swap";
-          key = "│ ├󰓡";
-          keyColor = "green";
-        }
-        {
-          type = "uptime";
-          key = "│ ├󰅐";
-          keyColor = "green";
-        }
-        {
-          type = "display";
-          key = "│ └󰍹";
-          keyColor = "green";
-        }
-      ];
-    };
-  };
+
   programs.zsh.enable = true;
 }
diff --git a/modules/home-manager/cli/zellij.nix b/modules/home-manager/cli/zellij.nix
index a7e5460..2f2c523 100644
--- a/modules/home-manager/cli/zellij.nix
+++ b/modules/home-manager/cli/zellij.nix
@@ -5,7 +5,7 @@
     settings = {
       theme = "rose-pine";
       pane_frames = false;
-      default_layout = "compact";
+      show_startup_tips = false;
     };
   };
 }
diff --git a/modules/home-manager/desktop/symlink.nix b/modules/home-manager/desktop/symlink.nix
index 21afd1c..806fc7d 100644
--- a/modules/home-manager/desktop/symlink.nix
+++ b/modules/home-manager/desktop/symlink.nix
@@ -10,10 +10,10 @@ in {
     source = link "${dots}/waybar";
     recursive = true;
   };
-  xdg.configFile."kitty" = {
-    source = link "${dots}/kitty";
-    recursive = true;
-  };
+  # xdg.configFile."kitty" = {
+  #   source = link "${dots}/kitty";
+  #   recursive = true;
+  # };
   xdg.configFile."wofi" = {
     source = link "${dots}/wofi";
     recursive = true;
diff --git a/modules/home-manager/desktop/vscode.nix b/modules/home-manager/desktop/vscode.nix
index 6e1c008..36998f5 100644
--- a/modules/home-manager/desktop/vscode.nix
+++ b/modules/home-manager/desktop/vscode.nix
@@ -10,7 +10,7 @@
       pkgs.vscode-extensions.jnoortheen.nix-ide
       pkgs.vscode-extensions.leonardssh.vscord
     ];
-    userSettings = {
+    profiles.default.userSettings = {
       "nix.formatterPath" = "alejandra";
       "nix.extraOptions" = ''
         experimental-features = nix-command flakes
diff --git a/modules/home-manager/home.nix b/modules/home-manager/home.nix
index 449688a..9198578 100644
--- a/modules/home-manager/home.nix
+++ b/modules/home-manager/home.nix
@@ -8,6 +8,7 @@
     ./cli/default.nix
     ./desktop/default.nix
     ./pkgs.nix
+    ./stylix.nix
   ];
   # Home Manager settings
   nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"];
diff --git a/modules/home-manager/pkgs.nix b/modules/home-manager/pkgs.nix
index d2b8669..0462242 100644
--- a/modules/home-manager/pkgs.nix
+++ b/modules/home-manager/pkgs.nix
@@ -12,7 +12,6 @@
     restic
     rose-pine-gtk-theme
     alejandra
-
     prismlauncher
     arc-theme
     cliphist
@@ -20,7 +19,7 @@
     mpv
     vulkan-tools
     pkgs.looking-glass-client
-
+    fastfetch
     btop
     nicotine-plus
     strawberry
diff --git a/modules/home-manager/stylix.nix b/modules/home-manager/stylix.nix
index 42f2295..dfe7e4d 100644
--- a/modules/home-manager/stylix.nix
+++ b/modules/home-manager/stylix.nix
@@ -5,34 +5,27 @@
   ...
 }: {
   fonts.fontconfig.enable = true;
-  fonts.packages = with pkgs; [
-    #    noto-fonts-color-emoji
-    fira
-    fira-sans
-    fira-code
-    dejavu_fonts
-    nerd-fonts.jetbrains-mono
-    nerd-fonts.iosevka
-  ];
+  programs.kitty.font.name = "Fira Code";
   stylix = {
     enable = true;
-
+    targets.firefox.enable = false;
+    targets.zen-browser.enable = false;
     base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine.yaml";
 
     fonts = {
       serif = {
         package = pkgs.fira;
-        name = "Fira Sans Regular";
+        name = "Fira Sans";
       };
 
       sansSerif = {
         package = pkgs.fira;
-        name = "Fira Sans Regular";
+        name = "Fira Sans";
       };
 
       monospace = {
-        package = pkgs.fira;
-        name = "Fira Sans Regular";
+        package = pkgs.fira-code;
+        name = "Fira Code";
       };
 
       emoji = {
@@ -47,13 +40,5 @@
         popups = 10;
       };
     };
-
-    # targets.rofi.enable = false;
-    #    image = ../../assets/Shogoki.png;
-
-    # opacity = {
-    #   desktop = 0.5;
-    #   terminal = 0.9;
-    # };
   };
 }