diff --git a/gitconfig b/gitconfig
index 95abae9..5328889 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,6 +1,17 @@
 [user]
-	name = Vasili Svirydau
-	email = vasili.svirydau@move.com
+    name = Vasili Sviridov
+    email = vasili@sviridov.ca
 
 [push]
     default = simple
+
+[core]
+    editor = /usr/bin/vim
+[diff]
+    tool = bcomp
+[merge]
+    tool = bcomp
+
+[mergetool "bcomp"]
+    trustExitCode = true
+    cmd = bcomp \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
diff --git a/htoprc b/htoprc
new file mode 100644
index 0000000..99e2ace
--- /dev/null
+++ b/htoprc
@@ -0,0 +1,22 @@
+# Beware! This file is rewritten every time htop exits.
+# The parser is also very primitive, and not human-friendly.
+# (I know, it's in the todo list).
+fields=0 48 17 18 38 39 40 2 46 47 49 1 
+sort_key=47
+sort_direction=1
+hide_threads=0
+hide_kernel_threads=1
+hide_userland_threads=1
+shadow_other_users=1
+highlight_base_name=1
+highlight_megabytes=1
+highlight_threads=1
+tree_view=1
+header_margin=1
+detailed_cpu_time=0
+color_scheme=0
+delay=15
+left_meters=AllCPUs Memory Swap 
+left_meter_modes=1 1 1 
+right_meters=Tasks LoadAverage Uptime 
+right_meter_modes=2 2 2 
diff --git a/rubocop.yml b/rubocop.yml
new file mode 100644
index 0000000..c441045
--- /dev/null
+++ b/rubocop.yml
@@ -0,0 +1,2 @@
+Metrics/LineLength:
+  Enabled: false
diff --git a/setup.sh b/setup.sh
index 1fdf436..ed96531 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,18 +1,18 @@
-#!/bin/sh
+#!/bin/bash
 
 # From aaronjensen/dotfiles
 
-cd `dirname $0`
-F=`pwd |sed -e "s#$HOME/\?##"`
+cd "$(dirname "$0")"
+F=$( pwd |sed -e "s#$HOME/\?##" )
 
 for P in *
 do
   # skip setup
   if [ "$P" = "setup.sh" ]; then continue; fi
-  if [ "$P" = "READNE.md" ]; then continue; fi
+  if [ "$P" = "README.md" ]; then continue; fi
 
   # ensure permissions
-  chmod -R o-rwx,g-rwx $P
+  chmod -R o-rwx,g-rwx "$P"
 
   # skip existing links
   if [ -h "$HOME/.$P" ]; then continue; fi
diff --git a/tmux.conf b/tmux.conf
index 4fe6741..31c133e 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -1,29 +1,19 @@
+set -g default-command "reattach-to-user-namespace -l fish"
 set -g default-terminal "screen-256color"
+run "~/.dotfiles/tmux.sh"
 set -g 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
 set -s escape-time 0
-# mouse can be used to select panes
-set -g mouse-select-pane on
-# mouse can be used to select windows (by clicking in the status bar)
-set -g mouse-select-window on
-# mouse can be used to resize panes (by dragging dividers)
-set -g mouse-resize-pane on
-# not really sure what this does, but with it, the scrollwheel works inside Vim
-set -g mouse-utf8 on
+
 set -g set-clipboard on
 set -g history-limit 50000
 
-
-setw -g utf8 on
 setw -g xterm-keys on
 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
 
 unbind C-a
 unbind C-b
@@ -37,7 +27,9 @@ bind a send-key C-a
 
 set -g xterm-keys on
 
-bind | split-window -h # split horiz
-bind _ split-window -v # split vert
+bind | split-window -h -c "#{pane_current_path}"# split horiz
+bind _ split-window -v -c "#{pane_current_path}"# split vert
 
 bind A command-prompt "rename-window '%%'"
+
+new-session # always create a session (can always `tmux a`)