diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 738b07d..35e1990 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -4,6 +4,7 @@
 require('blake.plugins')
 -- basic settings: ~/.config/nvim/lua/blake/settings.lua
 require('blake.settings')
+vim.cmd 'colorscheme tokyonight'
 
 -- TODO:
 -- Make plugins more modular
diff --git a/.config/nvim/lua/blake/lsp.lua b/.config/nvim/lua/blake/lsp.lua
index f3ad109..681849e 100644
--- a/.config/nvim/lua/blake/lsp.lua
+++ b/.config/nvim/lua/blake/lsp.lua
@@ -212,7 +212,7 @@ M.lspconfig = function()
    local buffmap = vim.api.nvim_buf_set_keymap
    local buffopt = vim.api.nvim_buf_set_option
 
-   map('n',  '<leader>e',  '<cmd>lua vim.diagnostic.open_float()<CR>',  opts)
+   map('n',  '<leader>e',  '<cmd>lua vim.diagnostic.open_float()<CR>',                 opts)
    map('n',  '[d',         '<cmd>lua vim.diagnostic.goto_prev()<CR>',                  opts)
    map('n',  ']d',         '<cmd>lua vim.diagnostic.goto_next()<CR>',                  opts)
    map('n',  '<leader>q',  '<cmd>lua require("telescope.builtin").diagnostics()<CR>',  opts)  -- Telescope
@@ -235,9 +235,9 @@ M.lspconfig = function()
       buffmap(bufnr,  'n',  '<leader>wl',  '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>',  opts)
       buffmap(bufnr,  'n',  '<leader>D',   '<cmd>lua vim.lsp.buf.type_definition()<CR>',                             opts)
       buffmap(bufnr,  'n',  '<leader>rn',  '<cmd>lua vim.lsp.buf.rename()<CR>',                                      opts)
-      buffmap(bufnr,  'n',  '<leader>ca',  '<cmd>lua require("telescope.builtin").lsp_code_actions()<CR>',           opts)  -- Telescope
+      buffmap(bufnr,  'n',  '<leader>ca',  '<cmd>lua vim.lsp.buf.code_action()<CR>',                                   opts)
       buffmap(bufnr,  'n',  'gr',          '<cmd>lua require("telescope.builtin").lsp_references()<CR>',             opts)  -- Telescope
-      buffmap(bufnr,  'n',  '<leader>f',   '<cmd>lua vim.lsp.buf.formatting()<CR>',                                  opts)
+      buffmap(bufnr,  'n',  '<leader>f',   '<cmd>lua vim.lsp.buf.format { async = true }<CR>',                       opts)
       buffmap(bufnr,  'n',  '<leader>so',  '<cmd>lua require("telescope.builtin").lsp_document_symbols()<CR>',       opts)
    end -- <<<
 
diff --git a/.config/nvim/lua/blake/other.lua b/.config/nvim/lua/blake/other.lua
index 5d85985..4d54749 100644
--- a/.config/nvim/lua/blake/other.lua
+++ b/.config/nvim/lua/blake/other.lua
@@ -245,18 +245,32 @@ M.lualine = function()
 
    -- Color table for highlights
    -- stylua: ignore
+   -- Onedark colors
+   -- local colors = {
+   --    bg       = '#21242B',
+   --    fg       = '#bbc2cf',
+   --    yellow   = '#ECBE7B',
+   --    cyan     = '#008080',
+   --    darkblue = '#081633',
+   --    green    = '#98be65',
+   --    orange   = '#FF8800',
+   --    violet   = '#a9a1e1',
+   --    magenta  = '#c678dd',
+   --    blue     = '#51afef',
+   --    red      = '#ec5f67',
+   -- }
    local colors = {
-      bg       = '#21242B',
-      fg       = '#bbc2cf',
-      yellow   = '#ECBE7B',
-      cyan     = '#008080',
-      darkblue = '#081633',
-      green    = '#98be65',
-      orange   = '#FF8800',
-      violet   = '#a9a1e1',
-      magenta  = '#c678dd',
-      blue     = '#51afef',
-      red      = '#ec5f67',
+      bg       = '#1a1b26',
+      fg       = '#c0caf5',
+      red      = '#f7768e',
+      orange   = '#ff9e64',
+      yellow   = '#e0af68',
+      green    = '#9ece6a',
+      cyan     = '#7dcfff',
+      blue     = '#7aa2f7',
+      darkblue = '#7aa2f7',
+      violet   = '#15161E',
+      magenta  = '#bb9af7',
    }
 
    local conditions = {
diff --git a/.config/nvim/lua/blake/plugins.lua b/.config/nvim/lua/blake/plugins.lua
index 7056580..3c3b741 100644
--- a/.config/nvim/lua/blake/plugins.lua
+++ b/.config/nvim/lua/blake/plugins.lua
@@ -45,10 +45,12 @@ return require('packer').startup({function()
             "au ColorScheme onedark hi TabLine gui=none guibg='#282C34' guifg='#5C6370'  " all tabs color
             au ColorScheme onedark hi TabLineSel       guibg='#282C34' guifg='#B5BBC7'  " Highlighted tab color
             "au ColorScheme onedark hi TabLineFill      guibg='#282C34'                  " tabline portion without tabs (right-hand side)
-            colorscheme onedark
          ]]
       end
    }
+   use {                                           -- tokyonight theme
+      'folke/tokyonight.nvim',
+   }
    use {                                           -- newspring: Good light theme for writing
       'NLKNguyen/papercolor-theme',
    }