diff --git a/.gitignore b/.gitignore
index 567609b..5b4d4d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 build/
+sample
diff --git a/README.md b/README.md
index 980b2fb..3e2e7b2 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ labore culpa sint ad nisi Lorem pariatur.
 ```lua
 return {
   {
-    'github.com/maxmx03/dracula.nvim',
+    'maxmx03/dracula.nvim',
     lazy = false,
     priority = 1000,
     config = function ()
diff --git a/after/queries/astro/highlights.scm b/after/queries/astro/highlights.scm
new file mode 100644
index 0000000..a630b00
--- /dev/null
+++ b/after/queries/astro/highlights.scm
@@ -0,0 +1,3 @@
+; extends
+(start_tag (tag_name) @tag (#set! "priority" 127))
+(end_tag (tag_name) @tag (#set! "priority" 127))
diff --git a/after/queries/css/highlights.scm b/after/queries/css/highlights.scm
index 7d2b5ad..a628eee 100644
--- a/after/queries/css/highlights.scm
+++ b/after/queries/css/highlights.scm
@@ -1,12 +1,7 @@
 ; extends
-((class_name) @function (#set! "priority" 125))
+((pseudo_class_selector) @type (#set! "priority" 125))
+((class_selector) @type (#set! "priority" 125))
 ((plain_value) @constant (#set! "priority" 125))
+((id_selector) @constructor (#set! "priority" 125))
 (tag_name) @tag
-(id_name) @function
 (unit) @keyword
-(property_name) @type
-
-"#" @keyword
-"," @keyword
-":" @keyword
-"." @keyword
diff --git a/after/queries/javascript/highlights.scm b/after/queries/javascript/highlights.scm
new file mode 100644
index 0000000..530b26f
--- /dev/null
+++ b/after/queries/javascript/highlights.scm
@@ -0,0 +1,5 @@
+; extends
+
+(jsx_self_closing_element (identifier) @tag (#set! "priority" 127))
+(jsx_opening_element (identifier) @tag (#set! "priority" 127))
+(jsx_closing_element (identifier) @tag (#set! "priority" 127))
diff --git a/after/queries/lua/highlights.scm b/after/queries/lua/highlights.scm
new file mode 100644
index 0000000..51d101d
--- /dev/null
+++ b/after/queries/lua/highlights.scm
@@ -0,0 +1,3 @@
+; extends
+
+(function_call (identifier) @function (#set! "priority" 130))
diff --git a/after/queries/markdown/highlights.scm b/after/queries/markdown/highlights.scm
index a5859e3..fa0faa0 100644
--- a/after/queries/markdown/highlights.scm
+++ b/after/queries/markdown/highlights.scm
@@ -1,4 +1,2 @@
 ; extends
-((atx_heading) @markup.heading (#set! "priority" 125))
-((indented_code_block) @type (#set! "priority" 125))
-(language) @keyword
+((block_quote) @comment (#set! "priority" 125))
diff --git a/after/queries/tsx/highlights.scm b/after/queries/tsx/highlights.scm
new file mode 100644
index 0000000..530b26f
--- /dev/null
+++ b/after/queries/tsx/highlights.scm
@@ -0,0 +1,5 @@
+; extends
+
+(jsx_self_closing_element (identifier) @tag (#set! "priority" 127))
+(jsx_opening_element (identifier) @tag (#set! "priority" 127))
+(jsx_closing_element (identifier) @tag (#set! "priority" 127))
diff --git a/after/syntax/xml.lua b/after/syntax/xml.lua
deleted file mode 100644
index 796e70f..0000000
--- a/after/syntax/xml.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-vim.api.nvim_set_hl(0, 'xmlTagName', { link = '@tag' })
-vim.api.nvim_set_hl(0, 'xmlTag', { link = '@tag.delimiter' })
-vim.api.nvim_set_hl(0, 'xmlAttrib', { link = '@tag.attribute' })
-vim.api.nvim_set_hl(0, 'xmlProcessingDelim', { link = '@tag.delimiter' })
diff --git a/colors/dracula.lua b/colors/dracula.lua
index ffb3dce..e858c40 100644
--- a/colors/dracula.lua
+++ b/colors/dracula.lua
@@ -1,5 +1,5 @@
 -- Dracula colorscheme
--- Repo: github.com/maxmx03/dracula.nvim
+-- Repo: maxmx03/dracula.nvim
 -- Maintainer: Max Del Canto <github.com/maxmx03>
 -- License: MIT License
 require('dracula').load 'dracula'
diff --git a/dracula-soft.yml b/dracula-soft.yml
index 349a5fa..e40392e 100644
--- a/dracula-soft.yml
+++ b/dracula-soft.yml
@@ -100,7 +100,7 @@ specification:
 
 name: dracula-soft
 author: Max Del Canto
-repo: github.com/maxmx03/dracula.nvim
+repo: maxmx03/dracula.nvim
 contact: "github.com/maxmx03"
 license: "MIT License"
 config:
@@ -438,7 +438,7 @@ highlights:
         - name: "@type"
           <<: *class
         - name: "@type.builtin"
-          <<: *class
+          <<: *keyword
         - name: "@type.definition"
           <<: *class
         - name: "@type.qualifier"
@@ -457,6 +457,8 @@ highlights:
           <<: *function
         - name: "@constructor"
           <<: *class
+        - name: "@constructor.lua"
+          <<: *delimiter
         - name: "@operator"
           <<: *keyword
         - name: "@keyword"
@@ -551,6 +553,15 @@ highlights:
           <<: *tagAttribute
         - name: "@tag.delimiter"
           <<: *delimiter
+        - name: "@property.yaml"
+          fg: cyan
+        - name: "@property.json"
+          fg: cyan
+        - name: "@property.css"
+          fg: cyan
+        - name: "@property.scss"
+          fg: cyan
+
     - nvim-lspconfig:
         - name: "@lsp.type.class"
           <<: *class
@@ -792,9 +803,13 @@ highlights:
           bg: base04
     - which-key.nvim:
         - name: WhichKey
+          <<: *function
+        - name: WhichKeyDesc
+          <<: *parameter
+        - name: WhichKeySeparator
           <<: *keyword
         - name: WhichKeyGroup
-          fg: orange
+          fg: purple
     - dashboard-nvim:
         - name: DashboardHeader
           fg: red
diff --git a/dracula.yml b/dracula.yml
index 9a22aa8..7a3f913 100644
--- a/dracula.yml
+++ b/dracula.yml
@@ -100,7 +100,7 @@ specification:
 
 name: dracula
 author: Max Del Canto
-repo: github.com/maxmx03/dracula.nvim
+repo: maxmx03/dracula.nvim
 contact: "github.com/maxmx03"
 license: "MIT License"
 config:
@@ -437,7 +437,7 @@ highlights:
         - name: "@type"
           <<: *class
         - name: "@type.builtin"
-          <<: *class
+          <<: *keyword
         - name: "@type.definition"
           <<: *class
         - name: "@type.qualifier"
@@ -456,6 +456,8 @@ highlights:
           <<: *function
         - name: "@constructor"
           <<: *class
+        - name: "@constructor.lua"
+          <<: *delimiter
         - name: "@operator"
           <<: *keyword
         - name: "@keyword"
@@ -550,6 +552,15 @@ highlights:
           <<: *tagAttribute
         - name: "@tag.delimiter"
           <<: *delimiter
+        - name: "@property.yaml"
+          fg: cyan
+        - name: "@property.json"
+          fg: cyan
+        - name: "@property.css"
+          fg: cyan
+        - name: "@property.scss"
+          fg: cyan
+
     - nvim-lspconfig:
         - name: "@lsp.type.class"
           <<: *class
@@ -791,9 +802,13 @@ highlights:
           bg: base04
     - which-key.nvim:
         - name: WhichKey
+          <<: *function
+        - name: WhichKeyDesc
+          <<: *parameter
+        - name: WhichKeySeparator
           <<: *keyword
         - name: WhichKeyGroup
-          fg: orange
+          fg: purple
     - dashboard-nvim:
         - name: DashboardHeader
           fg: red
diff --git a/lua/dracula/highlights/init.lua b/lua/dracula/highlights/init.lua
index 1ae0cca..610a5be 100644
--- a/lua/dracula/highlights/init.lua
+++ b/lua/dracula/highlights/init.lua
@@ -185,6 +185,8 @@
 ---@field NvimTreeEndOfBuffer? table
 ---@field NvimTreeWinSeparator? table
 ---@field WhichKey? table
+---@field WhichKeyDesc? table
+---@field WhichKeySeparator? table
 ---@field WhichKeyGroup? table
 ---@field DashboardHeader? table
 ---@field DashboardFooter? table
@@ -350,7 +352,7 @@ M.set_highlight = function(colors, config)
     nvim_set_hl('@character.special', { fg = colors.yellow })
     nvim_set_hl('@character.printf', { fg = colors.red })
     nvim_set_hl('@type', { fg = colors.cyan })
-    nvim_set_hl('@type.builtin', { fg = colors.cyan })
+    nvim_set_hl('@type.builtin', { fg = colors.pink })
     nvim_set_hl('@type.definition', { fg = colors.cyan })
     nvim_set_hl('@type.qualifier', { fg = colors.pink })
     nvim_set_hl('@function', { fg = colors.green })
@@ -360,6 +362,7 @@ M.set_highlight = function(colors, config)
     nvim_set_hl('@function.method', { fg = colors.green })
     nvim_set_hl('@function.method.call', { fg = colors.green })
     nvim_set_hl('@constructor', { fg = colors.cyan })
+    nvim_set_hl('@constructor.lua', { fg = colors.base0 })
     nvim_set_hl('@operator', { fg = colors.pink })
     nvim_set_hl('@keyword', { fg = colors.pink })
     nvim_set_hl('@keyword.coroutine', { fg = colors.pink })
@@ -405,6 +408,10 @@ M.set_highlight = function(colors, config)
     nvim_set_hl('@tag', { fg = colors.pink })
     nvim_set_hl('@tag.attribute', { fg = colors.green })
     nvim_set_hl('@tag.delimiter', { fg = colors.base0 })
+    nvim_set_hl('@property.yaml', { fg = colors.cyan })
+    nvim_set_hl('@property.json', { fg = colors.cyan })
+    nvim_set_hl('@property.css', { fg = colors.cyan })
+    nvim_set_hl('@property.scss', { fg = colors.cyan })
   end
 
   if config.plugins['nvim-lspconfig'] then
@@ -526,8 +533,10 @@ M.set_highlight = function(colors, config)
   end
 
   if config.plugins['which-key.nvim'] then
-    nvim_set_hl('WhichKey', { fg = colors.pink })
-    nvim_set_hl('WhichKeyGroup', { fg = colors.orange })
+    nvim_set_hl('WhichKey', { fg = colors.green })
+    nvim_set_hl('WhichKeyDesc', { fg = colors.orange, italic = true })
+    nvim_set_hl('WhichKeySeparator', { fg = colors.pink })
+    nvim_set_hl('WhichKeyGroup', { fg = colors.purple })
   end
 
   if config.plugins['dashboard-nvim'] then