diff --git a/bin/.bin b/bin/.bin
deleted file mode 120000
index 401285d..0000000
--- a/bin/.bin
+++ /dev/null
@@ -1 +0,0 @@
-/home/tine/Projects/workspace/bin
\ No newline at end of file
diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index 7db14e7..617df9c 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -1,5 +1,12 @@
 bind c new-window -c "#{pane_current_path}"
 
+# Needed for NVIM
+set-option -sg escape-time 10
+
+# History
+set-option -g history-limit 50000
+
+# Vim mode
 set -g status-keys vi
 setw -g mode-keys vi
 
diff --git a/vim/vimrc b/vim/vimrc
index 61119af..0a69d10 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -137,11 +137,9 @@ set splitright
 set splitbelow
 
 set autoindent
-set tabstop=4
+set tabstop=2
 set shiftwidth=2
-set softtabstop=0
 set expandtab
-set smarttab
 
 set noswapfile
 set nobackup
diff --git a/zsh/zshrc b/zsh/zshrc
index d249319..86cdafe 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -41,6 +41,10 @@ bindkey -v
 bindkey -M vicmd "?" history-incremental-search-backward
 bindkey -M vicmd "/" history-incremental-search-forward
 
+# Aliases
+alias gicm="git checkout main && git pull"
+alias gic="git checkout"
+
 # PATH
 export PATH=$PATH:$HOME/.bin:$HOME/go/bin