diff --git a/.gitmodules b/.gitmodules
index a1fcbbe..493e9f9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -101,3 +101,9 @@
 [submodule "pack/vendor/start/vim-powershell.git"]
 	path = pack/vendor/start/vim-powershell.git
 	url = https://github.com/corbob/vim-powershell.git
+[submodule "pack/vendor/start/goyo.vim.git"]
+	path = pack/vendor/start/goyo.vim.git
+	url = https://github.com/junegunn/goyo.vim.git
+[submodule "pack/vendor/start/limelight.vim.git"]
+	path = pack/vendor/start/limelight.vim.git
+	url = https://github.com/junegunn/limelight.vim.git
diff --git a/config/before/theme.vim b/config/before/theme.vim
index a146c13..6b39947 100644
--- a/config/before/theme.vim
+++ b/config/before/theme.vim
@@ -8,15 +8,24 @@ endif
 " source $VIMHOME/config/themes/melange.vim
 source $VIMHOME/config/themes/miramare.vim
 
+function! s:colorscheme_gitgo()
+    hi Search guibg=Green
+endfunction
+
+function! s:colorscheme_miramare()
+    hi Search guibg=Purple
+endfunction
+
+autocmd! ColorScheme gitgo call s:colorscheme_gitgo()
+autocmd! ColorScheme miramare call s:colorscheme_miramare()
+
 function! LightOrDarkness()
     if &background==?"dark"
         set background=light
         colorscheme gitgo
-        hi Search guibg=Green
     elseif &background==?"light"
         set background=dark
         execute 'colorscheme ' . g:colorscheme
-        hi Search guibg=Purple
     endif
 endfunction
 
diff --git a/pack/vendor/start/goyo.vim.git b/pack/vendor/start/goyo.vim.git
new file mode 160000
index 0000000..7f5d35a
--- /dev/null
+++ b/pack/vendor/start/goyo.vim.git
@@ -0,0 +1 @@
+Subproject commit 7f5d35a65510083ea5c2d0941797244b9963d4a9
diff --git a/pack/vendor/start/limelight.vim.git b/pack/vendor/start/limelight.vim.git
new file mode 160000
index 0000000..86aaec1
--- /dev/null
+++ b/pack/vendor/start/limelight.vim.git
@@ -0,0 +1 @@
+Subproject commit 86aaec1700b27618d33d6182f44691d84d2cb6e5
diff --git a/vimrc b/vimrc
index f2206f3..ac09b1f 100644
--- a/vimrc
+++ b/vimrc
@@ -175,7 +175,15 @@ nnoremap "+p :let @"=substitute(system("wl-paste --no-newline"), '<C-v><C-m>', '
 nnoremap "*p :let @"=substitute(system("wl-paste --no-newline --primary"), '<C-v><C-m>', '', 'g')<cr>p
 nnoremap <Leader>u :UndotreeShow<CR>:UndotreeFocus<CR>
 " highlight the current line
-nnoremap l :call matchadd('LineHighlight', '\%'.line('.').'l')<CR>
+"nnoremap l :call matchadd('LineHighlight', '\%'.line('.').'l')<CR>
+" Limelight and Goyo
+
+nnoremap <Leader>l :Limelight!!<CR>
+xnoremap <Leader>l :Limelight!!<CR>
+nnoremap <Leader>G :Goyo<CR>
+xnoremap <Leader>G :Goyo<CR>
+
+" Move lines
 nnoremap <silent> <C-Down> :m .+1<CR>==
 nnoremap <silent> <C-Up> :m .-2<CR>==
 inoremap <silent> <C-Down> <Esc>:m .+1<CR>==gi