diff --git a/nvim/nvim.symlink/autoload/darkmodesocket.vim b/nvim/nvim.symlink/autoload/darkmodesocket.vim
new file mode 100644
index 0000000..f4808b3
--- /dev/null
+++ b/nvim/nvim.symlink/autoload/darkmodesocket.vim
@@ -0,0 +1,7 @@
+
+function! darkmodesocket#listenForLights()
+    let pid = string(getpid())
+    let socket_name = '/tmp/nvim/nvim' . pid . '.sock'
+    call mkdir('/tmp/nvim', 'p')
+    call serverstart(socket_name)
+endfunction
diff --git a/nvim/nvim.symlink/colors/maxbucknell_neo.erb b/nvim/nvim.symlink/colors/maxbucknell_neo.erb
index b2b65f8..d79e721 100644
--- a/nvim/nvim.symlink/colors/maxbucknell_neo.erb
+++ b/nvim/nvim.symlink/colors/maxbucknell_neo.erb
@@ -49,6 +49,7 @@
     background_nc = background - 6
 
     gutter = background - 12
+    colorcolumn = background - 12
 
     trail = foreground + 48
     virtual = background - 48
@@ -125,7 +126,7 @@
         [ "SpellCap", "NONE", "NONE", "NONE"],
         [ "SpellLocal", "NONE", "NONE", "NONE"],
         [ "SpellRare", "NONE", "NONE", "NONE"],
-        [ "ColorColumn", "NONE", "NONE", "NONE" ],
+        [ "ColorColumn", grey(colorcolumn), "NONE", "NONE" ],
         [ "SignColumn", grey(gutter), "NONE", "NONE" ],
         [ "ErrorMsg", "NONE", "NONE", "NONE" ],
         [ "ModeMsg", "NONE", "NONE", "NONE" ],
diff --git a/nvim/nvim.symlink/colors/maxbucknell_neo.vim b/nvim/nvim.symlink/colors/maxbucknell_neo.vim
index 60725a5..db71aa0 100644
--- a/nvim/nvim.symlink/colors/maxbucknell_neo.vim
+++ b/nvim/nvim.symlink/colors/maxbucknell_neo.vim
@@ -76,7 +76,7 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running")
     hi SpellCap ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE
     hi SpellLocal ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE
     hi SpellRare ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE
-    hi ColorColumn ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE
+    hi ColorColumn ctermbg=15 ctermfg=NONE cterm=NONE guibg=#d3d3d3 guifg=NONE gui=NONE
     hi SignColumn ctermbg=15 ctermfg=NONE cterm=NONE guibg=#d3d3d3 guifg=NONE gui=NONE
     hi ErrorMsg ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE
     hi ModeMsg ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE
@@ -156,7 +156,7 @@ elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16
     hi SpellCap ctermbg=NONE ctermfg=NONE cterm=NONE
     hi SpellLocal ctermbg=NONE ctermfg=NONE cterm=NONE
     hi SpellRare ctermbg=NONE ctermfg=NONE cterm=NONE
-    hi ColorColumn ctermbg=NONE ctermfg=NONE cterm=NONE
+    hi ColorColumn ctermbg=white ctermfg=NONE cterm=NONE
     hi SignColumn ctermbg=white ctermfg=NONE cterm=NONE
     hi ErrorMsg ctermbg=NONE ctermfg=NONE cterm=NONE
     hi ModeMsg ctermbg=NONE ctermfg=NONE cterm=NONE
diff --git a/nvim/nvim.symlink/init.vim b/nvim/nvim.symlink/init.vim
index b1c3aa2..60258f5 100644
--- a/nvim/nvim.symlink/init.vim
+++ b/nvim/nvim.symlink/init.vim
@@ -47,6 +47,7 @@ set termguicolors
 set nobackup
 set nowritebackup
 set noswapfile
+set colorcolumn=80
 
 " Show things faster, particularly error messages
 set updatetime=300
@@ -62,19 +63,10 @@ set laststatus=2
 set statusline=—[%.30t]—%y—
 set fillchars=stl:—
 set fillchars+=stlnc:—
+set fillchars+=eob:\ 
 
-function! ShowMiniPath(timer)
-    set statusline=-[%.30t]-%y-
-endfunction
-
-function! ShowFullPath()
-    echo ''
-    set statusline=-[%f]-%y-
-
-    call timer_start(6000, 'ShowMiniPath')
-endfunction
-
-nnoremap <leader>f :call ShowFullPath()<cr>
+" Don't show that annoying intro message when Vim starts
+set shortmess=I
 
 " Wrap lines
 "
@@ -151,7 +143,6 @@ set shiftwidth=4
 set softtabstop=4
 set autoindent
 
-
 " Enable highlighting for syntax
 syntax on
 
@@ -159,7 +150,7 @@ syntax on
 filetype plugin indent on
 
 " Theme configuration
-
+" Should make this a plugin that detects file changes somehow
 let g:is_dark_mode = system("isdark")
 
 if g:is_dark_mode == "true\n"
@@ -354,12 +345,4 @@ augroup END
 nnoremap <leader>\ <Plug>SynStack
 
 
-function! StartUp()
-    call UpdatePlugReminder()
-endfunc
 
-augroup startUp
-    autocmd!
-
-    autocmd VimEnter * call StartUp()
-augroup END
diff --git a/nvim/nvim.symlink/plugin/pathviewer.vim b/nvim/nvim.symlink/plugin/pathviewer.vim
new file mode 100644
index 0000000..2b2773c
--- /dev/null
+++ b/nvim/nvim.symlink/plugin/pathviewer.vim
@@ -0,0 +1,13 @@
+function! ShowMiniPath(timer)
+    set statusline=-[%.30t]-%y-
+endfunction
+
+function! ShowFullPath()
+    echo ''
+    set statusline=-[%f]-%y-
+
+    call timer_start(6000, 'ShowMiniPath')
+endfunction
+
+nnoremap <leader>f :call ShowFullPath()<cr>
+
diff --git a/nvim/nvim.symlink/plugin/startup.vim b/nvim/nvim.symlink/plugin/startup.vim
new file mode 100644
index 0000000..02905dc
--- /dev/null
+++ b/nvim/nvim.symlink/plugin/startup.vim
@@ -0,0 +1,10 @@
+function! StartUp()
+    call darkmodesocket#listenForLights()
+    call UpdatePlugReminder()
+endfunc
+
+augroup startUp
+    autocmd!
+
+    autocmd VimEnter * call StartUp()
+augroup END
diff --git a/nvim/nvim.symlink/plugin/windowmanagement.vim b/nvim/nvim.symlink/plugin/windowmanagement.vim
new file mode 100644
index 0000000..c3b505f
--- /dev/null
+++ b/nvim/nvim.symlink/plugin/windowmanagement.vim
@@ -0,0 +1,6 @@
+augroup WindowManagement
+    autocmd!
+
+    autocmd WinEnter * setl rnu cul syntax=on
+    autocmd WinLeave * setl nornu nocul syntax=off
+augroup END