diff --git a/home/.config/nvim/rc/base.vim b/home/.config/nvim/rc/base.vim
index 88442d5..070021f 100644
--- a/home/.config/nvim/rc/base.vim
+++ b/home/.config/nvim/rc/base.vim
@@ -1,24 +1,28 @@
 filetype plugin on              " Enable filetype detection
-set undolevels=999				" Lots of these
-set history=1000				" More history
-set expandtab					" Expand tabs to spaces (inverse: noexpandtab)
+
+" Tab settings
+set expandtab					" Expand tabs to spaces
 set tabstop=4					" Tab size
 set shiftwidth=4				" Indentation size
 set softtabstop=4				" Tabs/Spaces interrop
 set tabpagemax=50				" More tabs
-set autoindent					" Enable autoindent
-set showmatch					" Show matching brackets
+
+" In-file Search (/)
 set ignorecase					" Do case insensitive matching
 set incsearch					" Show partial matches for a search phrase
 set hlsearch					" Highlight Search
-set laststatus=2				" Always show status line
-set splitbelow splitright		" Split in more natural way
-set autoread					" Reload files on change
-set mouse=a				        " Enable mouse mode
-set encoding=utf-8				" Use UTF-8, not ASCII (May cause issues on TTY)
-set wildmode=longest,list,full	" Enable autocompletion
-set path+=**                    " Search down into subfolders with tab completion
-set wildmenu                    " Display all matching files when we tab complete
-set scrolloff=5                 " Keep 5 lines horizontal scrolloff
-set sidescrolloff=5             " Keep 5 characters vertical scrolloff
+
+" Command-mode search
+set path+=**                    " Search down into subfolders with tab completion
+set wildmode=longest,list,full	" Enable autocompletion
+set wildmenu                    " Display all matching files when we tab complete
+
+" Misc
+set autoindent					" Enable autoindent
+set autoread					" Reload files on change
+set undolevels=999				" Lots of these
+set history=1000				" More history
+set encoding=utf-8              " Use UTF-8 encoding
+set mouse=a				        " Enable mouse mode
+set splitbelow splitright		" Split in more natural way
 
diff --git a/home/.config/nvim/rc/theme.vim b/home/.config/nvim/rc/theme.vim
index 3bcfe64..cd4c673 100644
--- a/home/.config/nvim/rc/theme.vim
+++ b/home/.config/nvim/rc/theme.vim
@@ -2,9 +2,12 @@
 syntax on                   " Turn syntax highlighting on
 colorscheme codedark        " Requires vim-code-dark plugin
 
-set number relativenumber   " Show relative line numbers
 set cursorline              " Highlight cursor line
-set noruler                 " Don't show ruler, line is highlighted by above
+set laststatus=2            " Always show status line
+set number relativenumber   " Show relative line numbers
+set showmatch               " Show matching brackets
+set scrolloff=5             " Keep 5 lines horizonal scrolloff
+set sidescrolloff=5         " Keep 5 characters vertical scrolloff
 
 set guioptions-=m           " Remove menubar
 set guioptions-=T           " Remove toolbar
@@ -17,17 +20,3 @@ else
     set termguicolors
 endif
 
-
-" Airline specific theming settings
-let g:airline_theme='codedark'                  " Use codedark theme from vim-ariline-themes
-let g:airline_right_sep = ""                    " Don't use special separators (<)
-let g:airline_left_sep = ""                     " Don't use special separators (>)
-let g:airline#extensions#tabline#enabled = 1    " Enable tabline (top line)
-let g:airline#tabline#formatter = 'unique_tail' " Tabline filename formatter
-let g:webdevicons_enable_airline_statusline = 0 " Use special icons from vim-devicons (requires nerdfonts)
-let g:airline_powerline_fonts = 1               " Use special symbols from powerline fonts (line no, col no)
-
-if empty($DISPLAY) " Use ASCII-only if we're in TTY
-    let g:airline_symbols_ascii = 1
-endif
-