diff --git a/.config/tmux/plugins/catppuccin-tmux b/.config/tmux/plugins/catppuccin-tmux
deleted file mode 160000
index 14a546f..0000000
--- a/.config/tmux/plugins/catppuccin-tmux
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 14a546fb64dc1141e5d02bac2185d8c1fd530d6a
diff --git a/.config/tmux/plugins/tpm b/.config/tmux/plugins/tpm
deleted file mode 160000
index 99469c4..0000000
--- a/.config/tmux/plugins/tpm
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 99469c4a9b1ccf77fade25842dc7bafbc8ce9946
diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf
index 13ae33d..758ddc0 100644
--- a/.config/tmux/tmux.conf
+++ b/.config/tmux/tmux.conf
@@ -2,16 +2,7 @@ unbind r
 bind r source-file ~/.tmux.conf
 
 set -g prefix C-y
+set-environment -g TMUX_PLUGIN_MANAGER_PATH '~/.tmux/plugins/'
 
-#set -g mouse on
-
-bind-key w select-pane -U
-bind-key a select-pane -L
-bind-key s select-pane -D
-bind-key d select-pane -R
-
-set -g @plugin '~/.config/tmux/plugins/tpm'
-#set -g @plugin '~/.config/tmux/plugins/catppuccin-tmux'
-
-run '~/.config/tmux/plugins/tpm'
-#run '~/.config/tmux/plugins/catppuccin-tmux/catppuccin.tmux'
+source-file ~/.config/tmux/tmux.conf.d/plugins.conf
+source-file ~/.config/tmux/tmux.conf.d/keybinds.conf
\ No newline at end of file
diff --git a/.config/tmux/tmux.conf.d/catppuccin.conf b/.config/tmux/tmux.conf.d/catppuccin.conf
new file mode 100644
index 0000000..710a452
--- /dev/null
+++ b/.config/tmux/tmux.conf.d/catppuccin.conf
@@ -0,0 +1,2 @@
+set -g @catppuccin_flavor "mocha"
+set -g @catppuccin_window_status_style "rounded"
\ No newline at end of file
diff --git a/.config/tmux/tmux.conf.d/keybinds.conf b/.config/tmux/tmux.conf.d/keybinds.conf
new file mode 100644
index 0000000..5fd6b5c
--- /dev/null
+++ b/.config/tmux/tmux.conf.d/keybinds.conf
@@ -0,0 +1,6 @@
+bind-key w select-pane -U
+bind-key a select-pane -L
+bind-key s select-pane -D
+bind-key d select-pane -R
+
+bind-key c detach
\ No newline at end of file
diff --git a/.config/tmux/tmux.conf.d/plugins.conf b/.config/tmux/tmux.conf.d/plugins.conf
new file mode 100644
index 0000000..6a1cc26
--- /dev/null
+++ b/.config/tmux/tmux.conf.d/plugins.conf
@@ -0,0 +1,9 @@
+set -g @plugin 'tmux-plugins/tpm'
+set -g @plugin 'catppuccin/tmux'
+
+set -g @catppuccin_flavor "macchiato"
+set -g @catppuccin_window_status_style "rounded"
+
+#source-file '~/.config/tmux/tmux.conf.d/catppuccin.conf'
+
+run "~/.tmux/plugins/tpm/tpm"
\ No newline at end of file
diff --git a/install b/install
index 0c8e1b7..f7be5d5 100755
--- a/install
+++ b/install
@@ -1,30 +1,32 @@
-#!/usr/bin/env bash
-
-set -e
-
-echo
-echo "[+] Updating System Packages..."
-echo
-sudo apt update -qq
-
-echo
-echo "[+] Installing Dependencies..."
-echo
-sudo apt install -yqq \
-    zsh \
-    curl \
-    exa \
-    direnv \
-    bat \
-    btop \
-    stow
-
-echo
-echo "[+] Installing Oh My Zsh..."
-echo
-
-sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
-
-echo "Include $HOME/.config/ssh/*" >> "$HOME/.ssh/config"
-
-./setup
+#!/usr/bin/env bash
+
+set -e
+
+echo
+echo "[+] Updating System Packages..."
+echo
+sudo apt update -qq
+
+echo
+echo "[+] Installing Dependencies..."
+echo
+sudo apt install -yqq \
+    zsh \
+    curl \
+    exa \
+    direnv \
+    bat \
+    btop \
+    stow \
+    tmux \
+    dos2unix 
+
+echo
+echo "[+] Installing Oh My Zsh..."
+echo
+
+sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
+
+echo "Include $HOME/.config/ssh/*" >> "$HOME/.ssh/config"
+
+./setup
diff --git a/setup b/setup
index 3fc38dd..03a853b 100755
--- a/setup
+++ b/setup
@@ -36,6 +36,8 @@ set -e
 echo "[+] Cloning submodules..."
 git submodule update --init --recursive
 
+find ./config/tmux -type d -name '.git*' -prune -o -type f -print0 | xargs -0 dos2unix
+
 echo "[+] Creating Gitconfigs..."
 
 (