diff --git a/cmd/deploy/main.go b/cmd/deploy/main.go
index 79781c3..5707852 100644
--- a/cmd/deploy/main.go
+++ b/cmd/deploy/main.go
@@ -52,7 +52,7 @@ func allTargets() []target {
 	return []target{
 		{name: "zsh", src: "zshrc", dest: filepath.Join(home, ".zshrc"), command: "zsh"},
 		{name: "nvim", src: "nvim", dest: filepath.Join(home, ".config", "nvim"), isDir: true, command: "nvim"},
-		{name: "tmux", src: "tmux.conf", dest: filepath.Join(home, ".tmux.conf"), command: "tmux"},
+		{name: "tmux", src: "tmux.conf", dest: filepath.Join(home, ".config", "tmux", "tmux.conf"), command: "tmux"},
 		{name: "aerospace", src: "aerospace.toml", dest: filepath.Join(home, ".aerospace.toml"), command: "aerospace"},
 		{name: "ghostty", src: "config.ghostty", dest: filepath.Join(home, ".config", "ghostty", "config")},
 		{name: "git", src: "gitconfig", dest: filepath.Join(home, ".gitconfig"), command: "git"},
diff --git a/deploy.sh b/deploy.sh
index 5fbee62..d64e145 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -139,7 +139,7 @@ do_backup() {
     case "$t" in
       zsh)       [[ -f "$HOME/.zshrc" ]] && needs_backup=true ;;
       nvim)      [[ -d "$HOME/.config/nvim" ]] && needs_backup=true ;;
-      tmux)      [[ -f "$HOME/.tmux.conf" ]] && needs_backup=true ;;
+      tmux)      [[ -f "$HOME/.config/tmux/tmux.conf" ]] && needs_backup=true ;;
       aerospace) [[ -f "$HOME/.aerospace.toml" ]] && needs_backup=true ;;
       ghostty)   [[ -f "$HOME/.config/ghostty/config" ]] && needs_backup=true ;;
       git)       [[ -f "$HOME/.gitconfig" ]] && needs_backup=true ;;
@@ -157,7 +157,7 @@ do_backup() {
     case "$t" in
       zsh)       backup_file "$HOME/.zshrc" ;;
       nvim)      backup_file "$HOME/.config/nvim" ;;
-      tmux)      backup_file "$HOME/.tmux.conf" ;;
+      tmux)      backup_file "$HOME/.config/tmux/tmux.conf" ;;
       aerospace) backup_file "$HOME/.aerospace.toml" ;;
       ghostty)   backup_file "$HOME/.config/ghostty/config" ;;
       git)       backup_file "$HOME/.gitconfig" ;;
@@ -198,8 +198,9 @@ deploy() {
       ;;
 
     tmux)
-      if cp "$SCRIPT_DIR/tmux.conf" "$HOME/.tmux.conf" 2>/dev/null; then
-        success "tmux" "tmux.conf" "$HOME/.tmux.conf"
+      mkdir -p "$HOME/.config/tmux"
+      if cp "$SCRIPT_DIR/tmux.conf" "$HOME/.config/tmux/tmux.conf" 2>/dev/null; then
+        success "tmux" "tmux.conf" "$HOME/.config/tmux/tmux.conf"
         DEPLOYED=$((DEPLOYED + 1))
       else
         fail "tmux" "failed to copy tmux.conf"
diff --git a/tmux.conf b/tmux.conf
index bbae322..2d5205c 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -1,6 +1,7 @@
 # ==========================
 # General Options
 # ==========================
+set -g history-limit 1000000
 set-option -g mouse on
 set -g base-index 1
 set -g pane-base-index 1
@@ -28,6 +29,9 @@ bind-key -n C-Down select-pane -D
 # Create 4 split panes (2x2 grid)
 bind-key g split-window -h \; split-window -v \; select-pane -t 0 \; split-window -v
 
+# Create 3 split panes (main top-left 70%, sidebar top-right 30%, bottom 25%)
+bind-key G split-window -v \; select-pane -U \; split-window -h \; resize-pane -t 2 -x 30% \; resize-pane -t 3 -y 25% \; select-pane -t 1
+
 # Copy mode vim-style bindings
 bind-key -T copy-mode-vi v send-keys -X begin-selection
 bind-key -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "pbcopy"