diff --git a/core/README.md b/core/README.md
index 23489e150..d5bab63b5 100644
--- a/core/README.md
+++ b/core/README.md
@@ -129,7 +129,6 @@ export default function App() {
 ```
 
 - ~~`@codemirror/legacy-modes/mode/cpp`~~ => [`@codemirror/lang-cpp`](https://www.npmjs.com/package/@codemirror/lang-cpp)
-- ~~`@codemirror/legacy-modes/mode/css`~~ => [`@codemirror/lang-css`](https://www.npmjs.com/package/@codemirror/lang-css)
 - ~~`@codemirror/legacy-modes/mode/html`~~ => [`@codemirror/lang-html`](https://www.npmjs.com/package/@codemirror/lang-html)
 - ~~`@codemirror/legacy-modes/mode/java`~~ => [`@codemirror/lang-java`](https://www.npmjs.com/package/@codemirror/lang-java)
 - ~~`@codemirror/legacy-modes/mode/javascript`~~ => [`@codemirror/lang-javascript`](https://www.npmjs.com/package/@codemirror/lang-javascript)
@@ -141,7 +140,10 @@ export default function App() {
 - ~~`@codemirror/legacy-modes/mode/rust`~~ => [`@codemirror/lang-rust`](https://www.npmjs.com/package/@codemirror/lang-rust)
 - ~~`@codemirror/legacy-modes/mode/sql`~~ => [`@codemirror/lang-sql`](https://www.npmjs.com/package/@codemirror/lang-sql)
 - ~~`@codemirror/legacy-modes/mode/xml`~~ => [`@codemirror/lang-xml`](https://www.npmjs.com/package/@codemirror/lang-xml)
-- ~~`@codemirror/legacy-modes/mode/wast`~~ => [`@codemirror/lang-wast`](https://www.npmjs.com/package/@codemirror/lang-wast)
+- ~~`@codemirror/legacy-modes/mode/css`~~ => [`@codemirror/lang-less`](https://www.npmjs.com/package/@codemirror/lang-less)
+- ~~`@codemirror/legacy-modes/mode/sass`~~ => [`@codemirror/lang-sass`](https://www.npmjs.com/package/@codemirror/lang-sass)
+- ~~`@codemirror/legacy-modes/mode/clojure`~~ => [`@nextjournal/lang-clojure`](https://www.npmjs.com/package/@nextjournal/lang-clojure)
+- ~~`@codemirror/legacy-modes/mode/clike`~~ => [`@replit/codemirror-lang-csharp`](https://www.npmjs.com/package/@replit/codemirror-lang-csharp)
 
 ### Markdown Example
 
diff --git a/extensions/langs/README.md b/extensions/langs/README.md
index 51d45964b..0fa3fe22b 100644
--- a/extensions/langs/README.md
+++ b/extensions/langs/README.md
@@ -95,6 +95,10 @@ export default function App() {
 - ~~`@codemirror/legacy-modes/mode/rust`~~ => [`@codemirror/lang-rust`](https://www.npmjs.com/package/@codemirror/lang-rust)
 - ~~`@codemirror/legacy-modes/mode/sql`~~ => [`@codemirror/lang-sql`](https://www.npmjs.com/package/@codemirror/lang-sql)
 - ~~`@codemirror/legacy-modes/mode/xml`~~ => [`@codemirror/lang-xml`](https://www.npmjs.com/package/@codemirror/lang-xml)
+- ~~`@codemirror/legacy-modes/mode/css`~~ => [`@codemirror/lang-less`](https://www.npmjs.com/package/@codemirror/lang-less)
+- ~~`@codemirror/legacy-modes/mode/sass`~~ => [`@codemirror/lang-sass`](https://www.npmjs.com/package/@codemirror/lang-sass)
+- ~~`@codemirror/legacy-modes/mode/clojure`~~ => [`@nextjournal/lang-clojure`](https://www.npmjs.com/package/@nextjournal/lang-clojure)
+- ~~`@codemirror/legacy-modes/mode/clike`~~ => [`@replit/codemirror-lang-csharp`](https://www.npmjs.com/package/@replit/codemirror-lang-csharp)
 
 ## Contributors
 
diff --git a/extensions/langs/package.json b/extensions/langs/package.json
index 8ca5f1ee6..8a0afa03d 100644
--- a/extensions/langs/package.json
+++ b/extensions/langs/package.json
@@ -38,8 +38,19 @@
     "@codemirror/lang-sql": "^6.4.0",
     "@codemirror/lang-wast": "^6.0.0",
     "@codemirror/lang-xml": "^6.0.0",
+    "@codemirror/lang-vue": "^0.1.1",
+    "@codemirror/lang-angular": "^0.1.0",
+    "@codemirror/lang-css": "^6.2.0",
+    "@codemirror/lang-sass": "^6.0.1",
+    "@codemirror/lang-less": "^6.0.1",
     "@codemirror/language-data": "^6.0.0",
-    "@codemirror/legacy-modes": "^6.0.0"
+    "@codemirror/legacy-modes": "^6.0.0",
+    "@replit/codemirror-lang-csharp": "^6.1.0",
+    "@replit/codemirror-lang-nix": "^6.0.1",
+    "@replit/codemirror-lang-svelte": "^6.0.0",
+    "@replit/codemirror-lang-solidity": "^6.0.1",
+    "@nextjournal/lang-clojure": "^1.0.0",
+    "codemirror-lang-mermaid": "^0.2.1"
   },
   "keywords": [
     "codemirror",
diff --git a/extensions/langs/src/index.ts b/extensions/langs/src/index.ts
index 9d8f56dce..a66ed3016 100644
--- a/extensions/langs/src/index.ts
+++ b/extensions/langs/src/index.ts
@@ -4,7 +4,10 @@ import { markdown, markdownLanguage } from '@codemirror/lang-markdown';
 import { javascript } from '@codemirror/lang-javascript';
 import { html } from '@codemirror/lang-html';
 import { css } from '@codemirror/lang-css';
+import { less } from '@codemirror/lang-less';
+import { sass } from '@codemirror/lang-sass';
 import { json } from '@codemirror/lang-json';
+import { mermaid } from 'codemirror-lang-mermaid';
 import { python } from '@codemirror/lang-python';
 import { xml } from '@codemirror/lang-xml';
 import { sql, MySQL, PostgreSQL } from '@codemirror/lang-sql';
@@ -14,6 +17,12 @@ import { cpp } from '@codemirror/lang-cpp';
 import { lezer } from '@codemirror/lang-lezer';
 import { php } from '@codemirror/lang-php';
 import { wast } from '@codemirror/lang-wast';
+import { vue } from '@codemirror/lang-vue';
+import { angular } from '@codemirror/lang-angular';
+import { nix } from '@replit/codemirror-lang-nix';
+import { svelte } from '@replit/codemirror-lang-svelte';
+import { csharp } from '@replit/codemirror-lang-csharp';
+import { solidity } from '@replit/codemirror-lang-solidity';
 
 import { apl } from '@codemirror/legacy-modes/mode/apl';
 import { asciiArmor } from '@codemirror/legacy-modes/mode/asciiarmor';
@@ -23,7 +32,6 @@ import { brainfuck } from '@codemirror/legacy-modes/mode/brainfuck';
 import {
   clike,
   c,
-  csharp,
   scala,
   kotlin,
   shader,
@@ -34,8 +42,7 @@ import {
   ceylon,
   dart,
 } from '@codemirror/legacy-modes/mode/clike';
-import { clojure } from '@codemirror/legacy-modes/mode/clojure';
-import { less } from '@codemirror/legacy-modes/mode/css';
+import { clojure } from '@nextjournal/lang-clojure';
 import { cmake } from '@codemirror/legacy-modes/mode/cmake';
 import { cobol } from '@codemirror/legacy-modes/mode/cobol';
 import { coffeeScript } from '@codemirror/legacy-modes/mode/coffeescript';
@@ -92,7 +99,6 @@ import { r } from '@codemirror/legacy-modes/mode/r';
 // import { rpm } from '@codemirror/legacy-modes/mode/rpm';
 import { ruby } from '@codemirror/legacy-modes/mode/ruby';
 import { sas } from '@codemirror/legacy-modes/mode/sas';
-import { sass } from '@codemirror/legacy-modes/mode/sass';
 import { scheme } from '@codemirror/legacy-modes/mode/scheme';
 import { shell } from '@codemirror/legacy-modes/mode/shell';
 import { sieve } from '@codemirror/legacy-modes/mode/sieve';
@@ -131,8 +137,9 @@ export const langs = {
   asterisk: () => StreamLanguage.define(asterisk),
   // clike: () => StreamLanguage.define(clike),
   c: () => StreamLanguage.define(c),
-  csharp: () => StreamLanguage.define(csharp),
+  csharp: () => csharp(),
   scala: () => StreamLanguage.define(scala),
+  solidity: () => solidity,
   kotlin: () => StreamLanguage.define(kotlin),
   shader: () => StreamLanguage.define(shader),
   nesC: () => StreamLanguage.define(nesC),
@@ -182,7 +189,10 @@ export const langs = {
   puppet: () => StreamLanguage.define(puppet),
   q: () => StreamLanguage.define(q),
   sas: () => StreamLanguage.define(sas),
-  sass: () => StreamLanguage.define(sass),
+  sass: () => sass(),
+  mermaid: () => mermaid(),
+  nix: () => nix(),
+  svelte: () => svelte(),
   sieve: () => StreamLanguage.define(sieve),
   smalltalk: () => StreamLanguage.define(smalltalk),
   solr: () => StreamLanguage.define(solr),
@@ -208,6 +218,8 @@ export const langs = {
   jsx: () => javascript({ jsx: true }),
   typescript: () => javascript({ typescript: true }),
   tsx: () => javascript({ jsx: true, typescript: true }),
+  vue: () => vue(),
+  angular: () => angular(),
   json,
   html,
   css,
@@ -240,11 +252,11 @@ export const langs = {
   ruby: () => StreamLanguage.define(ruby),
   pascal: () => StreamLanguage.define(pascal),
   livescript: () => StreamLanguage.define(liveScript),
-  less: () => StreamLanguage.define(less),
+  less: () => less(),
   scheme: () => StreamLanguage.define(scheme),
   toml: () => StreamLanguage.define(toml),
   vbscript: () => StreamLanguage.define(vbScript),
-  clojure: () => StreamLanguage.define(clojure),
+  clojure: () => clojure(),
   coffeescript: () => StreamLanguage.define(coffeeScript),
   julia: () => StreamLanguage.define(julia),
   dockerfile: () => StreamLanguage.define(dockerFile),