diff --git a/.vim/after/ftplugin/markdown.vim b/.vim/after/ftplugin/markdown.vim
new file mode 100644
index 00000000..bcda2dde
--- /dev/null
+++ b/.vim/after/ftplugin/markdown.vim
@@ -0,0 +1 @@
+setlocal spell
diff --git a/.vim/after/ftplugin/ruby.vim b/.vim/after/ftplugin/ruby.vim
index ce07d87a..c75e6fd8 100644
--- a/.vim/after/ftplugin/ruby.vim
+++ b/.vim/after/ftplugin/ruby.vim
@@ -1,2 +1 @@
-highlight rubyDefine ctermbg=235
 set foldmethod=syntax
diff --git a/.vim/after/ftplugin/toml.vim b/.vim/after/ftplugin/toml.vim
new file mode 100644
index 00000000..463eea98
--- /dev/null
+++ b/.vim/after/ftplugin/toml.vim
@@ -0,0 +1 @@
+setlocal commentstring=#\ %s
diff --git a/.vim/ftdetect/markdown.vim b/.vim/ftdetect/markdown.vim
deleted file mode 100644
index ad2e510e..00000000
--- a/.vim/ftdetect/markdown.vim
+++ /dev/null
@@ -1 +0,0 @@
-autocmd BufRead,BufNewFile *.md setlocal spell
diff --git a/.vim/ftdetect/toml.vim b/.vim/ftdetect/toml.vim
new file mode 100644
index 00000000..7ec14b6c
--- /dev/null
+++ b/.vim/ftdetect/toml.vim
@@ -0,0 +1 @@
+au BufRead,BufNewFile *.toml set filetype=toml