diff --git a/roles/vim.nix b/roles/vim.nix
index c02814a..33d1adf 100644
--- a/roles/vim.nix
+++ b/roles/vim.nix
@@ -87,6 +87,9 @@ vim_configurable.customize {
     function! ReStructuredSettings()
         set textwidth=79
         set spell spelllang=en_au
+        hi clear SpellBad             " Clear any unwanted default settings
+        hi SpellBad cterm=underline   " Set the spell checking highlight style
+        hi SpellBad ctermbg=NONE      " Set the spell checking highlight background
     endfunction
     autocmd BufNewFile,BufFilePre,BufRead *.rst :call ReStructuredSettings()
     autocmd BufNewFile,BufFilePre,BufRead *.txt :call ReStructuredSettings()
@@ -171,8 +174,13 @@ vim_configurable.customize {
         set shiftwidth=2
         set expandtab
         set textwidth=79
+        set spell spelllang=en_au
+        hi clear SpellBad             " Clear any unwanted default settings
+        hi SpellBad cterm=underline   " Set the spell checking highlight style
+        hi SpellBad ctermbg=NONE      " Set the spell checking highlight background
     endfunction
     autocmd BufNewFile,BufFilePre,BufRead *.yaml :call YAMLSettings()
+    autocmd BufNewFile,BufFilePre,BufRead *.yml :call YAMLSettings()
 
     " Settings for my Bash environment:
     function! BashSettings()