diff --git a/gitconfig b/gitconfig
index 138e2f3..95abae9 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,3 +1,6 @@
 [user]
-	name = Vasili Sviridov
-	email = vasili@sviridov.ca
+	name = Vasili Svirydau
+	email = vasili.svirydau@move.com
+
+[push]
+    default = simple
diff --git a/tmux.conf b/tmux.conf
index 78814bc..4fe6741 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -1,6 +1,6 @@
 set -g default-terminal "screen-256color"
 set -g base-index 1
-set -g pane-base-index 1
+if-shell '[ "$(tmux -V | awk '{print $2*10}')" -ge 17 ]' 'set -g pane-base-index 1'
 set -g set-titles on
 set -g status-keys vi
 # Faster Command Sequences
@@ -23,4 +23,21 @@ setw -g automatic-rename on
 setw -g monitor-activity on
 setw -g aggressive-resize on
 # allow mouse to enter copy mode and initiate selection
-setw -g mode-mouse on
\ No newline at end of file
+setw -g mode-mouse on
+
+unbind C-a
+unbind C-b
+
+set -g prefix C-a
+bind-key C-a last-window
+
+set -g terminal-overrides 'xterm*:smcup@:rmcup@' # enable native xterm scrolling where available
+
+bind a send-key C-a
+
+set -g xterm-keys on
+
+bind | split-window -h # split horiz
+bind _ split-window -v # split vert
+
+bind A command-prompt "rename-window '%%'"