diff --git a/home/.config/matplotlib/matplotlibrc b/home/.config/matplotlib/matplotlibrc
index f98228c..fc256c6 100644
--- a/home/.config/matplotlib/matplotlibrc
+++ b/home/.config/matplotlib/matplotlibrc
@@ -627,4 +627,4 @@ savefig.bbox        : tight # 'tight' or 'standard'.
                                    # On Windows use the full path since convert
                                    # is also the name of a system tool.
                                    #
-mpl_toolkits.legacy_colorbar: False
+#mpl_toolkits.legacy_colorbar: False
diff --git a/home/.config/yamllint/config b/home/.config/yamllint/config
index a8440e0..71389b7 100644
--- a/home/.config/yamllint/config
+++ b/home/.config/yamllint/config
@@ -20,13 +20,15 @@ rules:
   hyphens: enable
   indentation: enable
   key-duplicates: enable
-  key-ordering: {}
+  key-ordering: disable
   line-length: enable
   new-line-at-end-of-file: enable
   new-lines: enable
   octal-values: enable
   quoted-strings:
     quote-type: double
+    required: only-when-needed
+    allow-quoted-quotes: true
   trailing-spaces: enable
   truthy:
     allowed-values:
diff --git a/home/.vimrc b/home/.vimrc
index c25aeba..294c7c3 100644
--- a/home/.vimrc
+++ b/home/.vimrc
@@ -9,3 +9,5 @@ exe "source " . g:my_environ_dir . "/home/.vimrc.d/plugins.vim"
 exe "source " . g:my_environ_dir . "/home/.vimrc.d/dev-environ.vim"
 
 exe "source " . g:my_environ_dir . "/home/.vimrc.d/gui.vim"
+
+exe "source " . g:my_environ_dir . "/home/.vimrc.d/override.vim"
diff --git a/home/.vimrc.d/base.vim b/home/.vimrc.d/base.vim
index 4030da2..70eec44 100644
--- a/home/.vimrc.d/base.vim
+++ b/home/.vimrc.d/base.vim
@@ -25,6 +25,8 @@ set nocompatible                 " The most important VIM option
 scriptencoding utf-8		         " Convert all scripts into UTF8 format
 
 " Typing options:
+" There is an indent override in override.vim
+
 set smarttab
 set tabstop=4                    " Set the default tabstops
 set shiftwidth=4                 " Set the default autoindent
diff --git a/home/.vimrc.d/override.vim b/home/.vimrc.d/override.vim
new file mode 100644
index 0000000..c198a56
--- /dev/null
+++ b/home/.vimrc.d/override.vim
@@ -0,0 +1,2 @@
+" This has to be after the filetype plugin.
+:autocmd Filetype * setlocal indentkeys-=0#