diff --git a/init.lua b/init.lua
index 137cde1..58112d6 100644
--- a/init.lua
+++ b/init.lua
@@ -1,7 +1,6 @@
 -- remap leader to <space>
 vim.g.mapleader = ' '
 
-require('theme')
 require('settings')
 require('lsp')
 require('keymappings')
diff --git a/lua/settings.lua b/lua/settings.lua
index 376fb39..639827c 100644
--- a/lua/settings.lua
+++ b/lua/settings.lua
@@ -29,11 +29,11 @@ vim.opt.exrc = true
 vim.opt.secure = true
 
 vim.cmd([[
-    syntax enable
-    filetype plugin indent on
     set noautoread
     autocmd CursorHold * checktime
     autocmd TextYankPost * lua vim.highlight.on_yank {on_visual = false}
     autocmd BufRead,BufNewFile *.bu,*.yml.example,*.yaml.example set filetype=yaml
     autocmd BufRead,BufNewFile *.ign set filetype=json
+    match Error /\s\+$/
+    let g:airline_theme='papercolor'
 ]])
diff --git a/lua/theme.lua b/lua/theme.lua
deleted file mode 100644
index 77f774c..0000000
--- a/lua/theme.lua
+++ /dev/null
@@ -1,17 +0,0 @@
--- Revert to vim's default term colorscheme
-vim.cmd 'colorscheme vim'
-vim.cmd 'set notermguicolors'
-
--- Highlight trailing whitespace (darker red)
-vim.cmd 'highlight WhitespaceEOL ctermbg=red guibg=#ab0d0d'
-vim.cmd 'match WhitespaceEOL /\\s\\+\\%#\\@<!$/'
-
-vim.cmd 'highlight Visual cterm=bold ctermbg=Grey ctermfg=none'
-vim.cmd 'highlight Search ctermfg=Black'
-vim.cmd 'highlight SignColumn ctermbg=none'
-vim.cmd 'highlight LineNr ctermbg=none ctermfg=LightGrey'
-vim.cmd 'highlight Folded ctermbg=LightGrey ctermfg=Black'
-vim.cmd 'highlight Pmenu ctermbg=253 ctermfg=Black'
-vim.cmd 'let g:airline_theme=\'papercolor\''
-
-vim.g.code_action_menu_window_border = 'single'