diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf
index 953f9dd..fcada17 100644
--- a/.config/tmux/tmux.conf
+++ b/.config/tmux/tmux.conf
@@ -1,56 +1,8 @@
-set -g default-terminal "tmux-256color"
-set -sa terminal-features ",*:RGB"
-set -sg escape-time 0
-setw -g mode-keys vi
-set -g mouse on
+# tmux.conf
 
-#binds
-bind-key 'x' kill-pane
-bind-key 'h' previous-window
-bind-key 'j' switch-client -p
-bind-key 'k' switch-client -n
-bind-key 'l' next-window
-bind-key 'n' new-window
-bind-key 'c' kill-window
+source-file ~/.config/tmux/tmux_general.conf
+source-file ~/.config/tmux/tmux_binds.conf
+source-file ~/.config/tmux/tmux_copy_mode.conf
+source-file ~/.config/tmux/tmux_plugins.conf
+source-file ~/.config/tmux/tmux_init.conf
 
-# decide whether we're in a Vim process
-is_vim="ps -o state= -o comm= -t '#{pane_tty}' \
-    | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'"
-
-unbind y
-bind-key 'y' if-shell "$is_vim" 'send-keys F5' 'select-pane -L'
-unbind u
-bind-key 'u' if-shell "$is_vim" 'send-keys F6' 'select-pane -D'
-unbind i
-bind-key 'i' if-shell "$is_vim" 'send-keys F7' 'select-pane -U'
-unbind o
-bind-key 'o' if-shell "$is_vim" 'send-keys F8' 'select-pane -R'
-
-#copy mode
-bind -T copy-mode-vi v send -X begin-selection
-bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "xclip"
-bind P paste-buffer
-bind -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel "xclip"
-
-
-# List of plugins
-set -g @plugin 'tmux-plugins/tpm'
-set -g @plugin 'tmux-plugins/tmux-sensible'
-set -g @plugin 'catppuccin/tmux'
-set -g @plugin 'tmux-plugins/tmux-resurrect'
-set -g @plugin 'tmux-plugins/tmux-continuum'
-set -g @plugin 'tomhey/tmux-remote-sessions'
-
-#Plugin settings
-set -g @catppuccin_flavour 'frappe'
-set -g @catppuccin_window_tabs_enabled on
-set -g @resurrect-strategy-nvim 'session'
-set -g @resurrect-capture-pane-contents 'on'
-#set -g @continuum-restore 'on'
-set -g @continuum-save-interval '10'
-set -g @continuum-boot 'on'
-
-
-# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
-set-environment -g PATH "/opt/homebrew/bin:/bin:/usr/bin"
-run '~/.config/tmux/plugins/tpm/tpm'
diff --git a/.config/tmux/tmux_binds.conf b/.config/tmux/tmux_binds.conf
new file mode 100644
index 0000000..1c49a22
--- /dev/null
+++ b/.config/tmux/tmux_binds.conf
@@ -0,0 +1,24 @@
+# tmux_binds.conf
+
+# Binds
+bind-key 'x' kill-pane
+bind-key 'h' previous-window
+bind-key 'j' switch-client -p
+bind-key 'k' switch-client -n
+bind-key 'l' next-window
+bind-key 'n' new-window
+bind-key 'c' kill-window
+
+# Decide whether we're in a Vim process
+is_vim="ps -o state= -o comm= -t '#{pane_tty}' \
+    | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'"
+
+unbind y
+bind-key 'y' if-shell "$is_vim" 'send-keys F5' 'select-pane -L'
+unbind u
+bind-key 'u' if-shell "$is_vim" 'send-keys F6' 'select-pane -D'
+unbind i
+bind-key 'i' if-shell "$is_vim" 'send-keys F7' 'select-pane -U'
+unbind o
+bind-key 'o' if-shell "$is_vim" 'send-keys F8' 'select-pane -R'
+
diff --git a/.config/tmux/tmux_copy_mode.conf b/.config/tmux/tmux_copy_mode.conf
new file mode 100644
index 0000000..c2c4d06
--- /dev/null
+++ b/.config/tmux/tmux_copy_mode.conf
@@ -0,0 +1,8 @@
+# tmux_copy_mode.conf
+
+# Copy mode
+bind -T copy-mode-vi v send -X begin-selection
+bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "pbcopy"
+bind P paste-buffer
+bind -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel "pbcopy"
+
diff --git a/.config/tmux/tmux_general.conf b/.config/tmux/tmux_general.conf
new file mode 100644
index 0000000..8c20e63
--- /dev/null
+++ b/.config/tmux/tmux_general.conf
@@ -0,0 +1,16 @@
+# tmux_general.conf
+
+set -g default-terminal "tmux-256color"
+set -sa terminal-features ",*:RGB"
+set -sg escape-time 0
+set -g mouse on
+set -g base-index 1
+set -g pane-base-index 1
+set -g detach-on-destroy off
+set -g history-limit 10000
+set -g set-clipboard on
+set -g status-position top  
+set -g renumber-windows on
+setw -g mode-keys vi
+set -g pane-active-border-style 'fg=magenta,bg=default'
+set -g pane-border-style 'fg=brightblack,bg=default'
diff --git a/.config/tmux/tmux_init.conf b/.config/tmux/tmux_init.conf
new file mode 100644
index 0000000..11faff1
--- /dev/null
+++ b/.config/tmux/tmux_init.conf
@@ -0,0 +1,6 @@
+# tmux_init.conf
+
+# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
+set-environment -g PATH "/opt/homebrew/bin:/bin:/usr/bin"
+run '~/.config/tmux/plugins/tpm/tpm'
+
diff --git a/.config/tmux/tmux_plugins.conf b/.config/tmux/tmux_plugins.conf
new file mode 100644
index 0000000..f131165
--- /dev/null
+++ b/.config/tmux/tmux_plugins.conf
@@ -0,0 +1,19 @@
+# tmux_plugins.conf
+
+# List of plugins
+set -g @plugin 'tmux-plugins/tpm'
+set -g @plugin 'tmux-plugins/tmux-sensible'
+set -g @plugin 'catppuccin/tmux'
+set -g @plugin 'tmux-plugins/tmux-resurrect'
+set -g @plugin 'tmux-plugins/tmux-continuum'
+set -g @plugin 'tomhey/tmux-remote-sessions'
+
+# Plugin settings
+set -g @catppuccin_flavour 'frappe'
+set -g @catppuccin_window_tabs_enabled on
+set -g @resurrect-strategy-nvim 'session'
+set -g @resurrect-capture-pane-contents 'on'
+#set -g @continuum-restore 'on'
+set -g @continuum-save-interval '10'
+set -g @continuum-boot 'on'
+
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
new file mode 100644
index 0000000..6d2cb76
--- /dev/null
+++ b/.config/zsh/.zshrc
@@ -0,0 +1,164 @@
+# If you come from bash you might have to change your $PATH.
+# export PATH=$HOME/bin:/usr/local/bin:$PATH
+
+# Path to your oh-my-zsh installation.
+export ZSH="$HOME/.oh-my-zsh"
+
+# Set name of the theme to load --- if set to "random", it will
+# load a random theme each time oh-my-zsh is loaded, in which case,
+# to know which specific one was loaded, run: echo $RANDOM_THEME
+# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
+ZSH_THEME="robbyrussell"
+
+# Set list of themes to pick from when loading at random
+# Setting this variable when ZSH_THEME=random will cause zsh to load
+# a theme from this variable instead of looking in $ZSH/themes/
+# If set to an empty array, this variable will have no effect.
+# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" )
+
+# Uncomment the following line to use case-sensitive completion.
+# CASE_SENSITIVE="true"
+
+# Uncomment the following line to use hyphen-insensitive completion.
+# Case-sensitive completion must be off. _ and - will be interchangeable.
+# HYPHEN_INSENSITIVE="true"
+
+# Uncomment one of the following lines to change the auto-update behavior
+# zstyle ':omz:update' mode disabled  # disable automatic updates
+# zstyle ':omz:update' mode auto      # update automatically without asking
+# zstyle ':omz:update' mode reminder  # just remind me to update when it's time
+
+# Uncomment the following line to change how often to auto-update (in days).
+# zstyle ':omz:update' frequency 13
+
+# Uncomment the following line if pasting URLs and other text is messed up.
+# DISABLE_MAGIC_FUNCTIONS="true"
+
+# Uncomment the following line to disable colors in ls.
+# DISABLE_LS_COLORS="true"
+
+# Uncomment the following line to disable auto-setting terminal title.
+# DISABLE_AUTO_TITLE="true"
+
+# Uncomment the following line to enable command auto-correction.
+# ENABLE_CORRECTION="true"
+
+# Uncomment the following line to display red dots whilst waiting for completion.
+# You can also set it to another string to have that shown instead of the default red dots.
+# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f"
+# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765)
+# COMPLETION_WAITING_DOTS="true"
+
+# Uncomment the following line if you want to disable marking untracked files
+# under VCS as dirty. This makes repository status check for large repositories
+# much, much faster.
+# DISABLE_UNTRACKED_FILES_DIRTY="true"
+
+# Uncomment the following line if you want to change the command execution time
+# stamp shown in the history command output.
+# You can set one of the optional three formats:
+# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
+# or set a custom format using the strftime function format specifications,
+# see 'man strftime' for details.
+# HIST_STAMPS="mm/dd/yyyy"
+
+# Would you like to use another custom folder than $ZSH/custom?
+# ZSH_CUSTOM=/path/to/new-custom-folder
+
+# Which plugins would you like to load?
+# Standard plugins can be found in $ZSH/plugins/
+# Custom plugins may be added to $ZSH_CUSTOM/plugins/
+# Example format: plugins=(rails git textmate ruby lighthouse)
+# Add wisely, as too many plugins slow down shell startup.
+
+
+#THEME
+source $HOME/.config/zsh/themes/catppuccin_frappe-zsh-syntax-highlighting.zsh
+
+plugins=(git zsh-autosuggestions zsh-history-substring-search zsh-syntax-highlighting)
+
+source $ZSH/oh-my-zsh.sh
+
+# User configuration
+
+# export MANPATH="/usr/local/man:$MANPATH"
+
+# You may need to manually set your language environment
+# export LANG=en_US.UTF-8
+
+# Preferred editor for local and remote sessions
+# if [[ -n $SSH_CONNECTION ]]; then
+#   export EDITOR='vim'
+# else
+#   export EDITOR='mvim'
+# fi
+
+# Compilation flags
+# export ARCHFLAGS="-arch x86_64"
+
+# Set personal aliases, overriding those provided by oh-my-zsh libs,
+# plugins, and themes. Aliases can be placed here, though oh-my-zsh
+# users are encouraged to define aliases within the ZSH_CUSTOM folder.
+# For a full list of active aliases, run `alias`.
+#
+# Example aliases
+# alias zshconfig="mate ~/.zshrc"
+# alias ohmyzsh="mate ~/.oh-my-zsh"
+
+#MY CONFIG HERE
+#
+HISTSIZE=10000000
+SAVEHIST=10000000
+setopt BANG_HIST                 # Treat the '!' character specially during expansion.
+setopt EXTENDED_HISTORY          # Write the history file in the ":start:elapsed;command" format.
+setopt INC_APPEND_HISTORY        # Write to the history file immediately, not when the shell exits.
+setopt SHARE_HISTORY             # Share history between all sessions.
+setopt HIST_EXPIRE_DUPS_FIRST    # Expire duplicate entries first when trimming history.
+setopt HIST_IGNORE_DUPS          # Don't record an entry that was just recorded again.
+setopt HIST_IGNORE_ALL_DUPS      # Delete old recorded entry if new entry is a duplicate.
+setopt HIST_FIND_NO_DUPS         # Do not display a line previously found.
+setopt HIST_IGNORE_SPACE         # Don't record an entry starting with a space.
+setopt HIST_SAVE_NO_DUPS         # Don't write duplicate entries in the history file.
+setopt HIST_REDUCE_BLANKS        # Remove superfluous blanks before recording entry.
+setopt HIST_VERIFY
+
+export EDITOR=nvim
+export READER=mupdf
+
+# Add paths
+export PATH="/opt/homebrew/bin:$PATH"
+export PATH="/opt/homebrew/opt/openjdk@17/bin:$PATH"
+export PATH="$HOME/.bun/bin:$PATH"
+export PATH="$HOME/go/bin:$PATH"
+export PATH="$HOME/.local/share/nvim/mason/bin:$PATH"
+export PATH="$HOME/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/bin:$PATH"
+export PATH="$HOME/.local/bin:$PATH"
+export PATH="$HOME/.cargo/bin:$PATH"
+export PATH="$HOME/.ghcup/bin:$PATH"
+export PATH="/usr/bin/vendor_perl:$PATH"
+
+if [ "$(arch)" = "arm64" ]; then
+    eval "$(/opt/homebrew/bin/brew shellenv)"
+else
+    eval "$(/usr/local/bin/brew shellenv)"
+fi
+
+# Source custom functions
+source $HOME/.config/zsh/dotfiles.zsh
+source $HOME/.config/zsh/pacman.zsh
+source $HOME/.config/zsh/qol.zsh
+source $HOME/.config/zsh/replacements.zsh
+[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
+
+# bun
+export BUN_INSTALL="$HOME/.bun"
+export PATH="$BUN_INSTALL/bin:$PATH"
+
+# opam configuration
+source $HOME/.opam/opam-init/init.zsh > /dev/null 2>&1 || true
+
+
+# Starship initialization
+eval "$(starship init zsh)"
+
+# Additional Zsh-specific configurations can go here
diff --git a/.config/zsh/dotfiles.zsh b/.config/zsh/dotfiles.zsh
new file mode 100644
index 0000000..eeac7df
--- /dev/null
+++ b/.config/zsh/dotfiles.zsh
@@ -0,0 +1,8 @@
+# ~/.config/zsh/myfunctions/dotfiles.zsh
+
+config() {
+    /usr/bin/git --git-dir=$HOME/dotfiles/ --work-tree=$HOME $argv
+}
+
+alias lc="lazygit --git-dir=$HOME/dotfiles/ --work-tree=$HOME/"
+
diff --git a/.config/zsh/pacman.zsh b/.config/zsh/pacman.zsh
new file mode 100644
index 0000000..8a0c18e
--- /dev/null
+++ b/.config/zsh/pacman.zsh
@@ -0,0 +1,6 @@
+# ~/.config/zsh/pacman.zsh
+
+alias i="brew install"
+alias s="brew search"
+alias r="brew uninstall"
+
diff --git a/.config/zsh/qol.zsh b/.config/zsh/qol.zsh
new file mode 100644
index 0000000..fc28619
--- /dev/null
+++ b/.config/zsh/qol.zsh
@@ -0,0 +1,21 @@
+# ~/.config/zsh/qol.zsh
+
+bindkey '^H' backward-kill-path-component
+bindkey '^[[3;5~' kill-word
+
+backup() {
+    cp $1 $1.bak
+}
+
+restore() {
+    mv $1 $(echo $1 | sed 's/\.bak//')
+}
+
+capture() {
+    sudo dtrace -p "$1" -qn '
+        syscall::write*:entry
+        /pid == $target && arg0 == 1/ {
+            printf("%s", copyinstr(arg1, arg2));
+        }
+    '
+}
diff --git a/.config/zsh/replacements.zsh b/.config/zsh/replacements.zsh
new file mode 100644
index 0000000..2ccd003
--- /dev/null
+++ b/.config/zsh/replacements.zsh
@@ -0,0 +1,19 @@
+# ~/.config/zsh/replacements.zsh
+
+ls() {
+    eza --icons -l --sort type "$@"
+}
+
+nvim() {
+    /opt/homebrew/bin/nvim --listen /tmp/nvim.pipe "$@"
+}
+
+vim() {
+    /opt/homebrew/bin/nvim --listen /tmp/nvim.pipe "$@"
+}
+
+alias find="fd"
+alias df="duf"
+alias lg="lazygit"
+
+
diff --git a/.config/zsh/themes/catppuccin_frappe-zsh-syntax-highlighting.zsh b/.config/zsh/themes/catppuccin_frappe-zsh-syntax-highlighting.zsh
new file mode 100644
index 0000000..37284d0
--- /dev/null
+++ b/.config/zsh/themes/catppuccin_frappe-zsh-syntax-highlighting.zsh
@@ -0,0 +1,74 @@
+# Catppuccin Frappe Theme (for zsh-syntax-highlighting)
+#
+# Paste this files contents inside your ~/.zshrc before you activate zsh-syntax-highlighting
+ZSH_HIGHLIGHT_HIGHLIGHTERS=(main cursor)
+typeset -gA ZSH_HIGHLIGHT_STYLES
+
+# Main highlighter styling: https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters/main.md
+#
+## General
+### Diffs
+### Markup
+## Classes
+## Comments
+ZSH_HIGHLIGHT_STYLES[comment]='fg=#626880'
+## Constants
+## Entitites
+## Functions/methods
+ZSH_HIGHLIGHT_STYLES[alias]='fg=#a6d189'
+ZSH_HIGHLIGHT_STYLES[suffix-alias]='fg=#a6d189'
+ZSH_HIGHLIGHT_STYLES[global-alias]='fg=#a6d189'
+ZSH_HIGHLIGHT_STYLES[function]='fg=#a6d189'
+ZSH_HIGHLIGHT_STYLES[command]='fg=#a6d189'
+ZSH_HIGHLIGHT_STYLES[precommand]='fg=#a6d189,italic'
+ZSH_HIGHLIGHT_STYLES[autodirectory]='fg=#ef9f76,italic'
+ZSH_HIGHLIGHT_STYLES[single-hyphen-option]='fg=#ef9f76'
+ZSH_HIGHLIGHT_STYLES[double-hyphen-option]='fg=#ef9f76'
+ZSH_HIGHLIGHT_STYLES[back-quoted-argument]='fg=#ca9ee6'
+## Keywords
+## Built ins
+ZSH_HIGHLIGHT_STYLES[builtin]='fg=#a6d189'
+ZSH_HIGHLIGHT_STYLES[reserved-word]='fg=#a6d189'
+ZSH_HIGHLIGHT_STYLES[hashed-command]='fg=#a6d189'
+## Punctuation
+ZSH_HIGHLIGHT_STYLES[commandseparator]='fg=#e78284'
+ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter]='fg=#c6d0f5'
+ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter-unquoted]='fg=#c6d0f5'
+ZSH_HIGHLIGHT_STYLES[process-substitution-delimiter]='fg=#c6d0f5'
+ZSH_HIGHLIGHT_STYLES[back-quoted-argument-delimiter]='fg=#e78284'
+ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument]='fg=#e78284'
+ZSH_HIGHLIGHT_STYLES[back-dollar-quoted-argument]='fg=#e78284'
+## Serializable / Configuration Languages
+## Storage
+## Strings
+ZSH_HIGHLIGHT_STYLES[command-substitution-quoted]='fg=#e5c890'
+ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter-quoted]='fg=#e5c890'
+ZSH_HIGHLIGHT_STYLES[single-quoted-argument]='fg=#e5c890'
+ZSH_HIGHLIGHT_STYLES[single-quoted-argument-unclosed]='fg=#ea999c'
+ZSH_HIGHLIGHT_STYLES[double-quoted-argument]='fg=#e5c890'
+ZSH_HIGHLIGHT_STYLES[double-quoted-argument-unclosed]='fg=#ea999c'
+ZSH_HIGHLIGHT_STYLES[rc-quote]='fg=#e5c890'
+## Variables
+ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument]='fg=#c6d0f5'
+ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument-unclosed]='fg=#ea999c'
+ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]='fg=#c6d0f5'
+ZSH_HIGHLIGHT_STYLES[assign]='fg=#c6d0f5'
+ZSH_HIGHLIGHT_STYLES[named-fd]='fg=#c6d0f5'
+ZSH_HIGHLIGHT_STYLES[numeric-fd]='fg=#c6d0f5'
+## No category relevant in spec
+ZSH_HIGHLIGHT_STYLES[unknown-token]='fg=#ea999c'
+ZSH_HIGHLIGHT_STYLES[path]='fg=#c6d0f5,underline'
+ZSH_HIGHLIGHT_STYLES[path_pathseparator]='fg=#e78284,underline'
+ZSH_HIGHLIGHT_STYLES[path_prefix]='fg=#c6d0f5,underline'
+ZSH_HIGHLIGHT_STYLES[path_prefix_pathseparator]='fg=#e78284,underline'
+ZSH_HIGHLIGHT_STYLES[globbing]='fg=#c6d0f5'
+ZSH_HIGHLIGHT_STYLES[history-expansion]='fg=#ca9ee6'
+#ZSH_HIGHLIGHT_STYLES[command-substitution]='fg=?'
+#ZSH_HIGHLIGHT_STYLES[command-substitution-unquoted]='fg=?'
+#ZSH_HIGHLIGHT_STYLES[process-substitution]='fg=?'
+#ZSH_HIGHLIGHT_STYLES[arithmetic-expansion]='fg=?'
+ZSH_HIGHLIGHT_STYLES[back-quoted-argument-unclosed]='fg=#ea999c'
+ZSH_HIGHLIGHT_STYLES[redirection]='fg=#c6d0f5'
+ZSH_HIGHLIGHT_STYLES[arg0]='fg=#c6d0f5'
+ZSH_HIGHLIGHT_STYLES[default]='fg=#c6d0f5'
+ZSH_HIGHLIGHT_STYLES[cursor]='fg=#c6d0f5'
diff --git a/.config/zsh/themes/catppuccin_latte-zsh-syntax-highlighting.zsh b/.config/zsh/themes/catppuccin_latte-zsh-syntax-highlighting.zsh
new file mode 100644
index 0000000..09b4cf9
--- /dev/null
+++ b/.config/zsh/themes/catppuccin_latte-zsh-syntax-highlighting.zsh
@@ -0,0 +1,74 @@
+# Catppuccin Latte Theme (for zsh-syntax-highlighting)
+#
+# Paste this files contents inside your ~/.zshrc before you activate zsh-syntax-highlighting
+ZSH_HIGHLIGHT_HIGHLIGHTERS=(main cursor)
+typeset -gA ZSH_HIGHLIGHT_STYLES
+
+# Main highlighter styling: https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters/main.md
+#
+## General
+### Diffs
+### Markup
+## Classes
+## Comments
+ZSH_HIGHLIGHT_STYLES[comment]='fg=#acb0be'
+## Constants
+## Entitites
+## Functions/methods
+ZSH_HIGHLIGHT_STYLES[alias]='fg=#40a02b'
+ZSH_HIGHLIGHT_STYLES[suffix-alias]='fg=#40a02b'
+ZSH_HIGHLIGHT_STYLES[global-alias]='fg=#40a02b'
+ZSH_HIGHLIGHT_STYLES[function]='fg=#40a02b'
+ZSH_HIGHLIGHT_STYLES[command]='fg=#40a02b'
+ZSH_HIGHLIGHT_STYLES[precommand]='fg=#40a02b,italic'
+ZSH_HIGHLIGHT_STYLES[autodirectory]='fg=#fe640b,italic'
+ZSH_HIGHLIGHT_STYLES[single-hyphen-option]='fg=#fe640b'
+ZSH_HIGHLIGHT_STYLES[double-hyphen-option]='fg=#fe640b'
+ZSH_HIGHLIGHT_STYLES[back-quoted-argument]='fg=#8839ef'
+## Keywords
+## Built ins
+ZSH_HIGHLIGHT_STYLES[builtin]='fg=#40a02b'
+ZSH_HIGHLIGHT_STYLES[reserved-word]='fg=#40a02b'
+ZSH_HIGHLIGHT_STYLES[hashed-command]='fg=#40a02b'
+## Punctuation
+ZSH_HIGHLIGHT_STYLES[commandseparator]='fg=#d20f39'
+ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter]='fg=#4c4f69'
+ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter-unquoted]='fg=#4c4f69'
+ZSH_HIGHLIGHT_STYLES[process-substitution-delimiter]='fg=#4c4f69'
+ZSH_HIGHLIGHT_STYLES[back-quoted-argument-delimiter]='fg=#d20f39'
+ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument]='fg=#d20f39'
+ZSH_HIGHLIGHT_STYLES[back-dollar-quoted-argument]='fg=#d20f39'
+## Serializable / Configuration Languages
+## Storage
+## Strings
+ZSH_HIGHLIGHT_STYLES[command-substitution-quoted]='fg=#df8e1d'
+ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter-quoted]='fg=#df8e1d'
+ZSH_HIGHLIGHT_STYLES[single-quoted-argument]='fg=#df8e1d'
+ZSH_HIGHLIGHT_STYLES[single-quoted-argument-unclosed]='fg=#e64553'
+ZSH_HIGHLIGHT_STYLES[double-quoted-argument]='fg=#df8e1d'
+ZSH_HIGHLIGHT_STYLES[double-quoted-argument-unclosed]='fg=#e64553'
+ZSH_HIGHLIGHT_STYLES[rc-quote]='fg=#df8e1d'
+## Variables
+ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument]='fg=#4c4f69'
+ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument-unclosed]='fg=#e64553'
+ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]='fg=#4c4f69'
+ZSH_HIGHLIGHT_STYLES[assign]='fg=#4c4f69'
+ZSH_HIGHLIGHT_STYLES[named-fd]='fg=#4c4f69'
+ZSH_HIGHLIGHT_STYLES[numeric-fd]='fg=#4c4f69'
+## No category relevant in spec
+ZSH_HIGHLIGHT_STYLES[unknown-token]='fg=#e64553'
+ZSH_HIGHLIGHT_STYLES[path]='fg=#4c4f69,underline'
+ZSH_HIGHLIGHT_STYLES[path_pathseparator]='fg=#d20f39,underline'
+ZSH_HIGHLIGHT_STYLES[path_prefix]='fg=#4c4f69,underline'
+ZSH_HIGHLIGHT_STYLES[path_prefix_pathseparator]='fg=#d20f39,underline'
+ZSH_HIGHLIGHT_STYLES[globbing]='fg=#4c4f69'
+ZSH_HIGHLIGHT_STYLES[history-expansion]='fg=#8839ef'
+#ZSH_HIGHLIGHT_STYLES[command-substitution]='fg=?'
+#ZSH_HIGHLIGHT_STYLES[command-substitution-unquoted]='fg=?'
+#ZSH_HIGHLIGHT_STYLES[process-substitution]='fg=?'
+#ZSH_HIGHLIGHT_STYLES[arithmetic-expansion]='fg=?'
+ZSH_HIGHLIGHT_STYLES[back-quoted-argument-unclosed]='fg=#e64553'
+ZSH_HIGHLIGHT_STYLES[redirection]='fg=#4c4f69'
+ZSH_HIGHLIGHT_STYLES[arg0]='fg=#4c4f69'
+ZSH_HIGHLIGHT_STYLES[default]='fg=#4c4f69'
+ZSH_HIGHLIGHT_STYLES[cursor]='fg=#4c4f69'
diff --git a/.config/zsh/themes/catppuccin_macchiato-zsh-syntax-highlighting.zsh b/.config/zsh/themes/catppuccin_macchiato-zsh-syntax-highlighting.zsh
new file mode 100644
index 0000000..de6f512
--- /dev/null
+++ b/.config/zsh/themes/catppuccin_macchiato-zsh-syntax-highlighting.zsh
@@ -0,0 +1,74 @@
+# Catppuccin Macchiato Theme (for zsh-syntax-highlighting)
+#
+# Paste this files contents inside your ~/.zshrc before you activate zsh-syntax-highlighting
+ZSH_HIGHLIGHT_HIGHLIGHTERS=(main cursor)
+typeset -gA ZSH_HIGHLIGHT_STYLES
+
+# Main highlighter styling: https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters/main.md
+#
+## General
+### Diffs
+### Markup
+## Classes
+## Comments
+ZSH_HIGHLIGHT_STYLES[comment]='fg=#5b6078'
+## Constants
+## Entitites
+## Functions/methods
+ZSH_HIGHLIGHT_STYLES[alias]='fg=#a6da95'
+ZSH_HIGHLIGHT_STYLES[suffix-alias]='fg=#a6da95'
+ZSH_HIGHLIGHT_STYLES[global-alias]='fg=#a6da95'
+ZSH_HIGHLIGHT_STYLES[function]='fg=#a6da95'
+ZSH_HIGHLIGHT_STYLES[command]='fg=#a6da95'
+ZSH_HIGHLIGHT_STYLES[precommand]='fg=#a6da95,italic'
+ZSH_HIGHLIGHT_STYLES[autodirectory]='fg=#f5a97f,italic'
+ZSH_HIGHLIGHT_STYLES[single-hyphen-option]='fg=#f5a97f'
+ZSH_HIGHLIGHT_STYLES[double-hyphen-option]='fg=#f5a97f'
+ZSH_HIGHLIGHT_STYLES[back-quoted-argument]='fg=#c6a0f6'
+## Keywords
+## Built ins
+ZSH_HIGHLIGHT_STYLES[builtin]='fg=#a6da95'
+ZSH_HIGHLIGHT_STYLES[reserved-word]='fg=#a6da95'
+ZSH_HIGHLIGHT_STYLES[hashed-command]='fg=#a6da95'
+## Punctuation
+ZSH_HIGHLIGHT_STYLES[commandseparator]='fg=#ed8796'
+ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter]='fg=#cad3f5'
+ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter-unquoted]='fg=#cad3f5'
+ZSH_HIGHLIGHT_STYLES[process-substitution-delimiter]='fg=#cad3f5'
+ZSH_HIGHLIGHT_STYLES[back-quoted-argument-delimiter]='fg=#ed8796'
+ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument]='fg=#ed8796'
+ZSH_HIGHLIGHT_STYLES[back-dollar-quoted-argument]='fg=#ed8796'
+## Serializable / Configuration Languages
+## Storage
+## Strings
+ZSH_HIGHLIGHT_STYLES[command-substitution-quoted]='fg=#eed49f'
+ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter-quoted]='fg=#eed49f'
+ZSH_HIGHLIGHT_STYLES[single-quoted-argument]='fg=#eed49f'
+ZSH_HIGHLIGHT_STYLES[single-quoted-argument-unclosed]='fg=#ee99a0'
+ZSH_HIGHLIGHT_STYLES[double-quoted-argument]='fg=#eed49f'
+ZSH_HIGHLIGHT_STYLES[double-quoted-argument-unclosed]='fg=#ee99a0'
+ZSH_HIGHLIGHT_STYLES[rc-quote]='fg=#eed49f'
+## Variables
+ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument]='fg=#cad3f5'
+ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument-unclosed]='fg=#ee99a0'
+ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]='fg=#cad3f5'
+ZSH_HIGHLIGHT_STYLES[assign]='fg=#cad3f5'
+ZSH_HIGHLIGHT_STYLES[named-fd]='fg=#cad3f5'
+ZSH_HIGHLIGHT_STYLES[numeric-fd]='fg=#cad3f5'
+## No category relevant in spec
+ZSH_HIGHLIGHT_STYLES[unknown-token]='fg=#ee99a0'
+ZSH_HIGHLIGHT_STYLES[path]='fg=#cad3f5,underline'
+ZSH_HIGHLIGHT_STYLES[path_pathseparator]='fg=#ed8796,underline'
+ZSH_HIGHLIGHT_STYLES[path_prefix]='fg=#cad3f5,underline'
+ZSH_HIGHLIGHT_STYLES[path_prefix_pathseparator]='fg=#ed8796,underline'
+ZSH_HIGHLIGHT_STYLES[globbing]='fg=#cad3f5'
+ZSH_HIGHLIGHT_STYLES[history-expansion]='fg=#c6a0f6'
+#ZSH_HIGHLIGHT_STYLES[command-substitution]='fg=?'
+#ZSH_HIGHLIGHT_STYLES[command-substitution-unquoted]='fg=?'
+#ZSH_HIGHLIGHT_STYLES[process-substitution]='fg=?'
+#ZSH_HIGHLIGHT_STYLES[arithmetic-expansion]='fg=?'
+ZSH_HIGHLIGHT_STYLES[back-quoted-argument-unclosed]='fg=#ee99a0'
+ZSH_HIGHLIGHT_STYLES[redirection]='fg=#cad3f5'
+ZSH_HIGHLIGHT_STYLES[arg0]='fg=#cad3f5'
+ZSH_HIGHLIGHT_STYLES[default]='fg=#cad3f5'
+ZSH_HIGHLIGHT_STYLES[cursor]='fg=#cad3f5'
diff --git a/.config/zsh/themes/catppuccin_mocha-zsh-syntax-highlighting.zsh b/.config/zsh/themes/catppuccin_mocha-zsh-syntax-highlighting.zsh
new file mode 100644
index 0000000..3958790
--- /dev/null
+++ b/.config/zsh/themes/catppuccin_mocha-zsh-syntax-highlighting.zsh
@@ -0,0 +1,74 @@
+# Catppuccin Mocha Theme (for zsh-syntax-highlighting)
+#
+# Paste this files contents inside your ~/.zshrc before you activate zsh-syntax-highlighting
+ZSH_HIGHLIGHT_HIGHLIGHTERS=(main cursor)
+typeset -gA ZSH_HIGHLIGHT_STYLES
+
+# Main highlighter styling: https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters/main.md
+#
+## General
+### Diffs
+### Markup
+## Classes
+## Comments
+ZSH_HIGHLIGHT_STYLES[comment]='fg=#585b70'
+## Constants
+## Entitites
+## Functions/methods
+ZSH_HIGHLIGHT_STYLES[alias]='fg=#a6e3a1'
+ZSH_HIGHLIGHT_STYLES[suffix-alias]='fg=#a6e3a1'
+ZSH_HIGHLIGHT_STYLES[global-alias]='fg=#a6e3a1'
+ZSH_HIGHLIGHT_STYLES[function]='fg=#a6e3a1'
+ZSH_HIGHLIGHT_STYLES[command]='fg=#a6e3a1'
+ZSH_HIGHLIGHT_STYLES[precommand]='fg=#a6e3a1,italic'
+ZSH_HIGHLIGHT_STYLES[autodirectory]='fg=#fab387,italic'
+ZSH_HIGHLIGHT_STYLES[single-hyphen-option]='fg=#fab387'
+ZSH_HIGHLIGHT_STYLES[double-hyphen-option]='fg=#fab387'
+ZSH_HIGHLIGHT_STYLES[back-quoted-argument]='fg=#cba6f7'
+## Keywords
+## Built ins
+ZSH_HIGHLIGHT_STYLES[builtin]='fg=#a6e3a1'
+ZSH_HIGHLIGHT_STYLES[reserved-word]='fg=#a6e3a1'
+ZSH_HIGHLIGHT_STYLES[hashed-command]='fg=#a6e3a1'
+## Punctuation
+ZSH_HIGHLIGHT_STYLES[commandseparator]='fg=#f38ba8'
+ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter]='fg=#cdd6f4'
+ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter-unquoted]='fg=#cdd6f4'
+ZSH_HIGHLIGHT_STYLES[process-substitution-delimiter]='fg=#cdd6f4'
+ZSH_HIGHLIGHT_STYLES[back-quoted-argument-delimiter]='fg=#f38ba8'
+ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument]='fg=#f38ba8'
+ZSH_HIGHLIGHT_STYLES[back-dollar-quoted-argument]='fg=#f38ba8'
+## Serializable / Configuration Languages
+## Storage
+## Strings
+ZSH_HIGHLIGHT_STYLES[command-substitution-quoted]='fg=#f9e2af'
+ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter-quoted]='fg=#f9e2af'
+ZSH_HIGHLIGHT_STYLES[single-quoted-argument]='fg=#f9e2af'
+ZSH_HIGHLIGHT_STYLES[single-quoted-argument-unclosed]='fg=#e64553'
+ZSH_HIGHLIGHT_STYLES[double-quoted-argument]='fg=#f9e2af'
+ZSH_HIGHLIGHT_STYLES[double-quoted-argument-unclosed]='fg=#e64553'
+ZSH_HIGHLIGHT_STYLES[rc-quote]='fg=#f9e2af'
+## Variables
+ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument]='fg=#cdd6f4'
+ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument-unclosed]='fg=#e64553'
+ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]='fg=#cdd6f4'
+ZSH_HIGHLIGHT_STYLES[assign]='fg=#cdd6f4'
+ZSH_HIGHLIGHT_STYLES[named-fd]='fg=#cdd6f4'
+ZSH_HIGHLIGHT_STYLES[numeric-fd]='fg=#cdd6f4'
+## No category relevant in spec
+ZSH_HIGHLIGHT_STYLES[unknown-token]='fg=#e64553'
+ZSH_HIGHLIGHT_STYLES[path]='fg=#cdd6f4,underline'
+ZSH_HIGHLIGHT_STYLES[path_pathseparator]='fg=#f38ba8,underline'
+ZSH_HIGHLIGHT_STYLES[path_prefix]='fg=#cdd6f4,underline'
+ZSH_HIGHLIGHT_STYLES[path_prefix_pathseparator]='fg=#f38ba8,underline'
+ZSH_HIGHLIGHT_STYLES[globbing]='fg=#cdd6f4'
+ZSH_HIGHLIGHT_STYLES[history-expansion]='fg=#cba6f7'
+#ZSH_HIGHLIGHT_STYLES[command-substitution]='fg=?'
+#ZSH_HIGHLIGHT_STYLES[command-substitution-unquoted]='fg=?'
+#ZSH_HIGHLIGHT_STYLES[process-substitution]='fg=?'
+#ZSH_HIGHLIGHT_STYLES[arithmetic-expansion]='fg=?'
+ZSH_HIGHLIGHT_STYLES[back-quoted-argument-unclosed]='fg=#e64553'
+ZSH_HIGHLIGHT_STYLES[redirection]='fg=#cdd6f4'
+ZSH_HIGHLIGHT_STYLES[arg0]='fg=#cdd6f4'
+ZSH_HIGHLIGHT_STYLES[default]='fg=#cdd6f4'
+ZSH_HIGHLIGHT_STYLES[cursor]='fg=#cdd6f4'