diff --git a/install.sh b/install.sh
index dac1539..d5b4579 100755
--- a/install.sh
+++ b/install.sh
@@ -18,7 +18,6 @@ DIRECTORIES=(
     dunst
     smartgit
     lazygit
-    tmux-plugins
 )
 
 for target in ${DIRECTORIES[@]}; do
@@ -27,7 +26,7 @@ done
 
 ln -sfr $BASE_PATH/bash/bashrc $HOME/.bashrc
 ln -sfr $BASE_PATH/bash/bashrc.d $HOME/.bashrc.d
-ln -sfr $BASE_PATH/tmux.conf $HOME/.tmux.conf
+ln -sfr $BASE_PATH/tmux/config.conf $HOME/.tmux.conf
 ln -sfr $BASE_PATH/Xresources $HOME/.Xresources
 ln -sfr $BASE_PATH/picom.conf $HOME/.config/picom.conf
 ln -sfr $BASE_PATH/fzfrc $HOME/.config/fzfrc
diff --git a/tmux.conf b/tmux/config.conf
similarity index 84%
rename from tmux.conf
rename to tmux/config.conf
index 6fc9e55..cead4c0 100644
--- a/tmux.conf
+++ b/tmux/config.conf
@@ -14,17 +14,17 @@ setw -g pane-base-index 1
 set -g status-position top
 set -g status-justify left
 set -g status-style ''
-set -g status-left ' #[fg=colour2]#[fg=default] #S '
+set -g status-left ' #[fg=colour2]#[fg=default]  #S '
 set -g status-right ''
-set -g status-right-length 50
-set -g status-left-length 50
+set -g status-right-length 0
+set -g status-left-length 0
 
 set -g pane-border-style "fg=#1a1c2d"
 set -g pane-active-border-style "bg=default fg=#1a1c2d"
 
 setw -g window-status-style ''
 setw -g window-status-format ' #[fg=colour4]#I#[fg=colour15]:#W '
-setw -g window-status-current-style 'fg=#0E1019 bg=colour4 bold'
+setw -g window-status-current-style 'fg=colour4'
 setw -g window-status-current-format ' #I:#W '
 setw -g window-status-separator ''
 
diff --git a/tmux-plugins/tpm/CHANGELOG.md b/tmux/plugins/tpm/CHANGELOG.md
similarity index 100%
rename from tmux-plugins/tpm/CHANGELOG.md
rename to tmux/plugins/tpm/CHANGELOG.md
diff --git a/tmux-plugins/tpm/HOW_TO_PLUGIN.md b/tmux/plugins/tpm/HOW_TO_PLUGIN.md
similarity index 100%
rename from tmux-plugins/tpm/HOW_TO_PLUGIN.md
rename to tmux/plugins/tpm/HOW_TO_PLUGIN.md
diff --git a/tmux-plugins/tpm/LICENSE.md b/tmux/plugins/tpm/LICENSE.md
similarity index 100%
rename from tmux-plugins/tpm/LICENSE.md
rename to tmux/plugins/tpm/LICENSE.md
diff --git a/tmux-plugins/tpm/README.md b/tmux/plugins/tpm/README.md
similarity index 100%
rename from tmux-plugins/tpm/README.md
rename to tmux/plugins/tpm/README.md
diff --git a/tmux-plugins/tpm/bin/clean_plugins b/tmux/plugins/tpm/bin/clean_plugins
similarity index 100%
rename from tmux-plugins/tpm/bin/clean_plugins
rename to tmux/plugins/tpm/bin/clean_plugins
diff --git a/tmux-plugins/tpm/bin/install_plugins b/tmux/plugins/tpm/bin/install_plugins
similarity index 100%
rename from tmux-plugins/tpm/bin/install_plugins
rename to tmux/plugins/tpm/bin/install_plugins
diff --git a/tmux-plugins/tpm/bin/update_plugins b/tmux/plugins/tpm/bin/update_plugins
similarity index 100%
rename from tmux-plugins/tpm/bin/update_plugins
rename to tmux/plugins/tpm/bin/update_plugins
diff --git a/tmux-plugins/tpm/bindings/clean_plugins b/tmux/plugins/tpm/bindings/clean_plugins
similarity index 100%
rename from tmux-plugins/tpm/bindings/clean_plugins
rename to tmux/plugins/tpm/bindings/clean_plugins
diff --git a/tmux-plugins/tpm/bindings/install_plugins b/tmux/plugins/tpm/bindings/install_plugins
similarity index 100%
rename from tmux-plugins/tpm/bindings/install_plugins
rename to tmux/plugins/tpm/bindings/install_plugins
diff --git a/tmux-plugins/tpm/bindings/update_plugins b/tmux/plugins/tpm/bindings/update_plugins
similarity index 100%
rename from tmux-plugins/tpm/bindings/update_plugins
rename to tmux/plugins/tpm/bindings/update_plugins
diff --git a/tmux-plugins/tpm/docs/automatic_tpm_installation.md b/tmux/plugins/tpm/docs/automatic_tpm_installation.md
similarity index 100%
rename from tmux-plugins/tpm/docs/automatic_tpm_installation.md
rename to tmux/plugins/tpm/docs/automatic_tpm_installation.md
diff --git a/tmux-plugins/tpm/docs/changing_plugins_install_dir.md b/tmux/plugins/tpm/docs/changing_plugins_install_dir.md
similarity index 100%
rename from tmux-plugins/tpm/docs/changing_plugins_install_dir.md
rename to tmux/plugins/tpm/docs/changing_plugins_install_dir.md
diff --git a/tmux-plugins/tpm/docs/how_to_create_plugin.md b/tmux/plugins/tpm/docs/how_to_create_plugin.md
similarity index 100%
rename from tmux-plugins/tpm/docs/how_to_create_plugin.md
rename to tmux/plugins/tpm/docs/how_to_create_plugin.md
diff --git a/tmux-plugins/tpm/docs/managing_plugins_via_cmd_line.md b/tmux/plugins/tpm/docs/managing_plugins_via_cmd_line.md
similarity index 100%
rename from tmux-plugins/tpm/docs/managing_plugins_via_cmd_line.md
rename to tmux/plugins/tpm/docs/managing_plugins_via_cmd_line.md
diff --git a/tmux-plugins/tpm/docs/tpm_not_working.md b/tmux/plugins/tpm/docs/tpm_not_working.md
similarity index 100%
rename from tmux-plugins/tpm/docs/tpm_not_working.md
rename to tmux/plugins/tpm/docs/tpm_not_working.md
diff --git a/tmux-plugins/tpm/scripts/check_tmux_version.sh b/tmux/plugins/tpm/scripts/check_tmux_version.sh
similarity index 100%
rename from tmux-plugins/tpm/scripts/check_tmux_version.sh
rename to tmux/plugins/tpm/scripts/check_tmux_version.sh
diff --git a/tmux-plugins/tpm/scripts/clean_plugins.sh b/tmux/plugins/tpm/scripts/clean_plugins.sh
similarity index 100%
rename from tmux-plugins/tpm/scripts/clean_plugins.sh
rename to tmux/plugins/tpm/scripts/clean_plugins.sh
diff --git a/tmux-plugins/tpm/scripts/helpers/plugin_functions.sh b/tmux/plugins/tpm/scripts/helpers/plugin_functions.sh
similarity index 100%
rename from tmux-plugins/tpm/scripts/helpers/plugin_functions.sh
rename to tmux/plugins/tpm/scripts/helpers/plugin_functions.sh
diff --git a/tmux-plugins/tpm/scripts/helpers/shell_echo_functions.sh b/tmux/plugins/tpm/scripts/helpers/shell_echo_functions.sh
similarity index 100%
rename from tmux-plugins/tpm/scripts/helpers/shell_echo_functions.sh
rename to tmux/plugins/tpm/scripts/helpers/shell_echo_functions.sh
diff --git a/tmux-plugins/tpm/scripts/helpers/tmux_echo_functions.sh b/tmux/plugins/tpm/scripts/helpers/tmux_echo_functions.sh
similarity index 100%
rename from tmux-plugins/tpm/scripts/helpers/tmux_echo_functions.sh
rename to tmux/plugins/tpm/scripts/helpers/tmux_echo_functions.sh
diff --git a/tmux-plugins/tpm/scripts/helpers/tmux_utils.sh b/tmux/plugins/tpm/scripts/helpers/tmux_utils.sh
similarity index 100%
rename from tmux-plugins/tpm/scripts/helpers/tmux_utils.sh
rename to tmux/plugins/tpm/scripts/helpers/tmux_utils.sh
diff --git a/tmux-plugins/tpm/scripts/helpers/utility.sh b/tmux/plugins/tpm/scripts/helpers/utility.sh
similarity index 100%
rename from tmux-plugins/tpm/scripts/helpers/utility.sh
rename to tmux/plugins/tpm/scripts/helpers/utility.sh
diff --git a/tmux-plugins/tpm/scripts/install_plugins.sh b/tmux/plugins/tpm/scripts/install_plugins.sh
similarity index 100%
rename from tmux-plugins/tpm/scripts/install_plugins.sh
rename to tmux/plugins/tpm/scripts/install_plugins.sh
diff --git a/tmux-plugins/tpm/scripts/source_plugins.sh b/tmux/plugins/tpm/scripts/source_plugins.sh
similarity index 100%
rename from tmux-plugins/tpm/scripts/source_plugins.sh
rename to tmux/plugins/tpm/scripts/source_plugins.sh
diff --git a/tmux-plugins/tpm/scripts/update_plugin.sh b/tmux/plugins/tpm/scripts/update_plugin.sh
similarity index 100%
rename from tmux-plugins/tpm/scripts/update_plugin.sh
rename to tmux/plugins/tpm/scripts/update_plugin.sh
diff --git a/tmux-plugins/tpm/scripts/update_plugin_prompt_handler.sh b/tmux/plugins/tpm/scripts/update_plugin_prompt_handler.sh
similarity index 100%
rename from tmux-plugins/tpm/scripts/update_plugin_prompt_handler.sh
rename to tmux/plugins/tpm/scripts/update_plugin_prompt_handler.sh
diff --git a/tmux-plugins/tpm/scripts/variables.sh b/tmux/plugins/tpm/scripts/variables.sh
similarity index 100%
rename from tmux-plugins/tpm/scripts/variables.sh
rename to tmux/plugins/tpm/scripts/variables.sh
diff --git a/tmux-plugins/tpm/tests/expect_failed_plugin_download b/tmux/plugins/tpm/tests/expect_failed_plugin_download
similarity index 100%
rename from tmux-plugins/tpm/tests/expect_failed_plugin_download
rename to tmux/plugins/tpm/tests/expect_failed_plugin_download
diff --git a/tmux-plugins/tpm/tests/expect_successful_clean_plugins b/tmux/plugins/tpm/tests/expect_successful_clean_plugins
similarity index 100%
rename from tmux-plugins/tpm/tests/expect_successful_clean_plugins
rename to tmux/plugins/tpm/tests/expect_successful_clean_plugins
diff --git a/tmux-plugins/tpm/tests/expect_successful_multiple_plugins_download b/tmux/plugins/tpm/tests/expect_successful_multiple_plugins_download
similarity index 100%
rename from tmux-plugins/tpm/tests/expect_successful_multiple_plugins_download
rename to tmux/plugins/tpm/tests/expect_successful_multiple_plugins_download
diff --git a/tmux-plugins/tpm/tests/expect_successful_plugin_download b/tmux/plugins/tpm/tests/expect_successful_plugin_download
similarity index 100%
rename from tmux-plugins/tpm/tests/expect_successful_plugin_download
rename to tmux/plugins/tpm/tests/expect_successful_plugin_download
diff --git a/tmux-plugins/tpm/tests/expect_successful_update_of_a_single_plugin b/tmux/plugins/tpm/tests/expect_successful_update_of_a_single_plugin
similarity index 100%
rename from tmux-plugins/tpm/tests/expect_successful_update_of_a_single_plugin
rename to tmux/plugins/tpm/tests/expect_successful_update_of_a_single_plugin
diff --git a/tmux-plugins/tpm/tests/expect_successful_update_of_all_plugins b/tmux/plugins/tpm/tests/expect_successful_update_of_all_plugins
similarity index 100%
rename from tmux-plugins/tpm/tests/expect_successful_update_of_all_plugins
rename to tmux/plugins/tpm/tests/expect_successful_update_of_all_plugins
diff --git a/tmux-plugins/tpm/tests/helpers/tpm.sh b/tmux/plugins/tpm/tests/helpers/tpm.sh
similarity index 100%
rename from tmux-plugins/tpm/tests/helpers/tpm.sh
rename to tmux/plugins/tpm/tests/helpers/tpm.sh
diff --git a/tmux-plugins/tpm/tests/test_plugin_clean.sh b/tmux/plugins/tpm/tests/test_plugin_clean.sh
similarity index 100%
rename from tmux-plugins/tpm/tests/test_plugin_clean.sh
rename to tmux/plugins/tpm/tests/test_plugin_clean.sh
diff --git a/tmux-plugins/tpm/tests/test_plugin_installation.sh b/tmux/plugins/tpm/tests/test_plugin_installation.sh
similarity index 100%
rename from tmux-plugins/tpm/tests/test_plugin_installation.sh
rename to tmux/plugins/tpm/tests/test_plugin_installation.sh
diff --git a/tmux-plugins/tpm/tests/test_plugin_installation_legacy.sh b/tmux/plugins/tpm/tests/test_plugin_installation_legacy.sh
similarity index 100%
rename from tmux-plugins/tpm/tests/test_plugin_installation_legacy.sh
rename to tmux/plugins/tpm/tests/test_plugin_installation_legacy.sh
diff --git a/tmux-plugins/tpm/tests/test_plugin_sourcing.sh b/tmux/plugins/tpm/tests/test_plugin_sourcing.sh
similarity index 100%
rename from tmux-plugins/tpm/tests/test_plugin_sourcing.sh
rename to tmux/plugins/tpm/tests/test_plugin_sourcing.sh
diff --git a/tmux-plugins/tpm/tests/test_plugin_update.sh b/tmux/plugins/tpm/tests/test_plugin_update.sh
similarity index 100%
rename from tmux-plugins/tpm/tests/test_plugin_update.sh
rename to tmux/plugins/tpm/tests/test_plugin_update.sh
diff --git a/tmux-plugins/tpm/tpm b/tmux/plugins/tpm/tpm
similarity index 100%
rename from tmux-plugins/tpm/tpm
rename to tmux/plugins/tpm/tpm