diff --git a/nvim/.config/nvim/after/plugin/_load_lua.vim b/nvim/.config/nvim/after/plugin/_load_lua.vim
deleted file mode 100644
index 4d6443b..0000000
--- a/nvim/.config/nvim/after/plugin/_load_lua.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-let s:load_dir = expand('<sfile>:p:h:h:h')
-exec printf('luafile %s/lua/init.lua', s:load_dir)
diff --git a/nvim/.config/nvim/lua/init.lua b/nvim/.config/nvim/init.lua
similarity index 98%
rename from nvim/.config/nvim/lua/init.lua
rename to nvim/.config/nvim/init.lua
index 05f331d..ab2da4d 100644
--- a/nvim/.config/nvim/lua/init.lua
+++ b/nvim/.config/nvim/init.lua
@@ -91,8 +91,6 @@ vim.api.nvim_command('set pumblend=30')
 vim.api.nvim_command('set sessionoptions-=blank')
 vim.api.nvim_command('set backspace=indent,eol,start')
 vim.api.nvim_command('set diffopt=filler,internal,algorithm:histogram,indent-heuristic')
--- Load out custom colorscheme
-vim.api.nvim_command('colorscheme yolokai')
 -- Do not create any backups or swap file
 vim.api.nvim_command('set nobackup')
 vim.api.nvim_command('set nowritebackup')
@@ -101,3 +99,7 @@ vim.api.nvim_command('set noswapfile')
 require 'plugins'
 require 'autocmd'
 require 'keymappings'
+require 'yolokai'
+
+-- Load our custom color scheme
+vim.api.nvim_command('colorscheme yolokai')
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
deleted file mode 100644
index e52829f..0000000
--- a/nvim/.config/nvim/init.vim
+++ /dev/null
@@ -1,5 +0,0 @@
-lua require 'init'
-
-" This seems to be required here as well as in init.lua else the colorscheme
-" does not take effect or load
-colorscheme yolokai