diff --git a/after/queries/lua/highlights.scm b/after/queries/lua/highlights.scm
new file mode 100644
index 0000000..c201f94
--- /dev/null
+++ b/after/queries/lua/highlights.scm
@@ -0,0 +1 @@
+(self) @variable.builtin
diff --git a/colors/tokyodark.vim b/colors/tokyodark.vim
index ac8621a..a02e8fd 100644
--- a/colors/tokyodark.vim
+++ b/colors/tokyodark.vim
@@ -1,8 +1,8 @@
 lua << EOF
-for k in pairs(package.loaded) do
-    if k:match(".*tokyodark.*") then package.loaded[k] = nil end
-end
+-- for k in pairs(package.loaded) do
+--    if k:match(".*tokyodark.*") then package.loaded[k] = nil end
+-- end
 EOF
 
-lua require('tokyodark').setup()
+lua require('tokyodark')
 
diff --git a/dev b/dev
deleted file mode 100755
index bc03d94..0000000
--- a/dev
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-nvim --cmd "set rtp+=$(pwd)" .
diff --git a/lua/tokyodark/highlights.lua b/lua/tokyodark/highlights.lua
index 087c7b3..0fc0e31 100644
--- a/lua/tokyodark/highlights.lua
+++ b/lua/tokyodark/highlights.lua
@@ -233,7 +233,7 @@ hl.langs.scala = {
     scalaKeywordModifier = hl.predef.Red
 }
 
-function M.setup()
+local function load_sync()
     local ns = create_namespace("tokyodark")
     load_highlights(ns, hl.predef)
     load_highlights(ns, hl.common)
@@ -243,5 +243,19 @@ function M.setup()
     set_hl_ns(ns)
 end
 
+local load_async
+load_async = vim.loop.new_async(vim.schedule_wrap(function()
+    local ns = create_namespace("tokyodark")
+    for _, group in pairs(hl.langs) do load_highlights(ns, group) end
+    for _, group in pairs(hl.plugins) do load_highlights(ns, group) end
+    set_hl_ns(ns)
+    load_async:close()
+end))
+
+function M.setup()
+    load_sync()
+    load_async:send()
+end
+
 return M
 
diff --git a/lua/tokyodark/init.lua b/lua/tokyodark/init.lua
index 2079769..93e749e 100644
--- a/lua/tokyodark/init.lua
+++ b/lua/tokyodark/init.lua
@@ -1,4 +1,3 @@
-local M = {}
 local highlights = require('tokyodark.highlights')
 local terminal = require('tokyodark.terminal')
 
@@ -7,10 +6,9 @@ local function colorscheme()
     if vim.fn.exists("syntax_on") then vim.cmd("syntax reset") end
     vim.o.background = "dark"
     vim.o.termguicolors = true
+    vim.g.colors_name = "tokyodark"
     highlights.setup()
     terminal.setup()
 end
 
-function M.setup() colorscheme() end
-
-return M
+colorscheme()