diff --git a/extension.toml b/extension.toml
index 935ecb6..ac42246 100644
--- a/extension.toml
+++ b/extension.toml
@@ -11,5 +11,6 @@ name = "Svelte Language Server"
 language = "Svelte"
 
 [grammars.svelte]
-repository = "https://github.com/tree-sitter-grammars/tree-sitter-svelte"
-commit = "3f06f705410683adb17d146b5eca28c62fe81ba6"
+repository = "https://github.com/themixednuts/tree-sitter-htmlx"
+commit = "c9b9cc35709fff494a3a9e41cd9471b633649e45"
+path = "crates/tree-sitter-svelte"
diff --git a/languages/svelte/brackets.scm b/languages/svelte/brackets.scm
index 0a7b509..f230c5b 100644
--- a/languages/svelte/brackets.scm
+++ b/languages/svelte/brackets.scm
@@ -1,9 +1,7 @@
 ("<" @open ">" @close)
 ("{" @open "}" @close)
-("'" @open "'" @close)
-("\"" @open "\"" @close)
+(("'" @open "'" @close) (#set! rainbow.exclude))
+(("\"" @open "\"" @close) (#set! rainbow.exclude))
 ("(" @open ")" @close)
-; ("[" @open "]" @close)
-; ("`" @open "`" @close)
 
 ((element (start_tag) @open [(end_tag) (erroneous_end_tag)] @close) (#set! newline.only))
diff --git a/languages/svelte/folds.scm b/languages/svelte/folds.scm
new file mode 100644
index 0000000..058bcdf
--- /dev/null
+++ b/languages/svelte/folds.scm
@@ -0,0 +1,15 @@
+[
+  (comment)
+  (element)
+  (if_block)
+  (else_if_clause)
+  (else_clause)
+  (each_block)
+  (await_block)
+  (await_pending)
+  (await_branch)
+  (await_branch_children)
+  (key_block)
+  (orphan_branch)
+  (snippet_block)
+] @fold
diff --git a/languages/svelte/highlights.scm b/languages/svelte/highlights.scm
index cd3a089..424fb68 100755
--- a/languages/svelte/highlights.scm
+++ b/languages/svelte/highlights.scm
@@ -1,108 +1,136 @@
+; Tag names
+(tag_name) @tag
 
-; comments
+; Erroneous/mismatched end tags
+(erroneous_end_tag_name) @tag
+
+; DOCTYPE declaration
+(doctype) @constant
+
+; Attribute names
+(attribute_name) @attribute
+
+; Attribute values
+(attribute_value) @string
+(quoted_attribute_value) @string
+
+; Comments
 (comment) @comment
 
-; property attribute
-(attribute_directive) @attribute.function
-(attribute_identifier) @attribute
-(attribute_modifier) @attribute.special
-
-; Style component attributes as @property
-(start_tag
-    (
-        (tag_name) @_tag_name
-        (#match? @_tag_name "^[A-Z]")
-    )
-    (attribute
-        (attribute_name
-            (attribute_identifier) @tag.property
-        )
-    )
-)
-
-; Style self-closing component attributes as @tag.property
-(self_closing_tag
-    (
-        (tag_name) @_tag_name
-        (#match? @_tag_name "^[A-Z]")
-    )
-    (attribute
-        (attribute_name
-            (attribute_identifier) @tag.property
-        )
-    )
-)
-
-
-; style elements starting with lowercase letters as tags
-(
-    (tag_name) @tag
-    (#match? @tag "^[a-z]")
-)
-
-; style elements starting with uppercase letters as components (types)
-; Also valid might be to treat them as constructors
-(
-    (tag_name) @tag @tag.component.type.constructor
-    (#match? @tag "^[A-Z]")
-)
+; Character entities
+(entity) @string.special
+
+; Text content
+(text) @text
 
+; Raw text in script/style
+(raw_text) @text.literal
+
+; HTML punctuation
 [
   "<"
   ">"
   "</"
   "/>"
-] @tag.punctuation.bracket
-
-
-[
-  "{"
-  "}"
 ] @punctuation.bracket
 
-[
-    "|"
-] @punctuation.delimiter
-
-
-[
-  "@"
-  "#"
-  ":"
-  "/"
-] @tag.punctuation.special
-
-"=" @operator
+"=" @punctuation.delimiter
 
+; Component tags (PascalCase)
+((tag_name) @type (#match? @type "^[A-Z]"))
 
-; Treating (if, each, ...) as a keyword inside of blocks
-; like {#if ...} or {#each ...}
-(block_start_tag
-    tag: _ @keyword
-)
+; Namespaced tags (svelte:component, svelte:self, etc.)
+(tag_name
+  namespace: (tag_namespace) @keyword
+  ":" @punctuation.delimiter
+  name: (tag_local_name) @tag)
 
-(block_tag
-    tag: _ @keyword
-)
+; Tag member access (Foo.Bar)
+(tag_name
+  object: (tag_member) @type
+  "." @punctuation.delimiter
+  property: (tag_member) @tag)
 
-(block_end_tag
-    tag: _ @keyword
-)
+; Directives (on:click, bind:value, etc.)
+(attribute_directive) @keyword
+(attribute_name ":" @punctuation.delimiter)
+(attribute_identifier) @property
+(attribute_modifier) @attribute
+(attribute_modifiers "|" @punctuation.delimiter)
 
-(expression_tag
-    tag: _ @keyword
-)
+; Expressions
+(expression) @embedded
 
-; Style quoted string attribute values
-(quoted_attribute_value) @string
+; Shorthand/spread attributes — content only, braces fall through to "{" "}" rule
+(shorthand_attribute content: (_) @variable)
 
+; Curly braces (expression context)
+[
+  "{"
+  "}"
+] @punctuation.bracket
 
-; Highlight the `as` keyword in each blocks
-(each_start
-    ("as") @tag.keyword
-)
+"|" @punctuation.delimiter
 
+; Comments inside tag attribute lists
+(tag_comment kind: (line_comment) @comment)
+(tag_comment kind: (block_comment) @comment)
 
-; Highlight the snippet name as a function
-; (e.g. {#snippet foo(bar)}
-(snippet_name) @function
+; Block keywords
+[
+  "if"
+  "each"
+  "await"
+  "key"
+  "snippet"
+  "else"
+  "html"
+  "debug"
+  "const"
+  "render"
+  "attach"
+  "as"
+] @keyword.control
+
+; Block end keywords ({/if}, {/each}, etc.)
+(block_keyword) @keyword.control
+(declaration_kind) @keyword.control
+
+; Block delimiters
+(block_open) @punctuation.bracket
+(block_close) @punctuation.bracket
+
+(shorthand_kind) @keyword.control
+(branch_kind) @keyword.control
+
+(expression_value) @embedded
+
+; If block
+(if_block expression: (expression) @embedded)
+(else_if_clause expression: (expression_value) @embedded)
+
+; Each block
+(each_block expression: (expression) @embedded)
+(each_block binding: (pattern) @variable)
+(each_block index: (pattern) @variable)
+(each_block key: (expression) @embedded)
+
+; Await block
+(await_block expression: (expression) @embedded)
+(await_branch (pattern) @variable)
+(await_block (pattern) @variable)
+(orphan_branch (pattern) @variable)
+
+; Key block
+(key_block expression: (expression) @embedded)
+
+; Snippet block
+(snippet_block name: (snippet_name) @function)
+(snippet_parameters parameter: (pattern) @variable)
+(snippet_type_parameters) @type
+
+; Malformed blocks (e.g. { #if ...} with space before sigil)
+(block_sigil) @keyword.control
+
+; Snippet/render punctuation
+["(" ")" ","] @punctuation.delimiter
diff --git a/languages/svelte/indents.scm b/languages/svelte/indents.scm
index 8edbf93..ffcdc28 100755
--- a/languages/svelte/indents.scm
+++ b/languages/svelte/indents.scm
@@ -1,20 +1,13 @@
 [
   (element)
-  (if_statement)
-  (each_statement)
-  (await_statement)
-  (snippet_statement)
-  (script_element)
-  (style_element)
+  (if_block)
+  (each_block)
+  (await_block)
+  (key_block)
+  (snippet_block)
   (start_tag ">" @end)
   (self_closing_tag "/>" @end)
   (element
     (start_tag) @start
     [(end_tag) (erroneous_end_tag)]? @end)
-  (script_element
-    (start_tag) @start
-    [(end_tag) (erroneous_end_tag)]? @end)
-  (style_element
-    (start_tag) @start
-    [(end_tag) (erroneous_end_tag)]? @end)
 ] @indent
diff --git a/languages/svelte/injections.scm b/languages/svelte/injections.scm
index 7195cc4..70df30e 100755
--- a/languages/svelte/injections.scm
+++ b/languages/svelte/injections.scm
@@ -1,89 +1,196 @@
-; ; injections.scm
-; ; --------------
-
-; Add support for comment language injections
-((comment) @content
-    (#set! "language" "comment")
- )
-
-; Match script tags with a lang attribute
-(script_element
-    (start_tag
-        (attribute
-            (attribute_name) @_attr_name
-            (#eq? @_attr_name "lang")
-            (quoted_attribute_value
-                (attribute_value) @language
-            )
-        )
-    )
-    (raw_text) @content
-)
-
-; Match script tags without a lang attribute
-(script_element
-    (start_tag
-        (attribute
-            (attribute_name) @_attr_name
-        )*
-    )
-    (raw_text) @content
-    (#not-any-of? @_attr_name "lang")
-    (#set! language "javascript")
-)
-
-; Match the contents of the script's generics="T extends string" as typescript code
-;
-; Disabled for the time-being because tree-sitter is treating the generics
-; attribute as a top-level typescript statement, where `T extends string` is
-; not a valid top-level typescript statement.
-;
-; (script_element
-;     (start_tag
-;         (attribute
-;             (attribute_name) @_attr_name
-;             (#eq? @_attr_name "generics")
-;             (quoted_attribute_value
-;                 (attribute_value) @content
-;             )
-;         )
-;     )
-; 	(#set! language "typescript")
-; )
-
-
-; Mark everything as typescript because it's
-; a more generic superset of javascript
-; Not sure if it's possible to somehow refer to the
-; script's language attribute here.
-((svelte_raw_text) @content
-    (#set! "language" "ts")
-)
-
-; Match <style lang="language"> as the specified language
-(style_element
-    (start_tag
-        (attribute
-            (attribute_name) @_attr_name
-            (#eq? @_attr_name "lang")
-            (quoted_attribute_value
-                (attribute_value) @language
-            )
-        )
-    )
-    (raw_text) @content
-)
-
-; Match <style> tags without a lang attribute as CSS
-(style_element
-    (start_tag
-        (attribute
-            (attribute_name) @_attr_name
-        )*
-    )
-    (raw_text) @content
-    (#not-any-of? @_attr_name "lang")
-    (#set! language "css")
-)
-
-; Downstream TODO: Style @component comments as markdown
+; Script elements with TypeScript
+((element
+  (start_tag
+    (tag_name) @_tag
+    (attribute
+      (attribute_name) @_script_attr
+      (quoted_attribute_value
+        (attribute_value) @_value)))
+  (raw_text) @injection.content)
+  (#match? @_tag "^[Ss][Cc][Rr][Ii][Pp][Tt]$")
+  (#any-of? @_script_attr "lang" "type")
+  (#any-of? @_value "ts" "typescript" "text/typescript" "application/typescript")
+  (#set! injection.language "typescript"))
+
+; Script elements with explicit JavaScript
+((element
+  (start_tag
+    (tag_name) @_tag
+    (attribute
+      (attribute_name) @_script_attr
+      (quoted_attribute_value
+        (attribute_value) @_value)))
+  (raw_text) @injection.content)
+  (#match? @_tag "^[Ss][Cc][Rr][Ii][Pp][Tt]$")
+  (#any-of? @_script_attr "lang" "type")
+  (#any-of? @_value "js" "javascript" "text/javascript" "application/javascript" "module")
+  (#set! injection.language "javascript"))
+
+; Script content (JavaScript default)
+((element
+  (start_tag
+    (tag_name) @_tag
+    (attribute
+      (attribute_name) @_script_attr)*)
+  (raw_text) @injection.content)
+  (#match? @_tag "^[Ss][Cc][Rr][Ii][Pp][Tt]$")
+  (#not-any-of? @_script_attr "lang" "type")
+  (#set! injection.language "javascript"))
+
+; Style with lang="scss"
+((element
+  (start_tag
+    (tag_name) @_tag
+    (attribute
+      (attribute_name) @_lang
+      (quoted_attribute_value
+        (attribute_value) @_scss)))
+  (raw_text) @injection.content)
+  (#eq? @_tag "style")
+  (#eq? @_lang "lang")
+  (#eq? @_scss "scss")
+  (#set! injection.language "scss"))
+
+; Style with lang="sass"
+((element
+  (start_tag
+    (tag_name) @_tag
+    (attribute
+      (attribute_name) @_lang
+      (quoted_attribute_value
+        (attribute_value) @_sass)))
+  (raw_text) @injection.content)
+  (#eq? @_tag "style")
+  (#eq? @_lang "lang")
+  (#eq? @_sass "sass")
+  (#set! injection.language "sass"))
+
+; Style with lang="less"
+((element
+  (start_tag
+    (tag_name) @_tag
+    (attribute
+      (attribute_name) @_lang
+      (quoted_attribute_value
+        (attribute_value) @_less)))
+  (raw_text) @injection.content)
+  (#eq? @_tag "style")
+  (#eq? @_lang "lang")
+  (#eq? @_less "less")
+  (#set! injection.language "less"))
+
+; Style with explicit CSS
+((element
+  (start_tag
+    (tag_name) @_tag
+    (attribute
+      (attribute_name) @_lang
+      (quoted_attribute_value
+        (attribute_value) @_css)))
+  (raw_text) @injection.content)
+  (#eq? @_tag "style")
+  (#eq? @_lang "lang")
+  (#eq? @_css "css")
+  (#set! injection.language "css"))
+
+; Style content (CSS default — only when no lang attribute)
+((element
+  (start_tag
+    (tag_name) @_tag
+    (attribute
+      (attribute_name) @_style_attr)*)
+  (raw_text) @injection.content)
+  (#eq? @_tag "style")
+  (#not-any-of? @_style_attr "lang")
+  (#set! injection.language "css"))
+
+; Inline style attribute
+((attribute
+  (attribute_name) @_style_name
+  (quoted_attribute_value (attribute_value) @injection.content))
+  (#eq? @_style_name "style")
+  (#set! injection.language "css"))
+
+; Typed expression content
+((expression content: (js) @injection.content)
+  (#set! injection.language "javascript"))
+((expression content: (ts) @injection.content)
+  (#set! injection.language "typescript"))
+
+; Shorthand attributes ({foo})
+((shorthand_attribute content: (js) @injection.content)
+  (#set! injection.language "javascript"))
+((shorthand_attribute content: (ts) @injection.content)
+  (#set! injection.language "typescript"))
+
+; Tag expressions ({@const}, {@render}, {@html}, {@debug}, {@attach}, {:else if})
+((expression_value content: (js) @injection.content)
+  (#set! injection.language "javascript"))
+((expression_value content: (ts) @injection.content)
+  (#set! injection.language "typescript"))
+
+; Else-if clause
+((else_if_clause expression: (expression_value content: (js) @injection.content))
+  (#set! injection.language "javascript"))
+((else_if_clause expression: (expression_value content: (ts) @injection.content))
+  (#set! injection.language "typescript"))
+
+; If block expressions
+((if_block expression: (expression content: (js) @injection.content))
+  (#set! injection.language "javascript"))
+((if_block expression: (expression content: (ts) @injection.content))
+  (#set! injection.language "typescript"))
+
+; Each block expressions and bindings
+((each_block expression: (expression content: (js) @injection.content))
+  (#set! injection.language "javascript"))
+((each_block expression: (expression content: (ts) @injection.content))
+  (#set! injection.language "typescript"))
+((each_block binding: (pattern content: (js) @injection.content))
+  (#set! injection.language "javascript"))
+((each_block binding: (pattern content: (ts) @injection.content))
+  (#set! injection.language "typescript"))
+((each_block index: (pattern content: (js) @injection.content))
+  (#set! injection.language "javascript"))
+((each_block index: (pattern content: (ts) @injection.content))
+  (#set! injection.language "typescript"))
+((each_block key: (expression content: (js) @injection.content))
+  (#set! injection.language "javascript"))
+((each_block key: (expression content: (ts) @injection.content))
+  (#set! injection.language "typescript"))
+
+; Await block expressions and bindings
+((await_block expression: (expression content: (js) @injection.content))
+  (#set! injection.language "javascript"))
+((await_block expression: (expression content: (ts) @injection.content))
+  (#set! injection.language "typescript"))
+((await_block (pattern content: (js) @injection.content))
+  (#set! injection.language "javascript"))
+((await_block (pattern content: (ts) @injection.content))
+  (#set! injection.language "typescript"))
+((await_branch (pattern content: (js) @injection.content))
+  (#set! injection.language "javascript"))
+((await_branch (pattern content: (ts) @injection.content))
+  (#set! injection.language "typescript"))
+((orphan_branch (pattern content: (js) @injection.content))
+  (#set! injection.language "javascript"))
+((orphan_branch (pattern content: (ts) @injection.content))
+  (#set! injection.language "typescript"))
+
+; Key block expressions
+((key_block expression: (expression content: (js) @injection.content))
+  (#set! injection.language "javascript"))
+((key_block expression: (expression content: (ts) @injection.content))
+  (#set! injection.language "typescript"))
+
+; Snippet parameters and type parameters
+((snippet_parameters parameter: (pattern content: (js) @injection.content))
+  (#set! injection.language "javascript"))
+((snippet_parameters parameter: (pattern content: (ts) @injection.content))
+  (#set! injection.language "typescript"))
+((snippet_block type_parameters: (snippet_type_parameters) @injection.content)
+  (#set! injection.language "typescript"))
+
+; Comments
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/languages/svelte/locals.scm b/languages/svelte/locals.scm
new file mode 100644
index 0000000..fbf45ea
--- /dev/null
+++ b/languages/svelte/locals.scm
@@ -0,0 +1,102 @@
+[
+  (document)
+  (element)
+  (if_block)
+  (else_if_clause)
+  (else_clause)
+  (each_block)
+  (await_block)
+  (await_pending)
+  (await_branch)
+  (await_branch_children)
+  (key_block)
+  (orphan_branch)
+  (snippet_block)
+] @local.scope
+
+(each_block
+  binding: (pattern
+    content: (_) @local.definition))
+
+(each_block
+  index: (pattern
+    content: (_) @local.definition))
+
+(await_block
+  binding: (pattern
+    content: (_) @local.definition))
+
+(await_branch
+  (pattern
+    content: (_) @local.definition))
+
+(orphan_branch
+  (pattern
+    content: (_) @local.definition))
+
+(snippet_block
+  name: (snippet_name) @local.definition.function)
+
+(snippet_parameters
+  parameter: (pattern
+    content: (_) @local.definition))
+
+((const_tag
+  expression: (expression_value
+    content: (_) @local.definition))
+  (#match? @local.definition "\\S"))
+
+((declaration_tag
+  declaration: (expression_value
+    content: (_) @local.definition))
+  (#match? @local.definition "\\S"))
+
+((attribute
+  name: (attribute_name
+    (attribute_directive) @_directive
+    (attribute_identifier) @local.definition))
+  (#eq? @_directive "let"))
+
+((attribute
+  name: (attribute_name
+    (attribute_directive) @_directive
+    (attribute_identifier) @local.reference))
+  (#any-of? @_directive "use" "transition" "in" "out" "animate"))
+
+((attribute
+  name: (attribute_name
+    (attribute_directive) @_directive
+    (attribute_identifier) @local.reference)
+  !value)
+  (#any-of? @_directive "bind" "class" "style")
+  (#match? @local.reference "^[A-Za-z_$][A-Za-z0-9_$]*$"))
+
+(expression
+  content: (_) @local.reference)
+
+(else_if_clause
+  expression: (expression_value
+    content: (_) @local.reference))
+
+(orphan_branch
+  expression: (expression_value
+    content: (_) @local.reference))
+
+(attach_tag
+  expression: (expression_value
+    content: (_) @local.reference))
+
+(debug_tag
+  expression: (expression_value
+    content: (_) @local.reference))
+
+(html_tag
+  expression: (expression_value
+    content: (_) @local.reference))
+
+(render_tag
+  expression: (expression_value
+    content: (_) @local.reference))
+
+(shorthand_attribute
+  content: (_) @local.reference)
diff --git a/languages/svelte/outline.scm b/languages/svelte/outline.scm
index 8242ada..eef500b 100644
--- a/languages/svelte/outline.scm
+++ b/languages/svelte/outline.scm
@@ -1,69 +1,56 @@
-
-(script_element
-    (start_tag) @name
-    (raw_text) @context @item
-)
-
-(script_element
-    (end_tag) @name @item
-)
-
-(style_element
-    (start_tag) @name
-    (raw_text) @context
-) @item
-
-
 (document) @item
 
 (comment) @annotation
 
-(if_statement
-    (if_start) @name
-) @item
-
-(else_block
-    (else_start) @name
+; Elements
+(element
+    (start_tag) @name
 ) @item
 
-(else_if_block
-    (else_if_start) @name
+(element
+    (self_closing_tag) @name
 ) @item
 
+; Script elements
 (element
-    (start_tag) @name
+    (start_tag
+        (tag_name) @_tag
+        (#match? @_tag "^[Ss][Cc][Rr][Ii][Pp][Tt]$"))
+    (raw_text) @context
 ) @item
 
+; Style elements
 (element
-    (self_closing_tag) @name
+    (start_tag
+        (tag_name) @_tag
+        (#match? @_tag "^[Ss][Tt][Yy][Ll][Ee]$"))
+    (raw_text) @context
 ) @item
 
+(if_block) @item
 
-; (if_end) @name @item
+(else_clause) @item
 
-(each_statement
-    (each_start) @name
-) @item
+(else_if_clause) @item
 
+(each_block) @item
 
-(snippet_statement
-    (snippet_start) @name
-) @item
+(await_block) @item
 
-(snippet_end) @name @item
+(await_branch) @item
+
+(key_block) @item
+
+(snippet_block
+    name: (snippet_name) @name
+) @item
 
 (html_tag) @name @item
 
 (const_tag) @name @item
 
-(await_statement
-    (await_start) @name
-) @item
+(debug_tag) @name @item
 
-(then_block
-    (then_start) @name
-) @item
+(render_tag) @name @item
 
-(catch_block
-    (catch_start) @name
-) @item
+(attach_tag) @name @item
diff --git a/languages/svelte/textobjects.scm b/languages/svelte/textobjects.scm
new file mode 100644
index 0000000..5540329
--- /dev/null
+++ b/languages/svelte/textobjects.scm
@@ -0,0 +1,13 @@
+[
+  (snippet_block)
+] @function.around
+
+[
+  (element)
+  (if_block)
+  (each_block)
+  (await_block)
+  (key_block)
+] @class.around
+
+(comment)+ @comment.around