diff --git a/.config/nvim/.luarc.json b/.config/nvim/.luarc.json
new file mode 100644
index 0000000..e34fdba
--- /dev/null
+++ b/.config/nvim/.luarc.json
@@ -0,0 +1,7 @@
+{
+    "$schema": "https://raw.githubusercontent.com/sumneko/vscode-lua/master/setting/schema.json",
+    "Lua.diagnostics.globals": [
+        "vim",
+        "use"
+    ]
+}
\ No newline at end of file
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 6fe888b..07c5bc2 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -1,3 +1,6 @@
+require 'bootstrap'
+
+
 require 'plugins'
 
 
@@ -28,7 +31,7 @@ require('nvim-treesitter.configs').setup {
 
 
 require('feline').setup {
-  theme = require('feline.solarized'),
+  theme = require('feline.feline-solarized'),
   force_inactive = {
     filetypes = {
       '^neo\\-tree$',
@@ -118,7 +121,7 @@ require('neo-tree').setup({
     }
   }
 })
-vim.keymap.set("n", "f", "<cmd>Neotree focus<CR>", opts)
+vim.keymap.set("n", "f", "<cmd>Neotree focus<CR>")
 
 
 require('smart-splits')
@@ -159,9 +162,9 @@ require('bufferline').setup{
     }
   }
 }
-vim.keymap.set("n", "<S-Right>", "<cmd>bnext<CR>", opts)
-vim.keymap.set("n", "<S-Left>", "<cmd>bprevious<CR>", opts)
-vim.keymap.set("n", "q", "<cmd>Bdelete<CR>", opts)
+vim.keymap.set("n", "<S-Right>", "<cmd>bnext<CR>")
+vim.keymap.set("n", "<S-Left>", "<cmd>bprevious<CR>")
+vim.keymap.set("n", "q", "<cmd>Bdelete<CR>")
 
 
 require('nvim-autopairs').setup()
diff --git a/.config/nvim/lua/bootstrap.lua b/.config/nvim/lua/bootstrap.lua
new file mode 100644
index 0000000..0ceeed0
--- /dev/null
+++ b/.config/nvim/lua/bootstrap.lua
@@ -0,0 +1,6 @@
+local fn = vim.fn
+local install_path = fn.stdpath('data')..'/site/pack/packer/start/packer.nvim'
+if fn.empty(fn.glob(install_path)) > 0 then
+  Packer_Bootstrap = fn.system({'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path})
+  vim.cmd [[packadd packer.nvim]]
+end
diff --git a/.config/nvim/lua/feline/solarized.lua b/.config/nvim/lua/feline/feline-solarized.lua
similarity index 100%
rename from .config/nvim/lua/feline/solarized.lua
rename to .config/nvim/lua/feline/feline-solarized.lua
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index 45285ff..db4242e 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -1,4 +1,6 @@
 return require('packer').startup(function()
+  use '~/.config/nvim/themes/solarized.nvim'
+
   use 'wbthomason/packer.nvim'
 
   use 'nvim-lua/popup.nvim'
@@ -64,4 +66,7 @@ return require('packer').startup(function()
 
   use 'lervag/vimtex'
 
+  if Packer_Bootstrap then
+    require('packer').sync()
+  end
 end)
diff --git a/.config/nvim/solarized.nvim b/.config/nvim/themes/solarized.nvim
similarity index 100%
rename from .config/nvim/solarized.nvim
rename to .config/nvim/themes/solarized.nvim
diff --git a/.gitmodules b/.gitmodules
index 82ccd2a..f2345a2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule ".config/nvim/solarized.nvim"]
-	path = .config/nvim/solarized.nvim
+	path = .config/nvim/themes/solarized.nvim
 	url = ssh://git@git.rhiobet.sh:42424/rhiobet/solarized.nvim.git