diff --git a/colors/onedark b/colors/onedark
new file mode 100644
index 0000000..48ebe2b
--- /dev/null
+++ b/colors/onedark
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+declare -A COLORS
+
+COLORS=(\
+  [color0]="#5C6370" \
+  [color1]="#E06C75" \
+  [color2]="#98C379" \
+  [color3]="#E5C07B" \
+  [color4]="#61AFEF" \
+  [color5]="#C678DD" \
+  [color6]="#56B6C2" \
+  [color7]="#ABB2BF" \
+  [color8]="#4C566A" \
+  [color9]="#BE5046" \
+  [color10]="#98C379" \
+  [color11]="#D19A66" \
+  [color12]="#61AFEF" \
+  [color13]="#C678DD" \
+  [color14]="#56B6C2" \
+  [color15]="#3E4452" \
+  [background]="#282C34" \
+  [lightbackground]="${COLORS[color8]}" \
+  [foreground]="#ABB2BF" \
+  [darkforeground]="${COLORS[color7]}" \
+  [red]="${COLORS[color1]}" \
+  [green]="${COLORS[color2]}" \
+  [yellow]="${COLORS[color3]}" \
+  [blue]="${COLORS[color4]}" \
+  [purple]="${COLORS[color5]}" \
+  [magenta]="${COLORS[color5]}" \
+  [cyan]="${COLORS[color6]}" \
+  [orange]="${COLORS[color3]}" \
+  [currentline]="${COLORS[color8]}" \
+  [selection]="${COLORS[currentline]}" \
+  [comment]="${COLORS[lightbackground]}" \
+  [cursor]="${COLORS[foreground]}" \
+)
+
+VIMCOLORSCHEME="onedark"
+VIMLIGHTLINE="onedark"
+VIMBACKGROUND="dark"
diff --git a/template/nvim/.config/nvim/init.vim b/template/nvim/.config/nvim/init.vim
index cb1a5b6..c08bd85 100755
--- a/template/nvim/.config/nvim/init.vim
+++ b/template/nvim/.config/nvim/init.vim
@@ -1,3 +1,5 @@
+scriptencoding utf-8
+
 " ########
 " # Plug #
 " ########
@@ -8,6 +10,7 @@ Plug 'chriskempson/base16-vim'
 Plug 'dracula/vim', { 'as': 'dracula' }
 Plug 'altercation/vim-colors-solarized'
 Plug 'arcticicestudio/nord-vim'
+Plug 'joshdick/onedark.vim'
 
 Plug 'itchyny/lightline.vim'
 Plug 'daviesjamie/vim-base16-lightline'
@@ -36,7 +39,9 @@ Plug 'lervag/vimtex'
 
 Plug 'neoclide/coc.nvim', {'branch': 'release'}
 
-Plug 'dense-alalysis/ale'
+Plug 'dense-analysis/ale'
+
+Plug 'tpope/vim-fugitive'
 
 " Plug 'numirias/semshi', {'do': ':UpdateRemotePlugins'}
 " Plug 'frazrepo/vim-rainbow'
@@ -58,6 +63,9 @@ syntax on
 " Colorscheme
 let base16colorspace=256
 let g:dracula_colorterm=0
+let g:onedark_termcolors=16
+let g:onedark_terminal_italics=1
+let g:onedark_hide_endofbuffer=1
 let g:nord_underline = 1
 let g:nord_italic = 1
 let g:nord_italic_comments = 0
@@ -69,7 +77,7 @@ let g:solarized_italic = 1
 
 set termguicolors
 colorscheme {{VIMCOLORSCHEME}}
-set bg={{VIMBACKGROUND}}
+set background={{VIMBACKGROUND}}
 
 " make the highlighting of tabs and other non-text less annoying
 highlight SpecialKey ctermbg=none ctermfg=8
@@ -89,7 +97,7 @@ set splitbelow
 set splitright
 
 " Remember last position
-if has("autocmd")
+if has('autocmd')
   au BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g'\"" | endif
 endif
 
@@ -98,7 +106,7 @@ endif
 
 " Essentials
 set encoding=utf-8                              " Set encoding
-set ffs=unix,dos,mac
+set fileformats=unix,dos,mac
 set title titlestring=                          " Change the terminal's title
 set number                                      " Show line numbers
 set relativenumber                              " Show relative numbers
@@ -148,7 +156,7 @@ set writebackup
 " ###########
 
 " Leader
-let mapleader=","       
+let mapleader=','
 
 " Movement
 nnoremap j gj
@@ -195,12 +203,24 @@ let g:lightline = {
       \     'linter_ok': 'left',
       \ },
       \ 'active': {
+      \     'left':  [ [ 'mode', 'paste' ],
+      \                [ 'gitbranch', 'readonly', 'filename', 'modified' ],
+      \                [ 'hunksummary' ] ],
       \     'right': [ [ 'linter_checking', 'linter_errors', 'linter_warnings', 'linter_ok' ],
       \                [ 'percent',  'lineinfo'],
       \                [ 'fileformat', 'fileencoding', 'filetype'] ]
-      \  }
+      \  },
+      \ 'component_function': {
+      \   'gitbranch': 'FugitiveHead',
+      \   'hunksummary': 'GitStatus'
+      \ },
       \}
 
+function! GitStatus()
+  let [a,m,r] = GitGutterGetHunkSummary()
+  return printf('+%d ~%d -%d', a, m, r)
+endfunction
+
 " ###########
 " # Plugins #
 " ###########
diff --git a/themes/iosevka b/themes/iosevka
index 0a4959c..3bd10d0 100644
--- a/themes/iosevka
+++ b/themes/iosevka
@@ -2,14 +2,14 @@
 
 FONT="Iosevka"
 ICONFONT="Noto Color Emoji"
-FONTSIZE="10"
+FONTSIZE="11"
 
 declare -A POLYBAR
 POLYBAR=(\
   [modulesleft]="i3" \
   [modulescenter]="" \
   [modulesright]="eth wifi cpu memory volume batteryemoji time date xkeyboard" \
-  [textoffset]="2" \
+  [textoffset]="3" \
   [iconfontscale]="8" \
   [antialias]="true" \
   [bottom]="false" \