diff --git a/config/nvim/coc-settings.json b/config/nvim/coc-settings.json
index 45f91d7..586f8c4 100644
--- a/config/nvim/coc-settings.json
+++ b/config/nvim/coc-settings.json
@@ -1,7 +1,11 @@
 {
-  "diagnostic.refreshOnInsertMode": true,
-  "coc.preferences.formatOnSaveFiletypes": ["*"],
-  "Lua.telemetry.enable": false,
-  "sumneko-lua.enableNvimLuaDev": true,
-  "diagnostic.virtualText": true
+    "diagnostic.refreshOnInsertMode": true,
+    "coc.preferences.formatOnSave": true,
+    "Lua.telemetry.enable": false,
+    "sumneko-lua.enableNvimLuaDev": true,
+    "diagnostic.virtualText": true,
+    "diagnostic.virtualTextCurrentLineOnly": false,
+    "prettier.tabWidth": 4,
+    "javascript.format.semicolons": "remove",
+    "prettier.semi": false
 }
diff --git a/config/nvim/init.lua b/config/nvim/init.lua
index 54f0286..ff818ea 100644
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -1,3 +1,2 @@
 require "options"
 require "plugins"
-require "theme"
diff --git a/config/nvim/lua/config/coc.lua b/config/nvim/lua/config/coc.lua
index aff2f96..14ea14e 100644
--- a/config/nvim/lua/config/coc.lua
+++ b/config/nvim/lua/config/coc.lua
@@ -1,8 +1,6 @@
 local keymap = vim.keymap.set
 local expr_opts = { replace_keycodes = false, expr = true }
 
-vim.diagnostic.config { virtual_text = true }
-
 keymap(
    "i",
    "<Enter>",
@@ -23,3 +21,5 @@ keymap(
    [[ coc#pum#visible() ? coc#pum#prev(1) : "\<Up>" ]],
    expr_opts
 )
+
+keymap("i", "<C-Space>", [[coc#refresh()]], expr_opts)
diff --git a/config/nvim/lua/config/novim.lua b/config/nvim/lua/config/novim.lua
index 909670c..a9843ca 100644
--- a/config/nvim/lua/config/novim.lua
+++ b/config/nvim/lua/config/novim.lua
@@ -1,12 +1,7 @@
 local keymap = vim.keymap.set
-
 keymap("i", "<A-;>", "<C-O>:")
-keymap("i", "<C-q>", vim.cmd.quitall)
+keymap("i", "<C-q>", function() vim.cmd.call "novim_mode#ExitVim()" end)
 keymap("i", "<C-s>", function()
-    local exit = os.execute("test -w " .. vim.fn.expand("%:p"))
-    if exit == 0 then
-        vim.cmd.write()
-    else
-        vim.cmd.SudaWrite()
-    end
+    local success = pcall(vim.cmd.update)
+    if not success then vim.cmd.SudaWrite() end
 end)
diff --git a/config/nvim/lua/config/nvim-tree.lua b/config/nvim/lua/config/nvim-tree.lua
index 2518a95..d81313f 100644
--- a/config/nvim/lua/config/nvim-tree.lua
+++ b/config/nvim/lua/config/nvim-tree.lua
@@ -12,4 +12,4 @@ nvimtree.setup({
 })
 
 -- open file tree
-keymap("i", "<A-e>", "<cmd>:NvimTreeToggle<CR>")
+keymap("i", "<C-e>", [[<cmd>:NvimTreeToggle<CR>]])
diff --git a/config/nvim/lua/config/onedark.lua b/config/nvim/lua/config/onedark.lua
new file mode 100644
index 0000000..41807fc
--- /dev/null
+++ b/config/nvim/lua/config/onedark.lua
@@ -0,0 +1 @@
+require('onedark').load()
diff --git a/config/nvim/lua/config/toggleterm.lua b/config/nvim/lua/config/toggleterm.lua
index 80d32c5..e15b95f 100644
--- a/config/nvim/lua/config/toggleterm.lua
+++ b/config/nvim/lua/config/toggleterm.lua
@@ -1,2 +1,2 @@
 local toggleterm = require("toggleterm")
-toggleterm.setup { open_mapping = [[<C-Space>]], direction = "float" }
+toggleterm.setup { open_mapping = [[<A-`>]], direction = "float" }
diff --git a/config/nvim/lua/config/treesitter.lua b/config/nvim/lua/config/treesitter.lua
index b82732d..76bf13e 100644
--- a/config/nvim/lua/config/treesitter.lua
+++ b/config/nvim/lua/config/treesitter.lua
@@ -1,6 +1,6 @@
 require("nvim-treesitter.configs").setup({
   rainbow = {
-    enable = false,
+    enable = true,
     extended_mode = true,
     max_file_lines = nil,
   },
diff --git a/config/nvim/lua/options.lua b/config/nvim/lua/options.lua
index 6f7a159..cd5d5d5 100644
--- a/config/nvim/lua/options.lua
+++ b/config/nvim/lua/options.lua
@@ -2,7 +2,9 @@ vim.g.novim_mode_use_general_app_shortcuts = 0
 vim.g.session_lock_enabled = 0
 vim.g.session_autosave = 'yes'
 vim.g.sudo_smart_edit = 1
-vim.opt.shiftwidth = 0
+vim.opt.tabstop = 4
+vim.opt.expandtab = true
+vim.opt.shiftwidth = 4
 vim.opt.backup = false
 vim.opt.clipboard = "unnamedplus"
 vim.opt.cmdheight = 1;
diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua
index 9f1276c..b982040 100644
--- a/config/nvim/lua/plugins.lua
+++ b/config/nvim/lua/plugins.lua
@@ -1,6 +1,6 @@
 local packer = require("packer")
 
-function config(name)
+local function config(name)
     return string.format('require "config.%s"', name)
 end
 
@@ -20,7 +20,7 @@ return packer.startup({ function(use)
     use "xolox/vim-session"
 
     -- Theming
-    use "navarasu/onedark.nvim"
+    use { "navarasu/onedark.nvim", config = config("onedark") }
     use { 'lukas-reineke/indent-blankline.nvim', config = config("indent-blankline") }
     use {
         'nvim-lualine/lualine.nvim',
diff --git a/config/nvim/lua/theme.lua b/config/nvim/lua/theme.lua
deleted file mode 100644
index 582edea..0000000
--- a/config/nvim/lua/theme.lua
+++ /dev/null
@@ -1 +0,0 @@
-vim.cmd "colorscheme onedark"
diff --git a/config/nvim/plugin/packer_compiled.lua b/config/nvim/plugin/packer_compiled.lua
index 89a546d..881ea72 100644
--- a/config/nvim/plugin/packer_compiled.lua
+++ b/config/nvim/plugin/packer_compiled.lua
@@ -144,6 +144,7 @@ _G.packer_plugins = {
     url = "https://github.com/kyazdani42/nvim-web-devicons"
   },
   ["onedark.nvim"] = {
+    config = { 'require "config.onedark"' },
     loaded = true,
     path = "/home/quadradical/.local/share/nvim/site/pack/packer/start/onedark.nvim",
     url = "https://github.com/navarasu/onedark.nvim"
@@ -182,46 +183,50 @@ _G.packer_plugins = {
 }
 
 time([[Defining packer_plugins]], false)
--- Config for: coc.nvim
-time([[Config for coc.nvim]], true)
-require "config.coc"
-time([[Config for coc.nvim]], false)
--- Config for: barbar.nvim
-time([[Config for barbar.nvim]], true)
-require "config.barbar"
-time([[Config for barbar.nvim]], false)
 -- Config for: nvim-tree.lua
 time([[Config for nvim-tree.lua]], true)
 require "config.nvim-tree"
 time([[Config for nvim-tree.lua]], false)
--- Config for: dashboard-nvim
-time([[Config for dashboard-nvim]], true)
-require "config.dashboard"
-time([[Config for dashboard-nvim]], false)
 -- Config for: nvim-treesitter
 time([[Config for nvim-treesitter]], true)
 require "config.treesitter"
 time([[Config for nvim-treesitter]], false)
--- Config for: lualine.nvim
-time([[Config for lualine.nvim]], true)
-require "config.lualine"
-time([[Config for lualine.nvim]], false)
 -- Config for: indent-blankline.nvim
 time([[Config for indent-blankline.nvim]], true)
 require "config.indent-blankline"
 time([[Config for indent-blankline.nvim]], false)
--- Config for: novim-mode
-time([[Config for novim-mode]], true)
-require "config.novim"
-time([[Config for novim-mode]], false)
--- Config for: toggleterm.nvim
-time([[Config for toggleterm.nvim]], true)
-require "config.toggleterm"
-time([[Config for toggleterm.nvim]], false)
 -- Config for: Comment.nvim
 time([[Config for Comment.nvim]], true)
 require "config.comment"
 time([[Config for Comment.nvim]], false)
+-- Config for: lualine.nvim
+time([[Config for lualine.nvim]], true)
+require "config.lualine"
+time([[Config for lualine.nvim]], false)
+-- Config for: barbar.nvim
+time([[Config for barbar.nvim]], true)
+require "config.barbar"
+time([[Config for barbar.nvim]], false)
+-- Config for: onedark.nvim
+time([[Config for onedark.nvim]], true)
+require "config.onedark"
+time([[Config for onedark.nvim]], false)
+-- Config for: novim-mode
+time([[Config for novim-mode]], true)
+require "config.novim"
+time([[Config for novim-mode]], false)
+-- Config for: coc.nvim
+time([[Config for coc.nvim]], true)
+require "config.coc"
+time([[Config for coc.nvim]], false)
+-- Config for: toggleterm.nvim
+time([[Config for toggleterm.nvim]], true)
+require "config.toggleterm"
+time([[Config for toggleterm.nvim]], false)
+-- Config for: dashboard-nvim
+time([[Config for dashboard-nvim]], true)
+require "config.dashboard"
+time([[Config for dashboard-nvim]], false)
 
 _G._packer.inside_compile = false
 if _G._packer.needs_bufread == true then