diff --git a/README.md b/README.md
index a4e00b2..4eb8629 100644
--- a/README.md
+++ b/README.md
@@ -3,4 +3,4 @@ dotfiles
 
 Configuration files
 
-run install.sh
+run setup.sh
diff --git a/dotfiles/.gitconfig b/dotfiles/.gitconfig
index 3290416..e575a68 100644
--- a/dotfiles/.gitconfig
+++ b/dotfiles/.gitconfig
@@ -1,13 +1,10 @@
 [user]
-    name = Vasili Sviridov
-    email = vasili@sviridov.ca
+    name = Vasili Svirydau
+    email = vsvirydau@copperleaf.com
 
 [push]
     default = simple
 
-[pull]
-    rebase = true
-
 [core]
     editor = /usr/bin/vim
 
@@ -30,3 +27,6 @@
 
 [alias]
     ignore = "!gi() { curl -sL https://www.gitignore.io/api/$@ ;}; gi"
+
+[rebase]
+	instructionFormat = (%an <%ae>) %s
diff --git a/dotfiles/.rubocop.yml b/dotfiles/.rubocop.yml
deleted file mode 100644
index c441045..0000000
--- a/dotfiles/.rubocop.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-Metrics/LineLength:
-  Enabled: false
diff --git a/dotfiles/.tmux.conf b/dotfiles/.tmux.conf
index b50d2fa..05eb15b 100644
--- a/dotfiles/.tmux.conf
+++ b/dotfiles/.tmux.conf
@@ -1,6 +1,4 @@
-if-shell "command -v reattach-to-user-namespace" "set -g default-command \"reattach-to-user-namespace -l $SHELL\""
-set -g default-terminal "tmux-256color"
-run "~/.dotfiles/tmux.sh"
+set -g default-terminal "xterm-256color"
 set -g base-index 1
 set -g set-titles on
 set -g status-keys vi
@@ -36,6 +34,19 @@ bind A command-prompt "rename-window '%%'"
 
 set -g mouse on
 
-set-option -g update-environment "DISPLAY"
+set-option -ga update-environment "DISPLAY SSH_ASKPASS SSH_AUTH_SOCK SSH_AGENT_PID SSH_CONNECTION WINDOWID XAUTHORITY"
 
 new-session # always create a session (can always `tmux a`)
+
+set -g status on
+set -g status-interval 15
+set -g status-justify left
+set -g status-keys vi
+set -g status-left "#[fg=colour193,bg=colour65] #S #[fg=colour65,bg=colour237,nobold,nounderscore,noitalics]"
+set -g status-left-length 100
+set -g status-left-style default
+set -g status-position bottom
+set -g status-right "#[fg=colour235,bg=colour237,nobold,nounderscore,noitalics]#[fg=colour250,bg=colour235] %Y-%m-%d  %H:%M #[fg=colour65,bg=colour235,nobold,nounderscore,noitalics]#[fg=colour193,bg=colour65] #h "
+set -g status-right-length 100
+set -g status-right-style default
+set -g status-style fg=black,bg=colour237