diff --git a/.config/ghostty/config b/.config/ghostty/config
index e446ba6..023a08b 100644
--- a/.config/ghostty/config
+++ b/.config/ghostty/config
@@ -1,5 +1,5 @@
-theme = "rose-pine-moon"
-
+config-file = ?~/.config/ghostty/macos/config
+config-file = ?~/.config/ghostty/linux/config
 font-family = "Maple Mono SemiBold"
 font-thicken = true
 
@@ -8,16 +8,8 @@ background = 000000
 confirm-close-surface = false
 window-padding-x = 6
 window-padding-y = 6
-window-decoration = none
 mouse-hide-while-typing = true
 adjust-cell-height = 15%
 alpha-blending = linear-corrected
 bold-is-bright = true
-
-[macos]
-font-size = 12
-option-macos = true
-
-[linux]
-font-size = 10
-option-linux = true
+mouse-hide-while-typing = true
diff --git a/.config/ghostty/linux/config b/.config/ghostty/linux/config
new file mode 100644
index 0000000..9d98d55
--- /dev/null
+++ b/.config/ghostty/linux/config
@@ -0,0 +1,3 @@
+font-size = 10
+window-decoration = none
+theme = "rose-pine-moon"
diff --git a/.config/ghostty/macos/config b/.config/ghostty/macos/config
new file mode 100644
index 0000000..9783a5e
--- /dev/null
+++ b/.config/ghostty/macos/config
@@ -0,0 +1,3 @@
+font-size = 12
+theme = "rose pine moon"
+macos-titlebar-style = tabs
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 07d88a7..2d4494c 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -10,7 +10,7 @@ require("lazy").setup({
 		{ "echasnovski/mini.pairs", version = '*' },
 		{ "ibhagwan/fzf-lua", dependencies = { "nvim-tree/nvim-web-devicons" } },
 		{ "saghen/blink.cmp", version = "v1.*", opts = {} },
-		{ dir = "~/personal/Projects/Lua/Polydev/", opts = {
+		{ "DarthMooMancer/Polydev", opts = {
 			terminal = {
 				mode = "floating",
 			}
diff --git a/.zshrc b/.zshrc
index d21f263..9ba0c68 100644
--- a/.zshrc
+++ b/.zshrc
@@ -34,10 +34,10 @@ alias grep="rg"
 alias comp="make && doas make install && make clean"
 alias update_world='doas emerge --ask --update --newuse --deep @world'
 if [[ $(uname) != "Darwin" ]]; then
-	alias env="sh /home/andrew/personal/dotfiles/env.sh"
+	alias env="sh /home/andrew/personal/dotfiles/env_linux.sh"
 	myfetch.sh
 else
-	alias env='sh ~/personal/env/setup.sh'
+	alias env='sh ~/personal/dotfiles/env_mac.sh'
 	export LIBRARY_PATH="$LIBRARY_PATH:$(brew --prefix)/lib"
 	export PATH="$(brew --prefix llvm)/bin:$PATH"
 	export GOOGLE_CLOUD_PROJECT="development-477121"
diff --git a/env.sh b/env_linux.sh
similarity index 97%
rename from env.sh
rename to env_linux.sh
index 6b99c46..a41f031 100755
--- a/env.sh
+++ b/env_linux.sh
@@ -49,3 +49,5 @@ done
 
 echo -e "${GREEN}Re-caching fonts${RESET}"
 fc-cache -f
+
+rm -rf ~/.config/ghostty/macos
diff --git a/env_mac.sh b/env_mac.sh
new file mode 100755
index 0000000..be5c799
--- /dev/null
+++ b/env_mac.sh
@@ -0,0 +1,70 @@
+#!/bin/bash
+
+CONFIG_DIR=~/personal/dotfiles/.config
+LOCAL_DIR=~/personal/dotfiles/.local/bin
+DEST_DIR="${XDG_CONFIG_HOME:-$HOME/.config}"
+
+for dir in "$CONFIG_DIR"/*/; do
+  [ -d "$dir" ] || continue
+
+  name=$(basename "$dir")
+  target="$DEST_DIR/$name"
+
+  rm -rf "$target"
+  echo "Removing: $target"
+done
+
+echo
+
+for dir in "$CONFIG_DIR"/*/; do
+  [ -d "$dir" ] || continue
+
+  name=$(basename "$dir")
+  target="$DEST_DIR/$name"
+
+  cp -r "$dir" "$target"
+  echo "Copying: $dir → $target"
+done
+
+echo
+echo "Copying executables from $LOCAL_DIR to ~/.local/bin"
+
+mkdir -p "$HOME/.local/bin"
+for file in "$LOCAL_DIR"/*; do
+  [ -f "$file" ] || continue
+
+  name=$(basename "$file")
+  target="$HOME/.local/bin/$name"
+
+  rm -f "$target"
+  cp "$file" "$target"
+  chmod +x "$target"
+  echo "Copied: $file → $target"
+done
+
+echo
+echo "Copying .zshrc to $HOME"
+
+target="$HOME/.zshrc"
+rm -f "$target"
+cp "$HOME/personal/env/.zshrc" "$target"
+echo "Copied: .zshrc → $target"
+
+echo
+echo "Copying tmux config"
+
+target="$HOME/.config/tmux/tmux.conf"
+mkdir -p "$(dirname "$target")"
+rm -f "$target"
+cp "$HOME/personal/env/.config/tmux/tmux.conf" "$target"
+echo "Copied: tmux.conf → $target"
+
+echo
+
+echo "Copying starship config"
+target="$HOME/.config/starship.toml"
+mkdir -p "$(dirname "$target")"
+rm -f "$target"
+cp "$HOME/personal/env/.config/starship.toml" "$target"
+echo "Copied: starship.toml → $target"
+rm -rf ~/.config/ghostty/linux