diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..770a23e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.netrwhist*
+*~
diff --git a/.gitmodules b/.gitmodules
index 6241c8d..e580be8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "pack/plugins/start/vim-racket"]
 	path = pack/plugins/start/vim-racket
 	url = https://github.com/wlangstroth/vim-racket.git
+[submodule "pack/plugins/opt/onedark.vim"]
+	path = pack/plugins/opt/onedark.vim
+	url = https://github.com/joshdick/onedark.vim
diff --git a/autostart b/autostart
new file mode 120000
index 0000000..713d180
--- /dev/null
+++ b/autostart
@@ -0,0 +1 @@
+pack/plugins/start/
\ No newline at end of file
diff --git a/init.vim b/init.vim
index 6e18640..378cebc 100644
--- a/init.vim
+++ b/init.vim
@@ -1,18 +1,53 @@
+" vim: set tw=80 :
+
+" SETTINGS
+
 " set relative line numbers
 set number relativenumber
-" set highlighting and continous search 
+
+" set highlighting and continous search
 set hlsearch incsearch
-" clear search with F2
-nnoremap <F2> noh
-" show n-column limiter when textwidth is set 
+
+" show n-column limiter when textwidth is set
 set colorcolumn=+1
+
 " prevent terminal buffers to be closed when changing buffer
 autocmd TermOpen * set bufhidden=hide
+
+" remove line numbers to terminale
+autocmd TermOpen * set nornu nonu
+
+" set autoindent on`
+set autoindent
+
+" Make :find work on all files in :pwd
+set path+=**
+
+" ADDITIONAL COMMANDS
+
 " make escape work in terminal and send ESC to terminal with C-Esc
 tnoremap <Esc> <C-\><C-n>
 tnoremap <C-Esc> <Esc>
 
-" VIM-FISH
+" clear search with F2
+nnoremap <F2> noh
+
+" clear trailing spaces with F3
+nnoremap <F3> :%s/\s *$//g<CR>
+
+" show Vim's true competitor with Ctrl-F1
+nnoremap <F4> :!open https://youtu.be/jn40Ugz0vuk<CR><CR>
+
+" COLORSCHEME
+
+" set colorscheme to onedark.vim for nvim and airline
+packadd! onedark.vim
+colorscheme onedark
+let g:airline_theme='onedark'
+
+" PACKAGES
+
+" vim-fish setup
 syntax enable
 filetype plugin indent on
 " Set up :make to use fish for syntax checking.
@@ -27,20 +62,3 @@ else
   endif
 endif
 
-" Only do this part when compiled with support for autocommands.
-if has("autocmd")
-
-  " Put these in an autocmd group, so that we can delete them easily.
-  augroup vimrcEx
-  au!
-
-  " For all text files set 'textwidth' to 78 characters.
-  autocmd FileType text setlocal textwidth=78
-
-  augroup END
-
-else
-
-  set autoindent		" always set autoindenting on
-
-endif " has("autocmd")
diff --git a/pack/plugins/opt/onedark.vim b/pack/plugins/opt/onedark.vim
new file mode 160000
index 0000000..2a6155a
--- /dev/null
+++ b/pack/plugins/opt/onedark.vim
@@ -0,0 +1 @@
+Subproject commit 2a6155a255e83bb930da2627dce4259a3fe4ce3a