diff --git a/.config/nvim/lua/blake/settings.lua b/.config/nvim/lua/blake/settings.lua
index 950b0ee..6f734a2 100644
--- a/.config/nvim/lua/blake/settings.lua
+++ b/.config/nvim/lua/blake/settings.lua
@@ -18,10 +18,9 @@ set.ignorecase = true
 set.smartcase = true
 set.wrap = false
 set.linebreak = true
-set.syntax = 'on'
 set.redrawtime = 200
 set.updatetime = 300
-set.number = true --relativenumber
+set.number = true
 set.errorbells = false
 set.encoding = 'UTF-8'
 set.cursorline = true
@@ -32,33 +31,18 @@ set.scrolloff = 5
 --set.wildmode = full
 set.hidden = true
 set.shortmess = 'filnxtToOFc'
---set.spell = true
+-- set.spell = true
 set.spelllang = 'en_us'
 set.showcmd = true
 set.signcolumn = 'yes'
 set.makeprg = 'make -j$(nproc)'
 set.ruler = false
+set.listchars = "eol:↵,trail:~,tab:>-,nbsp:␣"
 
--- Things that can't be translated to lua
-vim.cmd 'syntax on'
-vim.cmd "let g:markdown_fenced_languages = ['bash=sh', 'javascript', 'cpp=cpp', 'c++=cpp', 'js=javascript', 'json=javascript', 'typescript', 'ts=typescript', 'php', 'html', 'css']"
+----------------------------------------------
+--- Key bindings (needs to be translated?) ---
+----------------------------------------------
 
---- autocmd's
--- Spell check in git commits by default
-vim.cmd 'autocmd Filetype gitcommit setlocal spell'
-
--- Disable spell check in help files
-vim.cmd 'autocmd FileType help setlocal nospell'
-vim.cmd 'filetype plugin on'
-
--- Automatically disable line numbers when in terminal mode
-vim.cmd 'autocmd TermOpen * setlocal nospell nonumber norelativenumber'
-
--- Automatically toggle relative line numbers
---vim.cmd 'autocmd InsertEnter * :set norelativenumber '
---vim.cmd 'autocmd InsertLeave * :set relativenumber '
-
---- Key bindings
 vim.cmd 'let mapleader = " "'
 
 -- *sigh*...
@@ -113,7 +97,28 @@ vim.cmd "vnoremap K :m '<-2<CR>gv=gv"
 
 -- Format text with Q, rather than gw
 vim.cmd 'nnoremap Q gw'
-vim.cmd 'colorscheme slate'
+
+----------------------------------------------
+--- Things that can't be translated to lua ---
+----------------------------------------------
+
+vim.cmd 'syntax enable'
+vim.cmd "let g:markdown_fenced_languages = [ 'bash=sh', 'javascript', 'cpp=cpp', 'c++=cpp', 'js=javascript', 'json=javascript', 'typescript', 'ts=typescript', 'php', 'html', 'css' ]"
+
+--- autocmd's ---
+-- Spell check in git commits by default
+vim.cmd 'autocmd Filetype gitcommit setlocal spell'
+
+-- Disable spell check in help files
+vim.cmd 'autocmd FileType help setlocal nospell'
+vim.cmd 'filetype plugin on'
+
+-- Automatically disable line numbers when in terminal mode
+vim.cmd 'autocmd TermOpen * setlocal nospell nonumber norelativenumber'
+
+-- Automatically toggle relative line numbers
+--vim.cmd 'autocmd InsertEnter * :set norelativenumber '
+--vim.cmd 'autocmd InsertLeave * :set relativenumber '
 
 -- 24-bit color
 vim.cmd [[
@@ -165,9 +170,6 @@ vim.cmd [[
 -- Automatically jump to the last position in a file when opening
 vim.cmd [[ au BufReadPost * if expand('%:p') !~# '\m/\.git/' && line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g'\"" | endif ]]
 
--- Highlight trailing whitespace in red
-set.listchars = "eol:↵,trail:~,tab:>-,nbsp:␣"
-
 -- Highlight trailing whitespace in red
 vim.cmd [[
    highlight ExtraWhitespace ctermbg=red guibg=red