diff --git a/bash/.bashrc.d/git.bash b/bash/.bashrc.d/git.bash
index d180b3b..d3024da 100644
--- a/bash/.bashrc.d/git.bash
+++ b/bash/.bashrc.d/git.bash
@@ -1,16 +1,14 @@
+# Git + Colorful Prompt
 if [ -f "/usr/share/git/completion/git-prompt.sh" ]; then
   source /usr/share/git/completion/git-prompt.sh
-  export GIT_PS1_SHOWDIRTYSTATE=1      # shows * if unstaged, + if staged
-  export GIT_PS1_SHOWSTASHSTATE=1      # shows $ if stashed
-  export GIT_PS1_SHOWUNTRACKEDFILES=1  # shows % if untracked files
-  export GIT_PS1_SHOWUPSTREAM="auto"   # shows < > = behind/ahead/equal
-  export GIT_PS1_SHOWDIRTYSTATE=
-  export GIT_PS1_SHOWSTASHSTATE=
-  export GIT_PS1_SHOWUNTRACKEDFILES=
-  export GIT_PS1_SHOWUPSTREAM=
 
-  PS1='\[\e[32m\]\u@\h\[\e[0m\] \W$(__git_ps1) \$ '
+  export GIT_PS1_SHOWDIRTYSTATE=1
+  export GIT_PS1_SHOWSTASHSTATE=1
+  export GIT_PS1_SHOWUNTRACKEDFILES=1
+  export GIT_PS1_SHOWUPSTREAM="auto"
+
+  # Bright green user@host (what you liked)
+  PS1='\[\e[1;38;5;46m\]\u@\h\[\e[0m\] \[\e[38;5;51m\]\w\[\e[0m\]\[\e[90m\]$(__git_ps1 " (%s)")\[\e[0m\] \$ '
 else
-  printf "Cannot find /usr/share/git/completion/git-prompt.sh\n"
-  PS1='[\u@\h \W]\$ '
+  PS1='\[\e[1;38;5;46m\]\u@\h\[\e[0m\] \[\e[38;5;51m\]\w\[\e[0m\] \$ '
 fi
\ No newline at end of file
diff --git a/bash/.bashrc.d/ruff.bash b/bash/.bashrc.d/ruff.bash
index 7b99bdd..4b06343 100644
--- a/bash/.bashrc.d/ruff.bash
+++ b/bash/.bashrc.d/ruff.bash
@@ -1 +1,2 @@
-eval "$(ruff generate-shell-completion bash)"
+# Ruff completion
+command -v ruff >/dev/null && eval "$(ruff generate-shell-completion bash 2>/dev/null)"
\ No newline at end of file
diff --git a/bash/.editorconfig b/bash/.editorconfig
new file mode 100644
index 0000000..3bc7db2
--- /dev/null
+++ b/bash/.editorconfig
@@ -0,0 +1,38 @@
+# ~/.editorconfig
+
+root = true
+
+# Default for all files
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+# Shell scripts: 2 spaces, no tabs
+[*.sh]
+indent_style = space
+indent_size = 2
+
+[*.bash]
+indent_style = space
+indent_size = 2
+
+[*.bats]
+indent_style = space
+indent_size = 2
+
+[*.cmd]
+indent_style = space
+indent_size = 2
+end_of_line = crlf
+
+[*.bat]
+indent_style = space
+indent_size = 2
+end_of_line = crlf
+
+# Also apply to Makefile if you want (optional)
+[Makefile]
+indent_style = tab
+indent_size = 4
\ No newline at end of file
diff --git a/ghostty/.config/ghostty/config.ghostty b/ghostty/.config/ghostty/config.ghostty
index 1ff2312..95778c5 100644
--- a/ghostty/.config/ghostty/config.ghostty
+++ b/ghostty/.config/ghostty/config.ghostty
@@ -493,16 +493,18 @@ freetype-load-flags = hinting,no-force-autohint,no-monochrome,autohint,light
 # be fixed in a future update:
 #
 #   - macOS: titlebar tabs style is not updated when switching themes.
-theme = Terminal Basic Dark
-
+# theme = Terminal Basic Dark
+# theme = catppuccin-mocha
+theme = Catppuccin Mocha
 # Background color for the window.
 # Specified as either hex (`#RRGGBB` or `RRGGBB`) or a named X11 color.
-background = #282c34
+# background = #282c34
+background = #1e1e2e
 
 # Foreground color for the window.
 # Specified as either hex (`#RRGGBB` or `RRGGBB`) or a named X11 color.
-foreground = #ffffff
-
+# foreground = #ffffff
+foreground = #cdd6f4
 # Background image for the terminal.
 #
 # This should be a path to a PNG or JPEG file, other image formats are
@@ -973,7 +975,7 @@ palette = 255=#eeeeee
 # https://gist.github.com/jake-stewart/0a8ea46159a7da2c808e5be2177e1783
 #
 # Available since: 1.3.0
-palette-generate = false
+palette-generate = true
 
 # Invert the palette colors generated when `palette-generate` is enabled,
 # so that the colors go in reverse order. This allows palette-based
@@ -4068,4 +4070,3 @@ auto-update =
 #
 # This only works on macOS since only macOS has an auto-update feature.
 auto-update-channel =
-