diff --git a/bash/.bashrc b/bash/.bashrc
index 8adaac1..14c89f5 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -36,6 +36,7 @@ alias grep='rg'
 alias be='bundle exec'
 alias ..='cd ..'
 alias ...='cd ../..'
+alias md='mkdir -p'
 
 alias gco='git checkout'
 alias gd='git diff'
@@ -48,6 +49,7 @@ alias gup='git up'
 alias gp='git push'
 alias gb='git branch'
 alias gl='git lg'
+alias gr='git reset'
 
 alias rdc='be rake db:create'
 alias rdd='be rake db:drop'
diff --git a/ruby/.gemrc b/ruby/.gemrc
index 882316e..b7ff823 100644
--- a/ruby/.gemrc
+++ b/ruby/.gemrc
@@ -1 +1,2 @@
-gem: --no-rdoc --no-ri
+install: --no-rdoc --no-ri --env-shebang
+update: --no-rdoc --no-ri
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 8cb4bd7..2b67a5d 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -1,8 +1,6 @@
 # NOTE: First of all install TPM
 # git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
 
-set-option -g default-command "reattach-to-user-namespace -l bash"
-
 # Set the base index for windows to 1 instead of 0.
 set -g base-index 1
 
@@ -47,8 +45,6 @@ set -g status-justify centre
 # => Bindings
 # Kill pane without confirmation
 bind-key x kill-pane
-bind-key \ split-window -h
-bind-key - split-window -v
 
 # Painless copying with tmux-yank
 unbind [
@@ -70,9 +66,7 @@ set -g @plugin 'tmux-plugins/tmux-sensible'
 
 # Depends on 'urlview'
 set -g @plugin 'tmux-plugins/tmux-urlview'
-set -g @plugin 'tmux-plugins/tmux-copycat'
 set -g @plugin 'tmux-plugins/tmux-yank'
-set -g @plugin 'tmux-plugins/tmux-open'
 
 # Default keysbindings for panes
 set -g @plugin 'tmux-plugins/tmux-pain-control'
diff --git a/vim/.vimrc b/vim/.vimrc
index 74c3002..3ede0c0 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -66,7 +66,6 @@ Plug 'dyng/ctrlsf.vim'
 Plug 'terryma/vim-expand-region'
 Plug 'terryma/vim-multiple-cursors'
 Plug 'bogado/file-line'
-Plug 'neomake/neomake'
 Plug 'vim-utils/vim-interruptless'
 
 " ======== Snippets & Autocomplete ======================
@@ -94,8 +93,9 @@ Plug 'tpope/vim-vinegar'
 
 " ======== Experimental =================================
 
-Plug 'junegunn/goyo.vim'
-Plug 'junegunn/limelight.vim'
+Plug 'w0rp/ale'
+" Plug 'junegunn/goyo.vim'
+" Plug 'junegunn/limelight.vim'
 
 call plug#end()
 
@@ -339,6 +339,20 @@ let g:UltiSnipsExpandTrigger       = '<tab>'
 let g:UltiSnipsJumpForwardTrigger  = '<tab>'
 let g:UltiSnipsJumpBackwardTrigger = '<s-tab>'
 
+" --- gitgutter
+
+let g:gitgutter_sign_added = '│'
+let g:gitgutter_sign_modified = '│'
+let g:gitgutter_sign_removed = '│'
+let g:gitgutter_sign_modified_removed = '│'
+let g:gitgutter_sign_removed_first_line = '│'
+
+" --- ale
+
+let g:ale_sign_error = 'x'
+let g:ale_sign_warning = '│'
+let g:ale_echo_msg_format = '[%severity%] %s'
+
 " --- fzf
 
 let g:fzf_colors =
@@ -454,11 +468,6 @@ let g:lightline.mode_map =
   \ }
 
 
-" --- neomake
-
-call neomake#configure#automake('rw')
-
-
 
 " ========================================================
 " -> Autocommands
@@ -685,13 +694,7 @@ nnoremap ; :
 " Close buffer by Q
 nnoremap <silent> Q :q!<CR>
 
-" Move between splits (not very nice)
-nmap <silent> <Up> :wincmd k<CR>
-nmap <silent> <Down> :wincmd j<CR>
-nmap <silent> <Left> :wincmd h<CR>
-nmap <silent> <Right> :wincmd l<CR>
-
-" Move between splits (better backup option)
+" Move between splits
 nnoremap <C-h> <C-w>h
 nnoremap <C-j> <C-w>j
 nnoremap <C-k> <C-w>k
@@ -701,6 +704,9 @@ nnoremap <C-l> <C-w>l
 cnoremap <C-A> <Home>
 cnoremap <C-E> <End>
 
+" CtrlP -> fzf :Files
+nnoremap <silent> <expr> <space> (expand('%') =~ 'NERD_tree' ? "\<c-w>\<c-w>" : '').":Files\<cr>"
+
 " ,<space> -> clears search highlight
 nmap <silent><leader><space> :nohlsearch<cr>
 " ,, -> toggle between last open buffers
@@ -736,13 +742,6 @@ nmap <silent><S-Tab> :tabprevious<CR>
 nmap N Nzz
 nmap n nzz
 
-" Move faster
-nnoremap <C-j> <C-d>
-nnoremap <C-k> <C-u>
-" Even in VISUAL mode
-vnoremap <C-j> <C-d>
-vnoremap <C-k> <C-u>
-
 " Move properly when line wrapping is on
 nnoremap j gj
 nnoremap k gk
@@ -802,56 +801,5 @@ noremap <leader>gup :Gpull<CR>
 noremap <leader>gs :Gstatus<CR>
 noremap <leader>gd :Gvdiff<CR>
 
-" CtrlP -> fzf
-nnoremap <C-p> :Files<Cr>
-
-" TODO: Space should be used for something more useful
-" Folding on <Space>
-
-" NOTE: Keep this for future reference
-" My attempt at git 2-way merging
-" map <silent> <space>l :diffget //2<CR>:diffupdate<CR>
-" map <silent> <space>h :diffget //3<CR>:diffupdate<CR>
-" nnoremap <space>j ]cw
-" nnoremap <space>k [cw
-" map <silent> <space><w> :only<CR>:w<CR>
-
-" REMINDERS:
-" m         -- ruby method motion (e.g. cim)
-" i         -- indentation motion (e.g. dai)
-
-" EXPERIMENTAL:
-
 " Color under cursor
 map <F10> :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<' . synIDattr(synID(line("."),col("."),0),"name") . "> lo<" . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">"<CR>
-
-" Color name (:help cterm-colors) or ANSI code
-let g:limelight_conceal_ctermfg = 240
-
-" Default: 0.5
-let g:limelight_default_coefficient = 0.7
-
-" Highlighting priority (default: 10)
-"   Set it to -1 not to overrule hlsearch
-let g:limelight_priority = -1
-
-" Goyo
-" Toggle distraction-free mode
-nnoremap <silent> <leader>g :Goyo<cr>
-
-fun! s:goyoEnter()
-  set scrolloff=999 " Keep the edited line vertically centered
-  set wrap
-  set noshowcmd
-  Limelight
-endf
-
-fun! s:goyoLeave()
-  set showcmd
-  set nowrap
-  set scrolloff=5
-  Limelight!
-endf
-
-autocmd! User GoyoEnter nested call <sid>goyoEnter()
-autocmd! User GoyoLeave nested call <sid>goyoLeave()