diff --git a/dotfiles/neovim.nix b/dotfiles/neovim.nix
index 01794a0..6bff448 100644
--- a/dotfiles/neovim.nix
+++ b/dotfiles/neovim.nix
@@ -98,10 +98,21 @@ in {
 
         "" COLORS
         " note: possibly need instructions at https://github.com/rakr/vim-one if I ever add tmux stuff
+        function! s:base16_customize() abort
+          call Base16hi("SignColumn", g:base16_gui03, g:base16_gui02, g:base16_cterm03, g:base16_cterm02, "", "")
+          call Base16hi("LineNr", g:base16_gui03, g:base16_gui02, g:base16_cterm03, g:base16_cterm02, "", "")
+          call Base16hi("CursorLine", "", g:base16_gui02, "", g:base16_cterm02, "", "")
+          call Base16hi("CursorLineNr",  g:base16_gui04, g:base16_gui02, g:base16_cterm04, g:base16_cterm02, "", "")
+        endfunction
+
+        augroup on_change_colorschema
+          autocmd!
+          autocmd ColorScheme * call s:base16_customize()
+        augroup END
+
         set termguicolors
         set background=dark
-        let g:one_allow_italics = 1
-        colorscheme one
+        colorscheme base16-material-palenight
 
         "" DELIMITERS
         let delimitMate_expand_space=1
@@ -127,7 +138,7 @@ in {
 
         "" STATUSLINE
         let g:lightline = {
-          \ 'colorscheme': 'one'
+          \ 'colorscheme': 'base16_material_palenight'
           \ }
 
         let g:lightline.active = {
diff --git a/nix/sources.json b/nix/sources.json
index 4ec8eab..d4b19db 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -25,6 +25,32 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
         "vim": "true"
     },
+    "base16-vim": {
+        "branch": "master",
+        "description": "Base16 for Vim",
+        "homepage": "https://github.com/chriskempson/base16",
+        "owner": "chriskempson",
+        "repo": "base16-vim",
+        "rev": "6191622d5806d4448fa2285047936bdcee57a098",
+        "sha256": "1qz21jizcy533mqk9wff1wqchhixkcfkysqcqs0x35wwpbri6nz8",
+        "type": "tarball",
+        "url": "https://github.com/chriskempson/base16-vim/archive/6191622d5806d4448fa2285047936bdcee57a098.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
+        "vim": "true"
+    },
+    "base16-vim-lightline": {
+        "branch": "master",
+        "description": "lightline.vim colorschemes for all available base16 themes",
+        "homepage": "",
+        "owner": "mike-hearn",
+        "repo": "base16-vim-lightline",
+        "rev": "cea11b7d0a407eccf0085feefb5e3be2ec99bdbb",
+        "sha256": "0lcxcikkbk03lvsjjjqv22ypl9wpa7zkb6ndbc2gasskckzk3fa9",
+        "type": "tarball",
+        "url": "https://github.com/mike-hearn/base16-vim-lightline/archive/cea11b7d0a407eccf0085feefb5e3be2ec99bdbb.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
+        "vim": "true"
+    },
     "delimitMate": {
         "branch": "master",
         "description": "TODO",
@@ -501,19 +527,6 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
         "vim": "true"
     },
-    "vim-one": {
-        "branch": "master",
-        "description": "TODO",
-        "homepage": "https://github.com/rakr/vim-one",
-        "owner": "rakr",
-        "repo": "vim-one",
-        "rev": "6695e135415c53a8fbe96672e382200aa1ffb4b4",
-        "sha256": "0951r9kw23zlwd7fda6ib2d9k0akpfd2hvh82pasgw3ks9v1n2vf",
-        "type": "tarball",
-        "url": "https://github.com/{owner}/{repo}/archive/{rev}.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
-        "vim": "true"
-    },
     "vim-projectionist": {
         "branch": "master",
         "description": "TODO",