diff --git a/third_party/CHANGELOG.md b/third_party/CHANGELOG.md
index 651da7597..5e0dea531 100644
--- a/third_party/CHANGELOG.md
+++ b/third_party/CHANGELOG.md
@@ -6,7 +6,7 @@
 
 - "Scope analysis to the current package" feature from the Dart problem view
 - Code Coverage support, all references to com.intellij.coverage.*
-- Dart embedded in HTML support
+- Dart embedded and syntax highlighting in HTML support
 
 ### Changed
 
diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/DartScriptContentProvider.java b/third_party/src/main/java/com/jetbrains/lang/dart/DartScriptContentProvider.java
deleted file mode 100644
index e4d681851..000000000
--- a/third_party/src/main/java/com/jetbrains/lang/dart/DartScriptContentProvider.java
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.jetbrains.lang.dart;
-
-import com.intellij.lang.HtmlScriptContentProvider;
-import com.intellij.lexer.Lexer;
-import com.intellij.openapi.fileTypes.SyntaxHighlighter;
-import com.intellij.openapi.fileTypes.SyntaxHighlighterFactory;
-import com.intellij.psi.tree.IElementType;
-import org.jetbrains.annotations.Nullable;
-
-public final class DartScriptContentProvider implements HtmlScriptContentProvider {
-  @Override
-  public IElementType getScriptElementType() {
-    return DartTokenTypesSets.EMBEDDED_CONTENT;
-  }
-
-  @Override
-  public @Nullable Lexer getHighlightingLexer() {
-    SyntaxHighlighter syntaxHighlighter = SyntaxHighlighterFactory.getSyntaxHighlighter(DartFileType.INSTANCE, null, null);
-    return syntaxHighlighter != null ? syntaxHighlighter.getHighlightingLexer() : null;
-  }
-}
diff --git a/third_party/src/main/resources/META-INF/plugin.xml b/third_party/src/main/resources/META-INF/plugin.xml
index 9f12bf062..c7945bf59 100644
--- a/third_party/src/main/resources/META-INF/plugin.xml
+++ b/third_party/src/main/resources/META-INF/plugin.xml
@@ -60,7 +60,6 @@
     <extendWordSelectionHandler implementation="com.jetbrains.lang.dart.ide.editor.DartWordSelectionHandler"/>
     <basicWordSelectionFilter implementation="com.jetbrains.lang.dart.ide.editor.DartSelectionFilter"/>
 
-    <html.scriptContentProvider language="Dart" implementationClass="com.jetbrains.lang.dart.DartScriptContentProvider"/>
     <nonProjectFileWritingAccessExtension implementation="com.jetbrains.lang.dart.ide.DartWritingAccessProvider"/>
     <spellchecker.support language="Dart" implementationClass="com.jetbrains.lang.dart.ide.spelling.DartSpellcheckingStrategy"/>
     <spellchecker.bundledDictionaryProvider implementation="com.jetbrains.lang.dart.ide.spelling.DartBundledDictionaryProvider"/>
@@ -246,8 +245,6 @@
 
     <search.optionContributor implementation="com.jetbrains.lang.dart.DartSearchableOptionContributor"/>
 
-    <lang.syntaxHighlighter language="Dart in Html" implementationClass="com.jetbrains.lang.dart.highlight.DartSyntaxHighlighter"/>
-    <lang.parserDefinition language="Dart in Html" implementationClass="com.jetbrains.lang.dart.DartParserDefinition"/>
     <notificationGroup id="Dart Support" displayType="BALLOON"
                        bundle="messages.DartBundle" key="notification.group.dart.support"/>
     <notificationGroup id="Dart Analysis" displayType="TOOL_WINDOW" toolWindowId="Dart Analysis" isLogByDefault="false"
diff --git a/third_party/src/test/java/com/jetbrains/lang/dart/ide/DartSurroundWithInHtmlTest.java b/third_party/src/test/java/com/jetbrains/lang/dart/ide/DartSurroundWithInHtmlTest.java
deleted file mode 100644
index 34255eb0a..000000000
--- a/third_party/src/test/java/com/jetbrains/lang/dart/ide/DartSurroundWithInHtmlTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.jetbrains.lang.dart.ide;
-
-import com.intellij.codeInsight.generation.surroundWith.SurroundWithHandler;
-import com.intellij.lang.surroundWith.Surrounder;
-import com.intellij.openapi.util.io.FileUtil;
-import com.intellij.testFramework.LightPlatformCodeInsightTestCase;
-import com.jetbrains.lang.dart.ide.surroundWith.statement.DartWithIfElseSurrounder;
-import com.jetbrains.lang.dart.util.DartTestUtils;
-import org.jetbrains.annotations.NotNull;
-
-public class DartSurroundWithInHtmlTest extends LightPlatformCodeInsightTestCase {
-  @NotNull
-  @Override
-  protected String getTestDataPath() {
-    return DartTestUtils.BASE_TEST_DATA_PATH + FileUtil.toSystemDependentName("/surroundWith/html/");
-  }
-
-  private void doTest(final Surrounder handler) {
-    configureByFile(getTestName(false) + ".html");
-    SurroundWithHandler.invoke(getProject(), getEditor(), getFile(), handler);
-    checkResultByFile(getTestName(false) + ".after.html");
-  }
-
-  public void testIfElse1() {
-    doTest(new DartWithIfElseSurrounder());
-  }
-}
diff --git a/third_party/src/test/testData/surroundWith/html/IfElse1.after.html b/third_party/src/test/testData/surroundWith/html/IfElse1.after.html
deleted file mode 100644
index 3b124d3ee..000000000
--- a/third_party/src/test/testData/surroundWith/html/IfElse1.after.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<html>
-<body>
-<script type="application/dart">
-  main() {
-    if () {
-        var i = 0;
-    } else {
-
-    }
-  }
-</script>
-</body>
-</html>
diff --git a/third_party/src/test/testData/surroundWith/html/IfElse1.html b/third_party/src/test/testData/surroundWith/html/IfElse1.html
deleted file mode 100644
index f1b50ccbc..000000000
--- a/third_party/src/test/testData/surroundWith/html/IfElse1.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<body>
-<script type="application/dart">
-  main() {
-    <selection>var i = 0;</selection>
-  }
-</script>
-</body>
-</html>