diff --git a/home/redyf/apps/default.nix b/home/redyf/apps/default.nix
index 33214e3b..b4bbbebd 100644
--- a/home/redyf/apps/default.nix
+++ b/home/redyf/apps/default.nix
@@ -3,9 +3,9 @@ _: {
     # ./artix-game-launcher
     ./discord
     # ./davinci-resolve
-    ./emacs
+    # ./emacs
     ./firefox
-    ./insomnia
+    # ./insomnia
     ./misc
     ./obs
     # ./vscode
diff --git a/home/redyf/cli-apps/starship/default.nix b/home/redyf/cli-apps/starship/default.nix
index b5b3b7c0..407701d7 100644
--- a/home/redyf/cli-apps/starship/default.nix
+++ b/home/redyf/cli-apps/starship/default.nix
@@ -33,42 +33,90 @@
         '';
 
         palette = "catppuccin_${flavour}";
+
+        aws = {
+          format = "on [$symbol($profile )(\($region) )]($style)";
+          style = "bold blue";
+          symbol = " ";
+        };
+
+        dart = {
+          format = "via [$symbol($version )]($style)";
+          symbol = "[]($style) ";
+          style = "bold blue";
+        };
+
+        docker_context = {
+          disabled = true;
+        };
+
+        elixir = {
+          format = "via [$symbol($version \(OTP $otp_version\) )]($style)";
+          symbol = " ";
+          style = "bold purple";
+        };
+
         git_branch = {
+          format = "on [$symbol$branch(:$remote_branch)]($style) ";
           symbol = " ";
+          style = "bold purple";
+        };
+
+        git_commit = {
+          format = "[\($hash$tag\)]($style) ";
+          commit_hash_length = 7;
+          style = "bold green";
         };
-        git_commit = {commit_hash_length = 5;};
 
         golang = {
-          format = "[ ]($style)";
+          format = "via [$symbol($version )]($style)";
           style = "bold blue";
+          symbol = "[ ]($style)";
         };
 
-        dart = {
-          symbol = "[]($style) ";
-          style = "bold blue";
+        kubernetes = {
+          symbol = "☸ ";
+          disabled = false;
+          detect_files = ["Dockerfile"];
+          format = "[$context(\[$namespace\])]($style) ";
         };
 
         lua = {
+          format = "via [$symbol($version )]($style)";
           symbol = "[]($style) ";
           style = "bold blue";
         };
 
+        nix_shell = {
+          format = "via [$symbol$state( \($name\))]($style) ";
+          symbol = "󱄅 ";
+          style = "bold blue";
+          disabled = false;
+        };
+
         nodejs = {
+          format = "via [$symbol($version )]($style)";
+          style = "bold green";
+          symbol = " ";
           version_format = "v$raw(blue)";
         };
 
         package = {
-          symbol = "📦";
+          format = "is [$symbol$version]($style) ";
+          symbol = " ";
+          style = "bold 208";
         };
 
         python = {
+          format = "via [$symbol$pyenv_prefix($version )(\($virtualenv\) )]($style)";
           symbol = "[]($style) ";
           style = "bold blue";
         };
 
         rust = {
+          format = "via [$symbol($version )]($style)";
           symbol = "[]($style) ";
-          style = "bold blue";
+          style = "bold #f74b00";
         };
 
         shell = {
@@ -76,31 +124,6 @@
           zsh_indicator = "zsh";
         };
 
-        aws = {
-          format = "on [$symbol($profile )(\($region) )]($style)";
-          style = "bold blue";
-          symbol = "  ";
-        };
-
-        kubernetes = {
-          symbol = "☸ ";
-          disabled = false;
-          detect_files = ["Dockerfile"];
-          format = "[$context(\[$namespace\])]($style) ";
-        };
-
-        docker_context = {
-          disabled = true;
-        };
-
-        # nix_shell = {
-        #   disabled = false;
-        #   heuristic = false;
-        #   impure_msg = "[impure-shell](red)";
-        #   pure_msg = "[pure-shell](green)";
-        #   unknown_msg = "[unknown-shell](yellow)";
-        # };
-
         custom = {
           nix = {
             disabled = true;
diff --git a/home/redyf/desktop/addons/kitty/custom-mocha.nix b/home/redyf/desktop/addons/kitty/custom-mocha.nix
new file mode 100644
index 00000000..3f7e891d
--- /dev/null
+++ b/home/redyf/desktop/addons/kitty/custom-mocha.nix
@@ -0,0 +1,37 @@
+''
+  background #11111B
+
+  # Cursor
+  cursor #cba6f7
+
+  # Border
+  active_border_color #78a9ff
+  inactive_border_color #535353
+  bell_border_color #3ddbd9
+
+  # Tabs
+  active_tab_background #78a9ff
+  active_tab_foreground #0c0c0c
+  inactive_tab_background #2a2a2a
+  inactive_tab_foreground #6e6f70
+
+  # normal
+  color0 #11111B
+  color1 #ff5555
+  color2 #afffd7
+  color3 #f1fa8c
+  color4 #87afff
+  color5 #bd93f9
+  color6 #8be9fd
+  color7 #f8f8f2
+
+  # bright
+  color8 #2d5b69
+  color9 #ff665c
+  color10 #84c747
+  color11 #ebc13d
+  color12 #58a3ff
+  color13 #ff84cd
+  color14 #53d6c7
+  color15 #cad8d9
+''
diff --git a/home/redyf/desktop/addons/kitty/default.nix b/home/redyf/desktop/addons/kitty/default.nix
index 7bd277db..44b4a85c 100644
--- a/home/redyf/desktop/addons/kitty/default.nix
+++ b/home/redyf/desktop/addons/kitty/default.nix
@@ -5,14 +5,14 @@
       enableZshIntegration = true;
       mode = "no-cursor";
     };
-    theme = "Catppuccin-Mocha";
+    # theme = "Catppuccin-Mocha";
     font = {
-      # name = "MonoLisa";
-      # name = "Liga SfMono Nerd Font";
       # name = "Berkeley Mono Regular Nerd Font Complete";
-      name = "LiterationMono Nerd Font";
-      size = 11;
+      name = "FiraMono Nerd Font";
+      # name = "LiterationMono Nerd Font";
+      # name = "MonoLisa";
       # package = pkgs.monolisa-script;
+      size = 11;
     };
     # https://www.monolisa.dev/faq#how-to-enable-stylistic-sets-for-the-kitty-terminal
     extraConfig = ''
@@ -62,6 +62,7 @@
       term = "xterm-256color";
 
       # Themes
+      include = "themes/custom-mocha.conf";
       # include = "themes/oxocarbon-dark.conf";
       # terminal_select_modifiers = "alt";
 
@@ -115,9 +116,10 @@
       #     "kitty/themes/lunar.conf".text = import ./lunar.nix;
       #     "kitty/themes/mocha.conf".text = import ./mocha.nix;
       #     "kitty/themes/macchiato.conf".text = import ./macchiato.nix;
+      "kitty/themes/custom-mocha.conf".text = import ./custom-mocha.nix;
       #     "kitty/themes/tokyonight_night.conf".text = import ./tokyonight_night.nix;
       #     "kitty/themes/rose-pine.conf".text = import ./rose-pine.nix;
-      "kitty/themes/oxocarbon-dark.conf".text = import ./oxocarbon.nix;
+      #     "kitty/themes/oxocarbon-dark.conf".text = import ./oxocarbon.nix;
     };
   };
 }
diff --git a/home/redyf/desktop/hyprland/default.nix b/home/redyf/desktop/hyprland/default.nix
index b18d60e7..68a5e287 100644
--- a/home/redyf/desktop/hyprland/default.nix
+++ b/home/redyf/desktop/hyprland/default.nix
@@ -109,9 +109,9 @@ in {
       };
 
       general = {
-        gaps_in = 1;
-        gaps_out = 2;
-        border_size = 3;
+        gaps_in = 0;
+        gaps_out = 0;
+        border_size = 0;
         "col.active_border" = "${catppuccin_border}";
         "col.inactive_border" = "${tokyonight_border}";
         layout = "dwindle";
@@ -119,9 +119,9 @@ in {
       };
 
       decoration = {
-        rounding = 12;
+        rounding = 0;
         shadow_ignore_window = true;
-        drop_shadow = true;
+        drop_shadow = false;
         shadow_range = 20;
         shadow_render_power = 3;
         "col.shadow" = "rgb(${oxocarbon_background})";