diff --git a/vimrc b/vimrc
index 0073e69..5b773f0 100644
--- a/vimrc
+++ b/vimrc
@@ -145,8 +145,8 @@ if has('autocmd')
     autocmd BufRead,BufNewFile *.yaml set et sw=2
     autocmd BufRead,BufNewFile *.yml set et sw=2
 
-    autocmd User GoyoEnter nested call <SID>goyo_enter()
-    autocmd User GoyoLeave nested call <SID>goyo_leave()
+    autocmd User GoyoEnter Limelight
+    autocmd User GoyoLeave Limelight!
 
     augroup VCenterCursor
         au!
@@ -217,14 +217,6 @@ if has('wildmenu')
     set wildmenu
 endif
 
-function! s:goyo_enter()
-    Limelight
-endfunction
-
-function! s:goyo_leave()
-    Limelight!
-endfunction
-
 " Customise colour schemes. Keep this near the end.
 if &background ==# 'light'
     highlight SpecialKey ctermfg=lightgray ctermbg=NONE