diff --git a/docs/book.toml b/docs/book.toml
index ab5e10e0e..e4dd17eb4 100644
--- a/docs/book.toml
+++ b/docs/book.toml
@@ -4,7 +4,7 @@ language = "en"
 multilingual = false
 src = "src"
 title = "carapace"
-description = "A multi-shell completion library. Supports Bash, Elvish, Fish, Nushell, Oil, Powershell, Xonsh and Zsh."
+description = "A multi-shell completion library."
 
 [output.html]
 default-theme = "Latte"
diff --git a/docs/theme/catppuccin.css b/docs/theme/catppuccin.css
index 9b53ac9f6..88b5f8fc1 100644
--- a/docs/theme/catppuccin.css
+++ b/docs/theme/catppuccin.css
@@ -1,354 +1,201 @@
-.mocha.hljs {
-  color: #cdd6f4;
-  background: #1e1e2e;
+/* https://highlightjs.readthedocs.io/en/latest/css-classes-reference.html */
+.latte.hljs {
+  color: #4c4f69;
+  background: #eff1f5;
 }
-.mocha .hljs-keyword {
-  color: #cba6f7;
+.latte .hljs-keyword {
+  color: #8839ef;
 }
-.mocha .hljs-built_in {
-  color: #f38ba8;
+.latte .hljs-built_in {
+  color: #d20f39;
 }
-.mocha .hljs-type {
-  color: #f9e2af;
+.latte .hljs-type {
+  color: #df8e1d;
 }
-.mocha .hljs-literal {
-  color: #fab387;
+.latte .hljs-literal {
+  color: #fe640b;
 }
-.mocha .hljs-number {
-  color: #fab387;
+.latte .hljs-number {
+  color: #fe640b;
 }
-.mocha .hljs-operator {
-  color: #94e2d5;
+.latte .hljs-operator {
+  color: #04a5e5;
 }
-.mocha .hljs-punctuation {
-  color: #bac2de;
+.latte .hljs-punctuation {
+  color: #5c5f77;
 }
-.mocha .hljs-property {
-  color: #94e2d5;
+.latte .hljs-property {
+  color: #179299;
 }
-.mocha .hljs-regexp {
-  color: #f5c2e7;
+.latte .hljs-regexp {
+  color: #ea76cb;
 }
-.mocha .hljs-string {
-  color: #a6e3a1;
+.latte .hljs-string {
+  color: #40a02b;
 }
-.mocha .hljs-char.escape_ {
-  color: #a6e3a1;
+.latte .hljs-char.escape_ {
+  color: #40a02b;
 }
-.mocha .hljs-subst {
-  color: #a6adc8;
+.latte .hljs-subst {
+  color: #6c6f85;
 }
-.mocha .hljs-symbol {
-  color: #f2cdcd;
+.latte .hljs-symbol {
+  color: #dd7878;
 }
-.mocha .hljs-variable {
-  color: #cba6f7;
+.latte .hljs-variable {
+  color: #8839ef;
 }
-.mocha .hljs-variable.language_ {
-  color: #cba6f7;
+.latte .hljs-variable.language_ {
+  color: #8839ef;
 }
-.mocha .hljs-variable.constant_ {
-  color: #fab387;
+.latte .hljs-variable.constant_ {
+  color: #fe640b;
 }
-.mocha .hljs-title {
-  color: #89b4fa;
+.latte .hljs-title {
+  color: #1e66f5;
 }
-.mocha .hljs-title.class_ {
-  color: #f9e2af;
+.latte .hljs-title.class_ {
+  color: #df8e1d;
 }
-.mocha .hljs-title.function_ {
-  color: #89b4fa;
+.latte .hljs-title.function_ {
+  color: #1e66f5;
 }
-.mocha .hljs-params {
-  color: #cdd6f4;
+.latte .hljs-params {
+  color: #4c4f69;
 }
-.mocha .hljs-comment {
-  color: #585b70;
+.latte .hljs-comment {
+  color: #7c7f93;
 }
-.mocha .hljs-doctag {
-  color: #f38ba8;
+.latte .hljs-doctag {
+  color: #d20f39;
 }
-.mocha .hljs-meta {
-  color: #fab387;
+.latte .hljs-meta {
+  color: #fe640b;
 }
-.mocha .hljs-section {
-  color: #89b4fa;
+.latte .hljs-section {
+  color: #1e66f5;
 }
-.mocha .hljs-tag {
-  color: #a6adc8;
+.latte .hljs-tag {
+  color: #179299;
 }
-.mocha .hljs-name {
-  color: #cba6f7;
+.latte .hljs-name {
+  color: #8839ef;
 }
-.mocha .hljs-attr {
-  color: #89b4fa;
+.latte .hljs-attr {
+  color: #1e66f5;
 }
-.mocha .hljs-attribute {
-  color: #a6e3a1;
+.latte .hljs-attribute {
+  color: #40a02b;
 }
-.mocha .hljs-bullet {
-  color: #94e2d5;
+.latte .hljs-bullet {
+  color: #179299;
 }
-.mocha .hljs-code {
-  color: #a6e3a1;
+.latte .hljs-code {
+  color: #40a02b;
 }
-.mocha .hljs-emphasis {
-  color: #f38ba8;
+.latte .hljs-emphasis {
+  color: #d20f39;
   font-style: italic;
 }
-.mocha .hljs-strong {
-  color: #f38ba8;
+.latte .hljs-strong {
+  color: #d20f39;
   font-weight: bold;
 }
-.mocha .hljs-formula {
-  color: #94e2d5;
+.latte .hljs-formula {
+  color: #179299;
 }
-.mocha .hljs-link {
-  color: #74c7ec;
+.latte .hljs-link {
+  color: #209fb5;
   font-style: italic;
 }
-.mocha .hljs-quote {
-  color: #a6e3a1;
+.latte .hljs-quote {
+  color: #40a02b;
   font-style: italic;
 }
-.mocha .hljs-selector-tag {
-  color: #f9e2af;
+.latte .hljs-selector-tag {
+  color: #df8e1d;
 }
-.mocha .hljs-selector-id {
-  color: #89b4fa;
+.latte .hljs-selector-id {
+  color: #1e66f5;
 }
-.mocha .hljs-selector-class {
-  color: #94e2d5;
+.latte .hljs-selector-class {
+  color: #179299;
 }
-.mocha .hljs-selector-attr {
-  color: #cba6f7;
+.latte .hljs-selector-attr {
+  color: #8839ef;
 }
-.mocha .hljs-selector-pseudo {
-  color: #94e2d5;
+.latte .hljs-selector-pseudo {
+  color: #179299;
 }
-.mocha .hljs-template-tag {
-  color: #f2cdcd;
+.latte .hljs-template-tag {
+  color: #dd7878;
 }
-.mocha .hljs-template-variable {
-  color: #f2cdcd;
+.latte .hljs-template-variable {
+  color: #dd7878;
 }
-.mocha .hljs-addition {
-  color: #a6e3a1;
-  background: rgba(166, 227, 161, 0.15);
+.latte .hljs-addition {
+  color: #40a02b;
+  background: rgba(64, 160, 43, 0.15);
 }
-.mocha .hljs-deletion {
-  color: #f38ba8;
-  background: rgba(243, 139, 168, 0.15);
+.latte .hljs-deletion {
+  color: #d20f39;
+  background: rgba(210, 15, 57, 0.15);
 }
-.mocha code {
-  color: #cdd6f4;
-  background: #181825;
+.latte :is(h1, h2, h3, h4, h5, h6) a code {
+  color: #4c4f69;
 }
-.mocha blockquote blockquote {
-  border-top: 0.1em solid #585b70;
-  border-bottom: 0.1em solid #585b70;
+.latte a code {
+  color: #1e66f5;
 }
-.mocha hr {
-  color: #585b70;
+.latte code {
+  color: #4c4f69;
+  background: #e6e9ef;
 }
-.mocha del {
-  color: #9399b2;
+.latte blockquote blockquote {
+  border-top: 0.1em solid #acb0be;
+  border-bottom: 0.1em solid #acb0be;
 }
-.mocha .ace_gutter {
-  color: #7f849c;
-  background: #181825;
+.latte hr {
+  border-color: #acb0be;
+  border-style: solid;
 }
-.mocha .ace_gutter-active-line.ace_gutter-cell {
-  color: #f5c2e7;
-  background: #181825;
+.latte del {
+  color: #7c7f93;
 }
-
-.macchiato.hljs {
-  color: #cad3f5;
-  background: #24273a;
+.latte .ace_gutter {
+  color: #8c8fa1;
+  background: #e6e9ef;
 }
-.macchiato .hljs-keyword {
-  color: #c6a0f6;
+.latte .ace_gutter-active-line.ace_gutter-cell {
+  color: #ea76cb;
+  background: #e6e9ef;
 }
-.macchiato .hljs-built_in {
-  color: #ed8796;
+.latte .tooltiptext {
+  background: #e6e9ef;
+  color: #4c4f69;
 }
-.macchiato .hljs-type {
-  color: #eed49f;
+
+.frappe.hljs {
+  color: #c6d0f5;
+  background: #303446;
 }
-.macchiato .hljs-literal {
-  color: #f5a97f;
+.frappe .hljs-keyword {
+  color: #ca9ee6;
 }
-.macchiato .hljs-number {
-  color: #f5a97f;
+.frappe .hljs-built_in {
+  color: #e78284;
 }
-.macchiato .hljs-operator {
-  color: #8bd5ca;
+.frappe .hljs-type {
+  color: #e5c890;
 }
-.macchiato .hljs-punctuation {
-  color: #b8c0e0;
+.frappe .hljs-literal {
+  color: #ef9f76;
 }
-.macchiato .hljs-property {
-  color: #8bd5ca;
+.frappe .hljs-number {
+  color: #ef9f76;
 }
-.macchiato .hljs-regexp {
-  color: #f5bde6;
-}
-.macchiato .hljs-string {
-  color: #a6da95;
-}
-.macchiato .hljs-char.escape_ {
-  color: #a6da95;
-}
-.macchiato .hljs-subst {
-  color: #a5adcb;
-}
-.macchiato .hljs-symbol {
-  color: #f0c6c6;
-}
-.macchiato .hljs-variable {
-  color: #c6a0f6;
-}
-.macchiato .hljs-variable.language_ {
-  color: #c6a0f6;
-}
-.macchiato .hljs-variable.constant_ {
-  color: #f5a97f;
-}
-.macchiato .hljs-title {
-  color: #8aadf4;
-}
-.macchiato .hljs-title.class_ {
-  color: #eed49f;
-}
-.macchiato .hljs-title.function_ {
-  color: #8aadf4;
-}
-.macchiato .hljs-params {
-  color: #cad3f5;
-}
-.macchiato .hljs-comment {
-  color: #5b6078;
-}
-.macchiato .hljs-doctag {
-  color: #ed8796;
-}
-.macchiato .hljs-meta {
-  color: #f5a97f;
-}
-.macchiato .hljs-section {
-  color: #8aadf4;
-}
-.macchiato .hljs-tag {
-  color: #a5adcb;
-}
-.macchiato .hljs-name {
-  color: #c6a0f6;
-}
-.macchiato .hljs-attr {
-  color: #8aadf4;
-}
-.macchiato .hljs-attribute {
-  color: #a6da95;
-}
-.macchiato .hljs-bullet {
-  color: #8bd5ca;
-}
-.macchiato .hljs-code {
-  color: #a6da95;
-}
-.macchiato .hljs-emphasis {
-  color: #ed8796;
-  font-style: italic;
-}
-.macchiato .hljs-strong {
-  color: #ed8796;
-  font-weight: bold;
-}
-.macchiato .hljs-formula {
-  color: #8bd5ca;
-}
-.macchiato .hljs-link {
-  color: #7dc4e4;
-  font-style: italic;
-}
-.macchiato .hljs-quote {
-  color: #a6da95;
-  font-style: italic;
-}
-.macchiato .hljs-selector-tag {
-  color: #eed49f;
-}
-.macchiato .hljs-selector-id {
-  color: #8aadf4;
-}
-.macchiato .hljs-selector-class {
-  color: #8bd5ca;
-}
-.macchiato .hljs-selector-attr {
-  color: #c6a0f6;
-}
-.macchiato .hljs-selector-pseudo {
-  color: #8bd5ca;
-}
-.macchiato .hljs-template-tag {
-  color: #f0c6c6;
-}
-.macchiato .hljs-template-variable {
-  color: #f0c6c6;
-}
-.macchiato .hljs-addition {
-  color: #a6da95;
-  background: rgba(166, 218, 149, 0.15);
-}
-.macchiato .hljs-deletion {
-  color: #ed8796;
-  background: rgba(237, 135, 150, 0.15);
-}
-.macchiato code {
-  color: #cad3f5;
-  background: #1e2030;
-}
-.macchiato blockquote blockquote {
-  border-top: 0.1em solid #5b6078;
-  border-bottom: 0.1em solid #5b6078;
-}
-.macchiato hr {
-  color: #5b6078;
-}
-.macchiato del {
-  color: #939ab7;
-}
-.macchiato .ace_gutter {
-  color: #8087a2;
-  background: #1e2030;
-}
-.macchiato .ace_gutter-active-line.ace_gutter-cell {
-  color: #f5bde6;
-  background: #1e2030;
-}
-
-.frappe.hljs {
-  color: #c6d0f5;
-  background: #303446;
-}
-.frappe .hljs-keyword {
-  color: #ca9ee6;
-}
-.frappe .hljs-built_in {
-  color: #e78284;
-}
-.frappe .hljs-type {
-  color: #e5c890;
-}
-.frappe .hljs-literal {
-  color: #ef9f76;
-}
-.frappe .hljs-number {
-  color: #ef9f76;
-}
-.frappe .hljs-operator {
-  color: #81c8be;
+.frappe .hljs-operator {
+  color: #99d1db;
 }
 .frappe .hljs-punctuation {
   color: #b5bfe2;
@@ -393,7 +240,7 @@
   color: #c6d0f5;
 }
 .frappe .hljs-comment {
-  color: #626880;
+  color: #949cbb;
 }
 .frappe .hljs-doctag {
   color: #e78284;
@@ -405,7 +252,7 @@
   color: #8caaee;
 }
 .frappe .hljs-tag {
-  color: #a5adce;
+  color: #81c8be;
 }
 .frappe .hljs-name {
   color: #ca9ee6;
@@ -470,6 +317,12 @@
   color: #e78284;
   background: rgba(231, 130, 132, 0.15);
 }
+.frappe :is(h1, h2, h3, h4, h5, h6) a code {
+  color: #c6d0f5;
+}
+.frappe a code {
+  color: #8caaee;
+}
 .frappe code {
   color: #c6d0f5;
   background: #292c3c;
@@ -479,7 +332,8 @@
   border-bottom: 0.1em solid #626880;
 }
 .frappe hr {
-  color: #626880;
+  border-color: #626880;
+  border-style: solid;
 }
 .frappe del {
   color: #949cbb;
@@ -492,232 +346,394 @@
   color: #f4b8e4;
   background: #292c3c;
 }
+.frappe .tooltiptext {
+  background: #292c3c;
+  color: #c6d0f5;
+}
 
-.latte.hljs {
-  color: #4c4f69;
-  background: #eff1f5;
+.macchiato.hljs {
+  color: #cad3f5;
+  background: #24273a;
 }
-.latte .hljs-keyword {
-  color: #8839ef;
+.macchiato .hljs-keyword {
+  color: #c6a0f6;
 }
-.latte .hljs-built_in {
-  color: #d20f39;
+.macchiato .hljs-built_in {
+  color: #ed8796;
 }
-.latte .hljs-type {
-  color: #df8e1d;
+.macchiato .hljs-type {
+  color: #eed49f;
 }
-.latte .hljs-literal {
-  color: #fe640b;
+.macchiato .hljs-literal {
+  color: #f5a97f;
 }
-.latte .hljs-number {
-  color: #fe640b;
+.macchiato .hljs-number {
+  color: #f5a97f;
 }
-.latte .hljs-operator {
-  color: #179299;
+.macchiato .hljs-operator {
+  color: #91d7e3;
 }
-.latte .hljs-punctuation {
-  color: #5c5f77;
+.macchiato .hljs-punctuation {
+  color: #b8c0e0;
 }
-.latte .hljs-property {
-  color: #179299;
+.macchiato .hljs-property {
+  color: #8bd5ca;
 }
-.latte .hljs-regexp {
-  color: #ea76cb;
+.macchiato .hljs-regexp {
+  color: #f5bde6;
 }
-.latte .hljs-string {
-  color: #40a02b;
+.macchiato .hljs-string {
+  color: #a6da95;
 }
-.latte .hljs-char.escape_ {
-  color: #40a02b;
+.macchiato .hljs-char.escape_ {
+  color: #a6da95;
 }
-.latte .hljs-subst {
-  color: #6c6f85;
+.macchiato .hljs-subst {
+  color: #a5adcb;
 }
-.latte .hljs-symbol {
-  color: #dd7878;
+.macchiato .hljs-symbol {
+  color: #f0c6c6;
 }
-.latte .hljs-variable {
-  color: #8839ef;
+.macchiato .hljs-variable {
+  color: #c6a0f6;
 }
-.latte .hljs-variable.language_ {
-  color: #8839ef;
+.macchiato .hljs-variable.language_ {
+  color: #c6a0f6;
 }
-.latte .hljs-variable.constant_ {
-  color: #fe640b;
+.macchiato .hljs-variable.constant_ {
+  color: #f5a97f;
 }
-.latte .hljs-title {
-  color: #1e66f5;
+.macchiato .hljs-title {
+  color: #8aadf4;
 }
-.latte .hljs-title.class_ {
-  color: #df8e1d;
+.macchiato .hljs-title.class_ {
+  color: #eed49f;
 }
-.latte .hljs-title.function_ {
-  color: #1e66f5;
+.macchiato .hljs-title.function_ {
+  color: #8aadf4;
 }
-.latte .hljs-params {
-  color: #4c4f69;
+.macchiato .hljs-params {
+  color: #cad3f5;
 }
-.latte .hljs-comment {
-  color: #acb0be;
+.macchiato .hljs-comment {
+  color: #939ab7;
 }
-.latte .hljs-doctag {
-  color: #d20f39;
+.macchiato .hljs-doctag {
+  color: #ed8796;
 }
-.latte .hljs-meta {
-  color: #fe640b;
+.macchiato .hljs-meta {
+  color: #f5a97f;
 }
-.latte .hljs-section {
-  color: #1e66f5;
+.macchiato .hljs-section {
+  color: #8aadf4;
 }
-.latte .hljs-tag {
-  color: #6c6f85;
+.macchiato .hljs-tag {
+  color: #8bd5ca;
 }
-.latte .hljs-name {
-  color: #8839ef;
+.macchiato .hljs-name {
+  color: #c6a0f6;
 }
-.latte .hljs-attr {
-  color: #1e66f5;
+.macchiato .hljs-attr {
+  color: #8aadf4;
 }
-.latte .hljs-attribute {
-  color: #40a02b;
+.macchiato .hljs-attribute {
+  color: #a6da95;
 }
-.latte .hljs-bullet {
-  color: #179299;
+.macchiato .hljs-bullet {
+  color: #8bd5ca;
 }
-.latte .hljs-code {
-  color: #40a02b;
+.macchiato .hljs-code {
+  color: #a6da95;
 }
-.latte .hljs-emphasis {
-  color: #d20f39;
+.macchiato .hljs-emphasis {
+  color: #ed8796;
   font-style: italic;
 }
-.latte .hljs-strong {
-  color: #d20f39;
+.macchiato .hljs-strong {
+  color: #ed8796;
   font-weight: bold;
 }
-.latte .hljs-formula {
-  color: #179299;
+.macchiato .hljs-formula {
+  color: #8bd5ca;
 }
-.latte .hljs-link {
-  color: #209fb5;
+.macchiato .hljs-link {
+  color: #7dc4e4;
   font-style: italic;
 }
-.latte .hljs-quote {
-  color: #40a02b;
+.macchiato .hljs-quote {
+  color: #a6da95;
   font-style: italic;
 }
-.latte .hljs-selector-tag {
-  color: #df8e1d;
+.macchiato .hljs-selector-tag {
+  color: #eed49f;
 }
-.latte .hljs-selector-id {
-  color: #1e66f5;
+.macchiato .hljs-selector-id {
+  color: #8aadf4;
 }
-.latte .hljs-selector-class {
-  color: #179299;
+.macchiato .hljs-selector-class {
+  color: #8bd5ca;
 }
-.latte .hljs-selector-attr {
-  color: #8839ef;
+.macchiato .hljs-selector-attr {
+  color: #c6a0f6;
 }
-.latte .hljs-selector-pseudo {
-  color: #179299;
+.macchiato .hljs-selector-pseudo {
+  color: #8bd5ca;
 }
-.latte .hljs-template-tag {
-  color: #dd7878;
+.macchiato .hljs-template-tag {
+  color: #f0c6c6;
 }
-.latte .hljs-template-variable {
-  color: #dd7878;
+.macchiato .hljs-template-variable {
+  color: #f0c6c6;
 }
-.latte .hljs-addition {
-  color: #40a02b;
-  background: rgba(64, 160, 43, 0.15);
+.macchiato .hljs-addition {
+  color: #a6da95;
+  background: rgba(166, 218, 149, 0.15);
 }
-.latte .hljs-deletion {
-  color: #d20f39;
-  background: rgba(210, 15, 57, 0.15);
+.macchiato .hljs-deletion {
+  color: #ed8796;
+  background: rgba(237, 135, 150, 0.15);
 }
-.latte code {
-  color: #4c4f69;
-  background: #e6e9ef;
+.macchiato :is(h1, h2, h3, h4, h5, h6) a code {
+  color: #cad3f5;
 }
-.latte blockquote blockquote {
-  border-top: 0.1em solid #acb0be;
-  border-bottom: 0.1em solid #acb0be;
+.macchiato a code {
+  color: #8aadf4;
 }
-.latte hr {
-  color: #acb0be;
+.macchiato code {
+  color: #cad3f5;
+  background: #1e2030;
 }
-.latte del {
-  color: #7c7f93;
+.macchiato blockquote blockquote {
+  border-top: 0.1em solid #5b6078;
+  border-bottom: 0.1em solid #5b6078;
 }
-.latte .ace_gutter {
-  color: #8c8fa1;
-  background: #e6e9ef;
+.macchiato hr {
+  border-color: #5b6078;
+  border-style: solid;
 }
-.latte .ace_gutter-active-line.ace_gutter-cell {
-  color: #ea76cb;
-  background: #e6e9ef;
+.macchiato del {
+  color: #939ab7;
+}
+.macchiato .ace_gutter {
+  color: #8087a2;
+  background: #1e2030;
+}
+.macchiato .ace_gutter-active-line.ace_gutter-cell {
+  color: #f5bde6;
+  background: #1e2030;
+}
+.macchiato .tooltiptext {
+  background: #1e2030;
+  color: #cad3f5;
 }
 
-.mocha {
-  --bg: #1e1e2e;
-  --fg: #cdd6f4;
-  --sidebar-bg: #181825;
-  --sidebar-fg: #cdd6f4;
-  --sidebar-non-existant: #6c7086;
-  --sidebar-active: #89b4fa;
-  --sidebar-spacer: #6c7086;
-  --scrollbar: #6c7086;
-  --icons: #6c7086;
-  --icons-hover: #7f849c;
-  --links: #89b4fa;
-  --inline-code-color: #fab387;
-  --theme-popup-bg: #181825;
-  --theme-popup-border: #6c7086;
-  --theme-hover: #6c7086;
-  --quote-bg: #181825;
-  --quote-border: #11111b;
-  --table-border-color: #11111b;
-  --table-header-bg: #181825;
-  --table-alternate-bg: #181825;
-  --searchbar-border-color: #11111b;
-  --searchbar-bg: #181825;
-  --searchbar-fg: #cdd6f4;
-  --searchbar-shadow-color: #11111b;
-  --searchresults-header-fg: #cdd6f4;
-  --searchresults-border-color: #11111b;
-  --searchresults-li-bg: #1e1e2e;
-  --search-mark-bg: #fab387;
+.mocha.hljs {
+  color: #cdd6f4;
+  background: #1e1e2e;
+}
+.mocha .hljs-keyword {
+  color: #cba6f7;
+}
+.mocha .hljs-built_in {
+  color: #f38ba8;
+}
+.mocha .hljs-type {
+  color: #f9e2af;
+}
+.mocha .hljs-literal {
+  color: #fab387;
+}
+.mocha .hljs-number {
+  color: #fab387;
+}
+.mocha .hljs-operator {
+  color: #89dceb;
+}
+.mocha .hljs-punctuation {
+  color: #bac2de;
+}
+.mocha .hljs-property {
+  color: #94e2d5;
+}
+.mocha .hljs-regexp {
+  color: #f5c2e7;
+}
+.mocha .hljs-string {
+  color: #a6e3a1;
+}
+.mocha .hljs-char.escape_ {
+  color: #a6e3a1;
+}
+.mocha .hljs-subst {
+  color: #a6adc8;
+}
+.mocha .hljs-symbol {
+  color: #f2cdcd;
+}
+.mocha .hljs-variable {
+  color: #cba6f7;
+}
+.mocha .hljs-variable.language_ {
+  color: #cba6f7;
+}
+.mocha .hljs-variable.constant_ {
+  color: #fab387;
+}
+.mocha .hljs-title {
+  color: #89b4fa;
+}
+.mocha .hljs-title.class_ {
+  color: #f9e2af;
+}
+.mocha .hljs-title.function_ {
+  color: #89b4fa;
+}
+.mocha .hljs-params {
+  color: #cdd6f4;
+}
+.mocha .hljs-comment {
+  color: #9399b2;
+}
+.mocha .hljs-doctag {
+  color: #f38ba8;
+}
+.mocha .hljs-meta {
+  color: #fab387;
+}
+.mocha .hljs-section {
+  color: #89b4fa;
+}
+.mocha .hljs-tag {
+  color: #94e2d5;
+}
+.mocha .hljs-name {
+  color: #cba6f7;
+}
+.mocha .hljs-attr {
+  color: #89b4fa;
+}
+.mocha .hljs-attribute {
+  color: #a6e3a1;
+}
+.mocha .hljs-bullet {
+  color: #94e2d5;
+}
+.mocha .hljs-code {
+  color: #a6e3a1;
+}
+.mocha .hljs-emphasis {
+  color: #f38ba8;
+  font-style: italic;
+}
+.mocha .hljs-strong {
+  color: #f38ba8;
+  font-weight: bold;
+}
+.mocha .hljs-formula {
+  color: #94e2d5;
+}
+.mocha .hljs-link {
+  color: #74c7ec;
+  font-style: italic;
+}
+.mocha .hljs-quote {
+  color: #a6e3a1;
+  font-style: italic;
+}
+.mocha .hljs-selector-tag {
+  color: #f9e2af;
+}
+.mocha .hljs-selector-id {
+  color: #89b4fa;
+}
+.mocha .hljs-selector-class {
+  color: #94e2d5;
+}
+.mocha .hljs-selector-attr {
+  color: #cba6f7;
+}
+.mocha .hljs-selector-pseudo {
+  color: #94e2d5;
+}
+.mocha .hljs-template-tag {
+  color: #f2cdcd;
+}
+.mocha .hljs-template-variable {
+  color: #f2cdcd;
+}
+.mocha .hljs-addition {
+  color: #a6e3a1;
+  background: rgba(166, 227, 161, 0.15);
+}
+.mocha .hljs-deletion {
+  color: #f38ba8;
+  background: rgba(243, 139, 168, 0.15);
+}
+.mocha :is(h1, h2, h3, h4, h5, h6) a code {
+  color: #cdd6f4;
+}
+.mocha a code {
+  color: #89b4fa;
+}
+.mocha code {
+  color: #cdd6f4;
+  background: #181825;
+}
+.mocha blockquote blockquote {
+  border-top: 0.1em solid #585b70;
+  border-bottom: 0.1em solid #585b70;
+}
+.mocha hr {
+  border-color: #585b70;
+  border-style: solid;
+}
+.mocha del {
+  color: #9399b2;
+}
+.mocha .ace_gutter {
+  color: #7f849c;
+  background: #181825;
+}
+.mocha .ace_gutter-active-line.ace_gutter-cell {
+  color: #f5c2e7;
+  background: #181825;
+}
+.mocha .tooltiptext {
+  background: #181825;
+  color: #cdd6f4;
 }
 
-.macchiato {
-  --bg: #24273a;
-  --fg: #cad3f5;
-  --sidebar-bg: #1e2030;
-  --sidebar-fg: #cad3f5;
-  --sidebar-non-existant: #6e738d;
-  --sidebar-active: #8aadf4;
-  --sidebar-spacer: #6e738d;
-  --scrollbar: #6e738d;
-  --icons: #6e738d;
-  --icons-hover: #8087a2;
-  --links: #8aadf4;
-  --inline-code-color: #f5a97f;
-  --theme-popup-bg: #1e2030;
-  --theme-popup-border: #6e738d;
-  --theme-hover: #6e738d;
-  --quote-bg: #1e2030;
-  --quote-border: #181926;
-  --table-border-color: #181926;
-  --table-header-bg: #1e2030;
-  --table-alternate-bg: #1e2030;
-  --searchbar-border-color: #181926;
-  --searchbar-bg: #1e2030;
-  --searchbar-fg: #cad3f5;
-  --searchbar-shadow-color: #181926;
-  --searchresults-header-fg: #cad3f5;
-  --searchresults-border-color: #181926;
-  --searchresults-li-bg: #24273a;
-  --search-mark-bg: #f5a97f;
+.latte {
+  --bg: #eff1f5;
+  --fg: #4c4f69;
+  --sidebar-bg: #e6e9ef;
+  --sidebar-fg: #4c4f69;
+  --sidebar-non-existant: #9ca0b0;
+  --sidebar-active: #1e66f5;
+  --sidebar-spacer: #9ca0b0;
+  --scrollbar: #9ca0b0;
+  --icons: #9ca0b0;
+  --icons-hover: #7c7f93;
+  --links: #1e66f5;
+  --inline-code-color: #fe640b;
+  --theme-popup-bg: #e6e9ef;
+  --theme-popup-border: #9ca0b0;
+  --theme-hover: #ccd0da;
+  --quote-bg: #e6e9ef;
+  --quote-border: #dce0e8;
+  --table-border-color: #ccd0da;
+  --table-header-bg: #e6e9ef;
+  --table-alternate-bg: #e6e9ef;
+  --searchbar-border-color: #ccd0da;
+  --searchbar-bg: #e6e9ef;
+  --searchbar-fg: #4c4f69;
+  --searchbar-shadow-color: #dce0e8;
+  --searchresults-header-fg: #4c4f69;
+  --searchresults-border-color: #ccd0da;
+  --searchresults-li-bg: #eff1f5;
+  --search-mark-bg: #fe640b;
+  --warning-border: #fe640b;
+  --color-scheme: light;
 }
 
 .frappe {
@@ -730,54 +746,91 @@
   --sidebar-spacer: #737994;
   --scrollbar: #737994;
   --icons: #737994;
-  --icons-hover: #838ba7;
+  --icons-hover: #949cbb;
   --links: #8caaee;
   --inline-code-color: #ef9f76;
   --theme-popup-bg: #292c3c;
   --theme-popup-border: #737994;
-  --theme-hover: #737994;
+  --theme-hover: #414559;
   --quote-bg: #292c3c;
   --quote-border: #232634;
-  --table-border-color: #232634;
+  --table-border-color: #414559;
   --table-header-bg: #292c3c;
   --table-alternate-bg: #292c3c;
-  --searchbar-border-color: #232634;
+  --searchbar-border-color: #414559;
   --searchbar-bg: #292c3c;
   --searchbar-fg: #c6d0f5;
   --searchbar-shadow-color: #232634;
   --searchresults-header-fg: #c6d0f5;
-  --searchresults-border-color: #232634;
+  --searchresults-border-color: #414559;
   --searchresults-li-bg: #303446;
   --search-mark-bg: #ef9f76;
+  --warning-border: #ef9f76;
+  --color-scheme: dark;
 }
 
-.latte {
-  --bg: #eff1f5;
-  --fg: #4c4f69;
-  --sidebar-bg: #e6e9ef;
-  --sidebar-fg: #4c4f69;
-  --sidebar-non-existant: #9ca0b0;
-  --sidebar-active: #1e66f5;
-  --sidebar-spacer: #9ca0b0;
-  --scrollbar: #9ca0b0;
-  --icons: #9ca0b0;
-  --icons-hover: #8c8fa1;
-  --links: #1e66f5;
-  --inline-code-color: #fe640b;
-  --theme-popup-bg: #e6e9ef;
-  --theme-popup-border: #9ca0b0;
-  --theme-hover: #9ca0b0;
-  --quote-bg: #e6e9ef;
-  --quote-border: #dce0e8;
-  --table-border-color: #dce0e8;
-  --table-header-bg: #e6e9ef;
-  --table-alternate-bg: #e6e9ef;
-  --searchbar-border-color: #dce0e8;
-  --searchbar-bg: #e6e9ef;
-  --searchbar-fg: #4c4f69;
-  --searchbar-shadow-color: #dce0e8;
-  --searchresults-header-fg: #4c4f69;
-  --searchresults-border-color: #dce0e8;
-  --searchresults-li-bg: #eff1f5;
-  --search-mark-bg: #fe640b;
+.macchiato {
+  --bg: #24273a;
+  --fg: #cad3f5;
+  --sidebar-bg: #1e2030;
+  --sidebar-fg: #cad3f5;
+  --sidebar-non-existant: #6e738d;
+  --sidebar-active: #8aadf4;
+  --sidebar-spacer: #6e738d;
+  --scrollbar: #6e738d;
+  --icons: #6e738d;
+  --icons-hover: #939ab7;
+  --links: #8aadf4;
+  --inline-code-color: #f5a97f;
+  --theme-popup-bg: #1e2030;
+  --theme-popup-border: #6e738d;
+  --theme-hover: #363a4f;
+  --quote-bg: #1e2030;
+  --quote-border: #181926;
+  --table-border-color: #363a4f;
+  --table-header-bg: #1e2030;
+  --table-alternate-bg: #1e2030;
+  --searchbar-border-color: #363a4f;
+  --searchbar-bg: #1e2030;
+  --searchbar-fg: #cad3f5;
+  --searchbar-shadow-color: #181926;
+  --searchresults-header-fg: #cad3f5;
+  --searchresults-border-color: #363a4f;
+  --searchresults-li-bg: #24273a;
+  --search-mark-bg: #f5a97f;
+  --warning-border: #f5a97f;
+  --color-scheme: dark;
+}
+
+.mocha {
+  --bg: #1e1e2e;
+  --fg: #cdd6f4;
+  --sidebar-bg: #181825;
+  --sidebar-fg: #cdd6f4;
+  --sidebar-non-existant: #6c7086;
+  --sidebar-active: #89b4fa;
+  --sidebar-spacer: #6c7086;
+  --scrollbar: #6c7086;
+  --icons: #6c7086;
+  --icons-hover: #9399b2;
+  --links: #89b4fa;
+  --inline-code-color: #fab387;
+  --theme-popup-bg: #181825;
+  --theme-popup-border: #6c7086;
+  --theme-hover: #313244;
+  --quote-bg: #181825;
+  --quote-border: #11111b;
+  --table-border-color: #313244;
+  --table-header-bg: #181825;
+  --table-alternate-bg: #181825;
+  --searchbar-border-color: #313244;
+  --searchbar-bg: #181825;
+  --searchbar-fg: #cdd6f4;
+  --searchbar-shadow-color: #11111b;
+  --searchresults-header-fg: #cdd6f4;
+  --searchresults-border-color: #313244;
+  --searchresults-li-bg: #1e1e2e;
+  --search-mark-bg: #fab387;
+  --warning-border: #fab387;
+  --color-scheme: dark;
 }
diff --git a/docs/theme/index.hbs b/docs/theme/index.hbs
index bbf5d1156..117fd4169 100644
--- a/docs/theme/index.hbs
+++ b/docs/theme/index.hbs
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML>
-<html lang="{{ language }}" class="{{ default_theme }}" dir="{{ text_direction }}">
+<html lang="{{ language }}" class="{{ default_theme }} sidebar-visible" dir="{{ text_direction }}">
     <head>
         <!-- Book generated using mdBook -->
         <meta charset="UTF-8">
@@ -52,15 +52,17 @@
         <!-- MathJax -->
         <script async src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
         {{/if}}
-    </head>
-    <body class="sidebar-visible no-js">
-    <div id="body-container">
+
         <!-- Provide site root to javascript -->
         <script>
             var path_to_root = "{{ path_to_root }}";
             var default_theme = window.matchMedia("(prefers-color-scheme: dark)").matches ? "{{ preferred_dark_theme }}" : "{{ default_theme }}";
         </script>
-
+        <!-- Start loading toc.js asap -->
+        <script src="{{ path_to_root }}toc.js"></script>
+    </head>
+    <body>
+    <div id="body-container">
         <!-- Work around some values being stored in localStorage wrapped in quotes -->
         <script>
             try {
@@ -82,19 +84,16 @@
             var theme;
             try { theme = localStorage.getItem('mdbook-theme'); } catch(e) { }
             if (theme === null || theme === undefined) { theme = default_theme; }
-            var html = document.querySelector('html');
+            const html = document.documentElement;
             html.classList.remove('{{ default_theme }}')
             html.classList.add(theme);
-            var body = document.querySelector('body');
-            body.classList.remove('no-js')
-            body.classList.add('js');
+            html.classList.add("js");
         </script>
 
         <input type="checkbox" id="sidebar-toggle-anchor" class="hidden">
 
         <!-- Hide / unhide sidebar before it is displayed -->
         <script>
-            var body = document.querySelector('body');
             var sidebar = null;
             var sidebar_toggle = document.getElementById("sidebar-toggle-anchor");
             if (document.body.clientWidth >= 1080) {
@@ -104,39 +103,21 @@
                 sidebar = 'hidden';
             }
             sidebar_toggle.checked = sidebar === 'visible';
-            body.classList.remove('sidebar-visible');
-            body.classList.add("sidebar-" + sidebar);
+            html.classList.remove('sidebar-visible');
+            html.classList.add("sidebar-" + sidebar);
         </script>
 
         <nav id="sidebar" class="sidebar" aria-label="Table of contents">
-            <div class="sidebar-scrollbox">
-                {{#toc}}{{/toc}}
+            <!-- populated by js -->
+            <mdbook-sidebar-scrollbox class="sidebar-scrollbox"></mdbook-sidebar-scrollbox>
+            <noscript>
+                <iframe class="sidebar-iframe-outer" src="{{ path_to_root }}toc.html"></iframe>
+            </noscript>
+            <div id="sidebar-resize-handle" class="sidebar-resize-handle">
+                <div class="sidebar-resize-indicator"></div>
             </div>
-            <div id="sidebar-resize-handle" class="sidebar-resize-handle"></div>
         </nav>
 
-        <!-- Track and set sidebar scroll position -->
-        <script>
-            var sidebarScrollbox = document.querySelector('#sidebar .sidebar-scrollbox');
-            sidebarScrollbox.addEventListener('click', function(e) {
-                if (e.target.tagName === 'A') {
-                    sessionStorage.setItem('sidebar-scroll', sidebarScrollbox.scrollTop);
-                }
-            }, { passive: true });
-            var sidebarScrollTop = sessionStorage.getItem('sidebar-scroll');
-            sessionStorage.removeItem('sidebar-scroll');
-            if (sidebarScrollTop) {
-                // preserve sidebar scroll position when navigating via links within sidebar
-                sidebarScrollbox.scrollTop = sidebarScrollTop;
-            } else {
-                // scroll sidebar to current active section when navigating via "next/previous chapter" buttons
-                var activeSection = document.querySelector('#sidebar .active');
-                if (activeSection) {
-                    activeSection.scrollIntoView({ block: 'center' });
-                }
-            }
-        </script>
-
         <div id="page-wrapper" class="page-wrapper">
 
             <div class="page">
@@ -345,4 +326,4 @@
 
     </div>
     </body>
-</html>
\ No newline at end of file
+</html>