diff --git a/.gitmodules b/.gitmodules
index d2bac13..961afe6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "pack/plugins/start/vim-airline"]
 	path = pack/plugins/start/vim-airline
 	url = https://github.com/vim-airline/vim-airline.git
+[submodule "pack/plugins/start/vim-fish"]
+	path = pack/plugins/start/vim-fish
+	url = https://github.com/dag/vim-fish.git
diff --git a/init.vim b/init.vim
index 9df9883..6e18640 100644
--- a/init.vim
+++ b/init.vim
@@ -1,14 +1,3 @@
-" An example for a vimrc file.
-"
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last change:	2017 Sep 20
-"
-" To use it, copy it to
-"     for Unix and OS/2:  ~/.vimrc
-"	      for Amiga:  s:.vimrc
-"  for MS-DOS and Win32:  $VIM\_vimrc
-"	    for OpenVMS:  sys$login:.vimrc
-
 " set relative line numbers
 set number relativenumber
 " set highlighting and continous search 
@@ -17,6 +6,17 @@ set hlsearch incsearch
 nnoremap <F2> noh
 " 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
+" make escape work in terminal and send ESC to terminal with C-Esc
+tnoremap <Esc> <C-\><C-n>
+tnoremap <C-Esc> <Esc>
+
+" VIM-FISH
+syntax enable
+filetype plugin indent on
+" Set up :make to use fish for syntax checking.
+autocmd FileType fish compiler fish
 
 if has("vms")
   set nobackup		" do not keep a backup file, use versions instead
diff --git a/pack/plugins/start/vim-airline b/pack/plugins/start/vim-airline
index e3cfd36..56197d5 160000
--- a/pack/plugins/start/vim-airline
+++ b/pack/plugins/start/vim-airline
@@ -1 +1 @@
-Subproject commit e3cfd3643b0f4c9650d5eb23912fef12d88e7a60
+Subproject commit 56197d510468f405c630a4a48b1bb207f83d14ac
diff --git a/pack/plugins/start/vim-fish b/pack/plugins/start/vim-fish
new file mode 160000
index 0000000..50b95cb
--- /dev/null
+++ b/pack/plugins/start/vim-fish
@@ -0,0 +1 @@
+Subproject commit 50b95cbbcd09c046121367d49039710e9dc9c15f