diff --git a/bootstrap.sh b/bootstrap.sh
index 96bb053..ba68377 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -12,8 +12,6 @@ echo "Sym-linking the various config files"
 test -L $HOME/.gitignore || ln -f -s $BASEDIR/gitignore $HOME/.gitignore
 test -L $HOME/.hushlogin || ln -f -s $BASEDIR/hushlogin $HOME/.hushlogin
 test -L $HOME/.tmux.conf || ln -f -s $BASEDIR/tmux $HOME/.tmux.conf
-test -L $HOME/.config/starship.toml || ln -f -s $BASEDIR/starship.toml $HOME/.config/starship.toml
-test -L $HOME/.config/jmb.omp.toml || ln -f -s $BASEDIR/jmb.omp.toml $HOME/.config/jmb.omp.toml
 test -d $HOME/.config/sheldon || mkdir $HOME/.config/sheldon
 test -L $HOME/.config/sheldon/plugins.toml || ln -f -s $BASEDIR/sheldon.toml $HOME/.config/sheldon/plugins.toml
 test -L $HOME/.zsh || ln -f -s $BASEDIR/zsh $HOME/.zsh
@@ -21,7 +19,11 @@ test -L $HOME/.zshrc || ln -f -s $BASEDIR/zshrc.zsh $HOME/.zshrc
 
 # If ghostty is installed on the system then setup the config
 if (( ${+commands[ghostty]} )); then
-  test -L $HOME/Library/Application\ Support/com.mitchellh.ghostty/config || ln -f -s $BASEDIR/ghostty $HOME/Library/Application\ Support/com.mitchellh.ghostty/config
+  test -d $HOME/.config/ghostty || mkdir $HOME/.config/ghostty
+  test -L $HOME/.config/ghostty/config || ln -f -s $BASEDIR/ghostty/config $HOME/.config/ghostty/config
+  test -d $HOME/.config/ghostty/themes || mkdir $HOME/.config/ghostty/themes
+  test -L $HOME/.config/ghostty/themes/tangere-dark.conf || ln -f -s $BASEDIR/ghostty/themes/tangere-dark $HOME/.config/ghostty/themes/tangere-dark.conf
+  test -L $HOME/.config/ghostty/themes/tangere-light.conf || ln -f -s $BASEDIR/ghostty/themes/tangere-light $HOME/.config/ghostty/themes/tangere-light.conf
 fi
 
 # setup gpg conf
diff --git a/ghostty b/ghostty/config
similarity index 81%
rename from ghostty
rename to ghostty/config
index 334857b..e4cdb00 100644
--- a/ghostty
+++ b/ghostty/config
@@ -10,10 +10,8 @@ font-family = MonaspiceKr NFM
 font-thicken = true
 
 # Set the theme
-#theme = Cobalt2
-#theme = light:flexoki-light,dark:flexiko-dark
-theme = light:Catppuccin Latte,dark:Catppuccin Macchiato
-#theme = light:Novel,dark:catppuccin-macchiato
+#theme = light:Catppuccin Latte,dark:Catppuccin Macchiato
+theme = light:tangere-light.conf,dark:tangere-dark.conf
 
 # Fix an issue when switching apps on macOS Ventura’s Stage Manager
 background-opacity = 0.999
diff --git a/ghostty/themes/tangere-dark b/ghostty/themes/tangere-dark
new file mode 100644
index 0000000..d0cb222
--- /dev/null
+++ b/ghostty/themes/tangere-dark
@@ -0,0 +1,22 @@
+palette = 0=#000000
+palette = 1=#f2826d
+palette = 2=#6dafb5
+palette = 3=#e0ba70
+palette = 4=#8fb4cd
+palette = 5=#bb98d9
+palette = 6=#b2babf
+palette = 7=#e6e4d3
+palette = 8=#b3b3b3
+palette = 9=#f2826d
+palette = 10=#6dafb5
+palette = 11=#ffdd99
+palette = 12=#8fb4cd
+palette = 13=#bb98d9
+palette = 14=#a9c9cc
+palette = 15=#2f4656
+background = #1a2938
+foreground = #fdfdd9
+cursor-color = #fdfdd9
+cursor-text = #fdfdd9
+selection-background = #fdfdd9
+selection-foreground = #1a2938
diff --git a/ghostty/themes/tangere-light b/ghostty/themes/tangere-light
new file mode 100644
index 0000000..7b374dc
--- /dev/null
+++ b/ghostty/themes/tangere-light
@@ -0,0 +1,22 @@
+palette = 0=#ffffff
+palette = 1=#9c341f
+palette = 2=#004c73
+palette = 3=#805619
+palette = 4=#223355
+palette = 5=#663d52
+palette = 6=#4b5363
+palette = 7=#898e99
+palette = 8=#686868
+palette = 9=#9c341f
+palette = 10=#004c73
+palette = 11=#40290a
+palette = 12=#223355
+palette = 13=#663d52
+palette = 14=#002a40
+palette = 15=#d1d1d1
+background = #fdfdfa
+foreground = #000000
+cursor-color = #ffffff
+cursor-text = #ffffff
+selection-background = #000000
+selection-foreground = #fdfdfa