diff --git a/Dockerfile b/Dockerfile
index a539465a4..d4ff96259 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -57,10 +57,13 @@ RUN wget -qO- "https://github.com/sharkdp/vivid/releases/download/v${version}/vi
  && mv vivid-v${version}-x86_64-unknown-linux-gnu/vivid /usr/local/bin/
 
 FROM base as mdbook
-ARG version=0.4.34
-RUN curl -L "https://github.com/rust-lang/mdBook/releases/download/v${version}/mdbook-v${version}-x86_64-unknown-linux-gnu.tar.gz" | tar -xvz mdbook \
-  && curl -L "https://github.com/Michael-F-Bryan/mdbook-linkcheck/releases/download/v0.7.0/mdbook-linkcheck-v0.7.0-x86_64-unknown-linux-gnu.tar.gz" | tar -xvz mdbook-linkcheck \
-  && mv mdbook* /usr/local/bin/
+ARG version=0.4.35
+RUN apt-get update && apt-get install -y unzip \
+  && curl -L "https://github.com/rust-lang/mdBook/releases/download/v${version}/mdbook-v${version}-x86_64-unknown-linux-gnu.tar.gz" | tar -xvz mdbook \
+  && wget -q "https://github.com/Michael-F-Bryan/mdbook-linkcheck/releases/download/v0.7.7/mdbook-linkcheck.x86_64-unknown-linux-gnu.zip" \
+  && unzip mdbook-linkcheck.x86_64-unknown-linux-gnu.zip mdbook-linkcheck \
+  && chmod +x mdbook-linkcheck \
+  && mv mdbook-linkcheck /usr/local/bin/
 
 FROM base
 RUN apt-get update && apt-get install -y libicu72
diff --git a/docs/book.toml b/docs/book.toml
index 0b4d7734d..7091d003e 100644
--- a/docs/book.toml
+++ b/docs/book.toml
@@ -7,10 +7,13 @@ title = "carapace"
 
 [output.html]
 default-theme = "Mocha"
-additional-css = ["asciinema/asciinema-player.css", "./theme/catppuccin.css", "./theme/catppuccin-highlight.css"]
+additional-css = ["asciinema/asciinema-player.css", "./theme/catppuccin.css"]
 additional-js = ["asciinema/asciinema-player.min.js", "asciinema/load.js"]
 git-repository-url = "https://github.com/rsteube/carapace"
 edit-url-template = "https://github.com/rsteube/carapace/edit/master/docs/{path}"
 
+[output.html.fold]
+enable = true
+
 [output.linkcheck]
 follow-web-links = true
diff --git a/docs/theme/catppuccin-highlight.css b/docs/theme/catppuccin-highlight.css
deleted file mode 100644
index 6c3c4fa6a..000000000
--- a/docs/theme/catppuccin-highlight.css
+++ /dev/null
@@ -1,359 +0,0 @@
-.mocha code,
-.mocha .hljs {
-  background: #181825;
-}
-.mocha code .hljs-attr,
-.mocha code .hljs-string {
-  color: #a6e3a1;
-}
-.mocha code .hljs-tag {
-  color: #f38ba8;
-}
-.mocha code .hljs-name {
-  color: #f2cdcd;
-}
-.mocha pre .hljs {
-  background: #181825 !important;
-}
-.mocha pre .hljs-params {
-  color: #f38ba8 !important;
-}
-.mocha pre .hljs-built_in,
-.mocha pre .hljs-selector-tag,
-.mocha pre .hljs-section,
-.mocha pre .hljs-link {
-  color: #74c7ec !important;
-}
-.mocha pre .hljs-keyword {
-  color: #cba6f7 !important;
-}
-.mocha pre .hljs,
-.mocha pre .hljs-subst {
-  color: #a6adc8 !important;
-}
-.mocha pre .hljs-title {
-  color: #89b4fa !important;
-}
-.mocha pre .hljs-attr,
-.mocha pre .hljs-meta-keyword {
-  color: #a6e3a1 !important;
-}
-.mocha pre .hljs-type {
-  color: #89b4fa !important;
-}
-.mocha pre .hljs-string {
-  color: #a6e3a1 !important;
-}
-.mocha pre .hljs-tag {
-  color: #f38ba8 !important;
-}
-.mocha pre .hljs-meta,
-.mocha pre .hljs-name,
-.mocha pre .hljs-symbol,
-.mocha pre .hljs-bullet,
-.mocha pre .hljs-addition,
-.mocha pre .hljs-variable,
-.mocha pre .hljs-template-tag,
-.mocha pre .hljs-template-variable {
-  color: #f2cdcd !important;
-}
-.mocha pre .hljs-addition {
-  background-color: #181825 !important;
-  color: #a6e3a1 !important;
-}
-.mocha pre .hljs-deletion {
-  background-color: #181825 !important;
-  color: #f38ba8 !important;
-}
-.mocha pre .hljs-comment,
-.mocha pre .hljs-quote {
-  color: #585b70 !important;
-}
-.mocha pre .hljs-keyword,
-.mocha pre .hljs-selector-tag,
-.mocha pre .hljs-literal,
-.mocha pre .hljs-title,
-.mocha pre .hljs-section,
-.mocha pre .hljs-doctag,
-.mocha pre .hljs-type,
-.mocha pre .hljs-name,
-.mocha pre .hljs-strong {
-  font-weight: bold !important;
-}
-.mocha pre .hljs-literal,
-.mocha pre .hljs-number {
-  color: #fab387 !important;
-}
-.mocha pre .hljs-emphasis {
-  font-style: italic !important;
-}
-
-.macchiato code,
-.macchiato .hljs {
-  background: #1e2030;
-}
-.macchiato code .hljs-attr,
-.macchiato code .hljs-string {
-  color: #a6da95;
-}
-.macchiato code .hljs-tag {
-  color: #ed8796;
-}
-.macchiato code .hljs-name {
-  color: #f0c6c6;
-}
-.macchiato pre .hljs {
-  background: #1e2030 !important;
-}
-.macchiato pre .hljs-params {
-  color: #ed8796 !important;
-}
-.macchiato pre .hljs-built_in,
-.macchiato pre .hljs-selector-tag,
-.macchiato pre .hljs-section,
-.macchiato pre .hljs-link {
-  color: #7dc4e4 !important;
-}
-.macchiato pre .hljs-keyword {
-  color: #c6a0f6 !important;
-}
-.macchiato pre .hljs,
-.macchiato pre .hljs-subst {
-  color: #a5adcb !important;
-}
-.macchiato pre .hljs-title {
-  color: #8aadf4 !important;
-}
-.macchiato pre .hljs-attr,
-.macchiato pre .hljs-meta-keyword {
-  color: #a6da95 !important;
-}
-.macchiato pre .hljs-type {
-  color: #8aadf4 !important;
-}
-.macchiato pre .hljs-string {
-  color: #a6da95 !important;
-}
-.macchiato pre .hljs-tag {
-  color: #ed8796 !important;
-}
-.macchiato pre .hljs-meta,
-.macchiato pre .hljs-name,
-.macchiato pre .hljs-symbol,
-.macchiato pre .hljs-bullet,
-.macchiato pre .hljs-addition,
-.macchiato pre .hljs-variable,
-.macchiato pre .hljs-template-tag,
-.macchiato pre .hljs-template-variable {
-  color: #f0c6c6 !important;
-}
-.macchiato pre .hljs-addition {
-  background-color: #1e2030 !important;
-  color: #a6da95 !important;
-}
-.macchiato pre .hljs-deletion {
-  background-color: #1e2030 !important;
-  color: #ed8796 !important;
-}
-.macchiato pre .hljs-comment,
-.macchiato pre .hljs-quote {
-  color: #5b6078 !important;
-}
-.macchiato pre .hljs-keyword,
-.macchiato pre .hljs-selector-tag,
-.macchiato pre .hljs-literal,
-.macchiato pre .hljs-title,
-.macchiato pre .hljs-section,
-.macchiato pre .hljs-doctag,
-.macchiato pre .hljs-type,
-.macchiato pre .hljs-name,
-.macchiato pre .hljs-strong {
-  font-weight: bold !important;
-}
-.macchiato pre .hljs-literal,
-.macchiato pre .hljs-number {
-  color: #f5a97f !important;
-}
-.macchiato pre .hljs-emphasis {
-  font-style: italic !important;
-}
-
-.frappe code,
-.frappe .hljs {
-  background: #292c3c;
-}
-.frappe code .hljs-attr,
-.frappe code .hljs-string {
-  color: #a6d189;
-}
-.frappe code .hljs-tag {
-  color: #e78284;
-}
-.frappe code .hljs-name {
-  color: #eebebe;
-}
-.frappe pre .hljs {
-  background: #292c3c !important;
-}
-.frappe pre .hljs-params {
-  color: #e78284 !important;
-}
-.frappe pre .hljs-built_in,
-.frappe pre .hljs-selector-tag,
-.frappe pre .hljs-section,
-.frappe pre .hljs-link {
-  color: #85c1dc !important;
-}
-.frappe pre .hljs-keyword {
-  color: #ca9ee6 !important;
-}
-.frappe pre .hljs,
-.frappe pre .hljs-subst {
-  color: #a5adce !important;
-}
-.frappe pre .hljs-title {
-  color: #8caaee !important;
-}
-.frappe pre .hljs-attr,
-.frappe pre .hljs-meta-keyword {
-  color: #a6d189 !important;
-}
-.frappe pre .hljs-type {
-  color: #8caaee !important;
-}
-.frappe pre .hljs-string {
-  color: #a6d189 !important;
-}
-.frappe pre .hljs-tag {
-  color: #e78284 !important;
-}
-.frappe pre .hljs-meta,
-.frappe pre .hljs-name,
-.frappe pre .hljs-symbol,
-.frappe pre .hljs-bullet,
-.frappe pre .hljs-addition,
-.frappe pre .hljs-variable,
-.frappe pre .hljs-template-tag,
-.frappe pre .hljs-template-variable {
-  color: #eebebe !important;
-}
-.frappe pre .hljs-addition {
-  background-color: #292c3c !important;
-  color: #a6d189 !important;
-}
-.frappe pre .hljs-deletion {
-  background-color: #292c3c !important;
-  color: #e78284 !important;
-}
-.frappe pre .hljs-comment,
-.frappe pre .hljs-quote {
-  color: #626880 !important;
-}
-.frappe pre .hljs-keyword,
-.frappe pre .hljs-selector-tag,
-.frappe pre .hljs-literal,
-.frappe pre .hljs-title,
-.frappe pre .hljs-section,
-.frappe pre .hljs-doctag,
-.frappe pre .hljs-type,
-.frappe pre .hljs-name,
-.frappe pre .hljs-strong {
-  font-weight: bold !important;
-}
-.frappe pre .hljs-literal,
-.frappe pre .hljs-number {
-  color: #ef9f76 !important;
-}
-.frappe pre .hljs-emphasis {
-  font-style: italic !important;
-}
-
-.latte code,
-.latte .hljs {
-  background: #e6e9ef;
-}
-.latte code .hljs-attr,
-.latte code .hljs-string {
-  color: #40a02b;
-}
-.latte code .hljs-tag {
-  color: #d20f39;
-}
-.latte code .hljs-name {
-  color: #dd7878;
-}
-.latte pre .hljs {
-  background: #e6e9ef !important;
-}
-.latte pre .hljs-params {
-  color: #d20f39 !important;
-}
-.latte pre .hljs-built_in,
-.latte pre .hljs-selector-tag,
-.latte pre .hljs-section,
-.latte pre .hljs-link {
-  color: #209fb5 !important;
-}
-.latte pre .hljs-keyword {
-  color: #8839ef !important;
-}
-.latte pre .hljs,
-.latte pre .hljs-subst {
-  color: #6c6f85 !important;
-}
-.latte pre .hljs-title {
-  color: #1e66f5 !important;
-}
-.latte pre .hljs-attr,
-.latte pre .hljs-meta-keyword {
-  color: #40a02b !important;
-}
-.latte pre .hljs-type {
-  color: #1e66f5 !important;
-}
-.latte pre .hljs-string {
-  color: #40a02b !important;
-}
-.latte pre .hljs-tag {
-  color: #d20f39 !important;
-}
-.latte pre .hljs-meta,
-.latte pre .hljs-name,
-.latte pre .hljs-symbol,
-.latte pre .hljs-bullet,
-.latte pre .hljs-addition,
-.latte pre .hljs-variable,
-.latte pre .hljs-template-tag,
-.latte pre .hljs-template-variable {
-  color: #dd7878 !important;
-}
-.latte pre .hljs-addition {
-  background-color: #e6e9ef !important;
-  color: #40a02b !important;
-}
-.latte pre .hljs-deletion {
-  background-color: #e6e9ef !important;
-  color: #d20f39 !important;
-}
-.latte pre .hljs-comment,
-.latte pre .hljs-quote {
-  color: #acb0be !important;
-}
-.latte pre .hljs-keyword,
-.latte pre .hljs-selector-tag,
-.latte pre .hljs-literal,
-.latte pre .hljs-title,
-.latte pre .hljs-section,
-.latte pre .hljs-doctag,
-.latte pre .hljs-type,
-.latte pre .hljs-name,
-.latte pre .hljs-strong {
-  font-weight: bold !important;
-}
-.latte pre .hljs-literal,
-.latte pre .hljs-number {
-  color: #fe640b !important;
-}
-.latte pre .hljs-emphasis {
-  font-style: italic !important;
-}
diff --git a/docs/theme/catppuccin.css b/docs/theme/catppuccin.css
index f577fd8b4..9b53ac9f6 100644
--- a/docs/theme/catppuccin.css
+++ b/docs/theme/catppuccin.css
@@ -1,10 +1,670 @@
+.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: #94e2d5;
+}
+.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: #585b70;
+}
+.mocha .hljs-doctag {
+  color: #f38ba8;
+}
+.mocha .hljs-meta {
+  color: #fab387;
+}
+.mocha .hljs-section {
+  color: #89b4fa;
+}
+.mocha .hljs-tag {
+  color: #a6adc8;
+}
+.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 code {
+  color: #cdd6f4;
+  background: #181825;
+}
+.mocha blockquote blockquote {
+  border-top: 0.1em solid #585b70;
+  border-bottom: 0.1em solid #585b70;
+}
+.mocha hr {
+  color: #585b70;
+}
+.mocha del {
+  color: #9399b2;
+}
+.mocha .ace_gutter {
+  color: #7f849c;
+  background: #181825;
+}
+.mocha .ace_gutter-active-line.ace_gutter-cell {
+  color: #f5c2e7;
+  background: #181825;
+}
+
+.macchiato.hljs {
+  color: #cad3f5;
+  background: #24273a;
+}
+.macchiato .hljs-keyword {
+  color: #c6a0f6;
+}
+.macchiato .hljs-built_in {
+  color: #ed8796;
+}
+.macchiato .hljs-type {
+  color: #eed49f;
+}
+.macchiato .hljs-literal {
+  color: #f5a97f;
+}
+.macchiato .hljs-number {
+  color: #f5a97f;
+}
+.macchiato .hljs-operator {
+  color: #8bd5ca;
+}
+.macchiato .hljs-punctuation {
+  color: #b8c0e0;
+}
+.macchiato .hljs-property {
+  color: #8bd5ca;
+}
+.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-punctuation {
+  color: #b5bfe2;
+}
+.frappe .hljs-property {
+  color: #81c8be;
+}
+.frappe .hljs-regexp {
+  color: #f4b8e4;
+}
+.frappe .hljs-string {
+  color: #a6d189;
+}
+.frappe .hljs-char.escape_ {
+  color: #a6d189;
+}
+.frappe .hljs-subst {
+  color: #a5adce;
+}
+.frappe .hljs-symbol {
+  color: #eebebe;
+}
+.frappe .hljs-variable {
+  color: #ca9ee6;
+}
+.frappe .hljs-variable.language_ {
+  color: #ca9ee6;
+}
+.frappe .hljs-variable.constant_ {
+  color: #ef9f76;
+}
+.frappe .hljs-title {
+  color: #8caaee;
+}
+.frappe .hljs-title.class_ {
+  color: #e5c890;
+}
+.frappe .hljs-title.function_ {
+  color: #8caaee;
+}
+.frappe .hljs-params {
+  color: #c6d0f5;
+}
+.frappe .hljs-comment {
+  color: #626880;
+}
+.frappe .hljs-doctag {
+  color: #e78284;
+}
+.frappe .hljs-meta {
+  color: #ef9f76;
+}
+.frappe .hljs-section {
+  color: #8caaee;
+}
+.frappe .hljs-tag {
+  color: #a5adce;
+}
+.frappe .hljs-name {
+  color: #ca9ee6;
+}
+.frappe .hljs-attr {
+  color: #8caaee;
+}
+.frappe .hljs-attribute {
+  color: #a6d189;
+}
+.frappe .hljs-bullet {
+  color: #81c8be;
+}
+.frappe .hljs-code {
+  color: #a6d189;
+}
+.frappe .hljs-emphasis {
+  color: #e78284;
+  font-style: italic;
+}
+.frappe .hljs-strong {
+  color: #e78284;
+  font-weight: bold;
+}
+.frappe .hljs-formula {
+  color: #81c8be;
+}
+.frappe .hljs-link {
+  color: #85c1dc;
+  font-style: italic;
+}
+.frappe .hljs-quote {
+  color: #a6d189;
+  font-style: italic;
+}
+.frappe .hljs-selector-tag {
+  color: #e5c890;
+}
+.frappe .hljs-selector-id {
+  color: #8caaee;
+}
+.frappe .hljs-selector-class {
+  color: #81c8be;
+}
+.frappe .hljs-selector-attr {
+  color: #ca9ee6;
+}
+.frappe .hljs-selector-pseudo {
+  color: #81c8be;
+}
+.frappe .hljs-template-tag {
+  color: #eebebe;
+}
+.frappe .hljs-template-variable {
+  color: #eebebe;
+}
+.frappe .hljs-addition {
+  color: #a6d189;
+  background: rgba(166, 209, 137, 0.15);
+}
+.frappe .hljs-deletion {
+  color: #e78284;
+  background: rgba(231, 130, 132, 0.15);
+}
+.frappe code {
+  color: #c6d0f5;
+  background: #292c3c;
+}
+.frappe blockquote blockquote {
+  border-top: 0.1em solid #626880;
+  border-bottom: 0.1em solid #626880;
+}
+.frappe hr {
+  color: #626880;
+}
+.frappe del {
+  color: #949cbb;
+}
+.frappe .ace_gutter {
+  color: #838ba7;
+  background: #292c3c;
+}
+.frappe .ace_gutter-active-line.ace_gutter-cell {
+  color: #f4b8e4;
+  background: #292c3c;
+}
+
+.latte.hljs {
+  color: #4c4f69;
+  background: #eff1f5;
+}
+.latte .hljs-keyword {
+  color: #8839ef;
+}
+.latte .hljs-built_in {
+  color: #d20f39;
+}
+.latte .hljs-type {
+  color: #df8e1d;
+}
+.latte .hljs-literal {
+  color: #fe640b;
+}
+.latte .hljs-number {
+  color: #fe640b;
+}
+.latte .hljs-operator {
+  color: #179299;
+}
+.latte .hljs-punctuation {
+  color: #5c5f77;
+}
+.latte .hljs-property {
+  color: #179299;
+}
+.latte .hljs-regexp {
+  color: #ea76cb;
+}
+.latte .hljs-string {
+  color: #40a02b;
+}
+.latte .hljs-char.escape_ {
+  color: #40a02b;
+}
+.latte .hljs-subst {
+  color: #6c6f85;
+}
+.latte .hljs-symbol {
+  color: #dd7878;
+}
+.latte .hljs-variable {
+  color: #8839ef;
+}
+.latte .hljs-variable.language_ {
+  color: #8839ef;
+}
+.latte .hljs-variable.constant_ {
+  color: #fe640b;
+}
+.latte .hljs-title {
+  color: #1e66f5;
+}
+.latte .hljs-title.class_ {
+  color: #df8e1d;
+}
+.latte .hljs-title.function_ {
+  color: #1e66f5;
+}
+.latte .hljs-params {
+  color: #4c4f69;
+}
+.latte .hljs-comment {
+  color: #acb0be;
+}
+.latte .hljs-doctag {
+  color: #d20f39;
+}
+.latte .hljs-meta {
+  color: #fe640b;
+}
+.latte .hljs-section {
+  color: #1e66f5;
+}
+.latte .hljs-tag {
+  color: #6c6f85;
+}
+.latte .hljs-name {
+  color: #8839ef;
+}
+.latte .hljs-attr {
+  color: #1e66f5;
+}
+.latte .hljs-attribute {
+  color: #40a02b;
+}
+.latte .hljs-bullet {
+  color: #179299;
+}
+.latte .hljs-code {
+  color: #40a02b;
+}
+.latte .hljs-emphasis {
+  color: #d20f39;
+  font-style: italic;
+}
+.latte .hljs-strong {
+  color: #d20f39;
+  font-weight: bold;
+}
+.latte .hljs-formula {
+  color: #179299;
+}
+.latte .hljs-link {
+  color: #209fb5;
+  font-style: italic;
+}
+.latte .hljs-quote {
+  color: #40a02b;
+  font-style: italic;
+}
+.latte .hljs-selector-tag {
+  color: #df8e1d;
+}
+.latte .hljs-selector-id {
+  color: #1e66f5;
+}
+.latte .hljs-selector-class {
+  color: #179299;
+}
+.latte .hljs-selector-attr {
+  color: #8839ef;
+}
+.latte .hljs-selector-pseudo {
+  color: #179299;
+}
+.latte .hljs-template-tag {
+  color: #dd7878;
+}
+.latte .hljs-template-variable {
+  color: #dd7878;
+}
+.latte .hljs-addition {
+  color: #40a02b;
+  background: rgba(64, 160, 43, 0.15);
+}
+.latte .hljs-deletion {
+  color: #d20f39;
+  background: rgba(210, 15, 57, 0.15);
+}
+.latte code {
+  color: #4c4f69;
+  background: #e6e9ef;
+}
+.latte blockquote blockquote {
+  border-top: 0.1em solid #acb0be;
+  border-bottom: 0.1em solid #acb0be;
+}
+.latte hr {
+  color: #acb0be;
+}
+.latte del {
+  color: #7c7f93;
+}
+.latte .ace_gutter {
+  color: #8c8fa1;
+  background: #e6e9ef;
+}
+.latte .ace_gutter-active-line.ace_gutter-cell {
+  color: #ea76cb;
+  background: #e6e9ef;
+}
+
 .mocha {
   --bg: #1e1e2e;
   --fg: #cdd6f4;
   --sidebar-bg: #181825;
   --sidebar-fg: #cdd6f4;
   --sidebar-non-existant: #6c7086;
-  --sidebar-active: #f5e0dc;
+  --sidebar-active: #89b4fa;
   --sidebar-spacer: #6c7086;
   --scrollbar: #6c7086;
   --icons: #6c7086;
@@ -18,7 +678,7 @@
   --quote-border: #11111b;
   --table-border-color: #11111b;
   --table-header-bg: #181825;
-  --table-alternate-bg: #11111b;
+  --table-alternate-bg: #181825;
   --searchbar-border-color: #11111b;
   --searchbar-bg: #181825;
   --searchbar-fg: #cdd6f4;
@@ -35,7 +695,7 @@
   --sidebar-bg: #1e2030;
   --sidebar-fg: #cad3f5;
   --sidebar-non-existant: #6e738d;
-  --sidebar-active: #f4dbd6;
+  --sidebar-active: #8aadf4;
   --sidebar-spacer: #6e738d;
   --scrollbar: #6e738d;
   --icons: #6e738d;
@@ -49,7 +709,7 @@
   --quote-border: #181926;
   --table-border-color: #181926;
   --table-header-bg: #1e2030;
-  --table-alternate-bg: #181926;
+  --table-alternate-bg: #1e2030;
   --searchbar-border-color: #181926;
   --searchbar-bg: #1e2030;
   --searchbar-fg: #cad3f5;
@@ -66,7 +726,7 @@
   --sidebar-bg: #292c3c;
   --sidebar-fg: #c6d0f5;
   --sidebar-non-existant: #737994;
-  --sidebar-active: #f2d5cf;
+  --sidebar-active: #8caaee;
   --sidebar-spacer: #737994;
   --scrollbar: #737994;
   --icons: #737994;
@@ -80,7 +740,7 @@
   --quote-border: #232634;
   --table-border-color: #232634;
   --table-header-bg: #292c3c;
-  --table-alternate-bg: #232634;
+  --table-alternate-bg: #292c3c;
   --searchbar-border-color: #232634;
   --searchbar-bg: #292c3c;
   --searchbar-fg: #c6d0f5;
@@ -97,7 +757,7 @@
   --sidebar-bg: #e6e9ef;
   --sidebar-fg: #4c4f69;
   --sidebar-non-existant: #9ca0b0;
-  --sidebar-active: #dc8a78;
+  --sidebar-active: #1e66f5;
   --sidebar-spacer: #9ca0b0;
   --scrollbar: #9ca0b0;
   --icons: #9ca0b0;
@@ -111,7 +771,7 @@
   --quote-border: #dce0e8;
   --table-border-color: #dce0e8;
   --table-header-bg: #e6e9ef;
-  --table-alternate-bg: #dce0e8;
+  --table-alternate-bg: #e6e9ef;
   --searchbar-border-color: #dce0e8;
   --searchbar-bg: #e6e9ef;
   --searchbar-fg: #4c4f69;
diff --git a/docs/theme/index.hbs b/docs/theme/index.hbs
index 69ad4305b..bbf5d1156 100644
--- a/docs/theme/index.hbs
+++ b/docs/theme/index.hbs
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML>
-<html lang="{{ language }}" class="sidebar-visible no-js {{ default_theme }}">
+<html lang="{{ language }}" class="{{ default_theme }}" dir="{{ text_direction }}">
     <head>
         <!-- Book generated using mdBook -->
         <meta charset="UTF-8">
         <title>{{ title }}</title>
         {{#if is_print }}
-        <meta name="robots" content="noindex" />
+        <meta name="robots" content="noindex">
         {{/if}}
         {{#if base_url}}
         <base href="{{ base_url }}">
@@ -15,10 +15,9 @@
         <!-- Custom HTML head -->
         {{> head}}
 
-        <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
         <meta name="description" content="{{ description }}">
         <meta name="viewport" content="width=device-width, initial-scale=1">
-        <meta name="theme-color" content="#ffffff" />
+        <meta name="theme-color" content="#ffffff">
 
         {{#if favicon_svg}}
         <link rel="icon" href="{{ path_to_root }}favicon.svg">
@@ -51,18 +50,19 @@
 
         {{#if mathjax_support}}
         <!-- MathJax -->
-        <script async type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
+        <script async src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
         {{/if}}
     </head>
-    <body>
+    <body class="sidebar-visible no-js">
+    <div id="body-container">
         <!-- Provide site root to javascript -->
-        <script type="text/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>
 
         <!-- Work around some values being stored in localStorage wrapped in quotes -->
-        <script type="text/javascript">
+        <script>
             try {
                 var theme = localStorage.getItem('mdbook-theme');
                 var sidebar = localStorage.getItem('mdbook-sidebar');
@@ -78,27 +78,34 @@
         </script>
 
         <!-- Set the theme before any content is loaded, prevents flash -->
-        <script type="text/javascript">
+        <script>
             var theme;
             try { theme = localStorage.getItem('mdbook-theme'); } catch(e) { }
             if (theme === null || theme === undefined) { theme = default_theme; }
             var html = document.querySelector('html');
-            html.classList.remove('no-js')
             html.classList.remove('{{ default_theme }}')
             html.classList.add(theme);
-            html.classList.add('js');
+            var body = document.querySelector('body');
+            body.classList.remove('no-js')
+            body.classList.add('js');
         </script>
 
+        <input type="checkbox" id="sidebar-toggle-anchor" class="hidden">
+
         <!-- Hide / unhide sidebar before it is displayed -->
-        <script type="text/javascript">
-            var html = document.querySelector('html');
-            var sidebar = 'hidden';
+        <script>
+            var body = document.querySelector('body');
+            var sidebar = null;
+            var sidebar_toggle = document.getElementById("sidebar-toggle-anchor");
             if (document.body.clientWidth >= 1080) {
                 try { sidebar = localStorage.getItem('mdbook-sidebar'); } catch(e) { }
                 sidebar = sidebar || 'visible';
+            } else {
+                sidebar = 'hidden';
             }
-            html.classList.remove('sidebar-visible');
-            html.classList.add("sidebar-" + sidebar);
+            sidebar_toggle.checked = sidebar === 'visible';
+            body.classList.remove('sidebar-visible');
+            body.classList.add("sidebar-" + sidebar);
         </script>
 
         <nav id="sidebar" class="sidebar" aria-label="Table of contents">
@@ -108,29 +115,51 @@
             <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">
                 {{> header}}
                 <div id="menu-bar-hover-placeholder"></div>
-                <div id="menu-bar" class="menu-bar sticky bordered">
+                <div id="menu-bar" class="menu-bar sticky">
                     <div class="left-buttons">
-                        <button id="sidebar-toggle" class="icon-button" type="button" title="Toggle Table of Contents" aria-label="Toggle Table of Contents" aria-controls="sidebar">
+                        <label id="sidebar-toggle" class="icon-button" for="sidebar-toggle-anchor" title="Toggle Table of Contents" aria-label="Toggle Table of Contents" aria-controls="sidebar">
                             <i class="fa fa-bars"></i>
-                        </button>
+                        </label>
                         <button id="theme-toggle" class="icon-button" type="button" title="Change theme" aria-label="Change theme" aria-haspopup="true" aria-expanded="false" aria-controls="theme-list">
                             <i class="fa fa-paint-brush"></i>
                         </button>
                         <ul id="theme-list" class="theme-popup" aria-label="Themes" role="menu">
-                            <li role="none"><button role="menuitem" class="theme" id="light">{{ theme_option "Light" }}</button></li>
-                            <li role="none"><button role="menuitem" class="theme" id="rust">{{ theme_option "Rust" }}</button></li>
-                            <li role="none"><button role="menuitem" class="theme" id="coal">{{ theme_option "Coal" }}</button></li>
-                            <li role="none"><button role="menuitem" class="theme" id="navy">{{ theme_option "Navy" }}</button></li>
-                            <li role="none"><button role="menuitem" class="theme" id="ayu">{{ theme_option "Ayu" }}</button></li>
-                            <li role="none"><button role="menuitem" class="theme" id="latte">{{ theme_option "Latte" }}</button></li>
-                            <li role="none"><button role="menuitem" class="theme" id="frappe">{{ theme_option "Frappé" }}</button></li>
-                            <li role="none"><button role="menuitem" class="theme" id="macchiato">{{ theme_option "Macchiato" }}</button></li>
-                            <li role="none"><button role="menuitem" class="theme" id="mocha">{{ theme_option "Mocha" }}</button></li>
+                            <li role="none"><button role="menuitem" class="theme" id="light">Light</button></li>
+                            <li role="none"><button role="menuitem" class="theme" id="rust">Rust</button></li>
+                            <li role="none"><button role="menuitem" class="theme" id="coal">Coal</button></li>
+                            <li role="none"><button role="menuitem" class="theme" id="navy">Navy</button></li>
+                            <li role="none"><button role="menuitem" class="theme" id="ayu">Ayu</button></li>
+                            <li role="none"><button role="menuitem" class="theme" id="latte">Latte</button></li>
+                            <li role="none"><button role="menuitem" class="theme" id="frappe">Frappé</button></li>
+                            <li role="none"><button role="menuitem" class="theme" id="macchiato">Macchiato</button></li>
+                            <li role="none"><button role="menuitem" class="theme" id="mocha">Mocha</button></li>
                         </ul>
                         {{#if search_enabled}}
                         <button id="search-toggle" class="icon-button" type="button" title="Search. (Shortkey: s)" aria-label="Toggle Searchbar" aria-expanded="false" aria-keyshortcuts="S" aria-controls="searchbar">
@@ -175,7 +204,7 @@
                 {{/if}}
 
                 <!-- Apply ARIA attributes after the sidebar and the sidebar toggle button are added to the DOM -->
-                <script type="text/javascript">
+                <script>
                     document.getElementById('sidebar-toggle').setAttribute('aria-expanded', sidebar === 'visible');
                     document.getElementById('sidebar').setAttribute('aria-hidden', sidebar !== 'visible');
                     Array.from(document.querySelectorAll('#sidebar a')).forEach(function(link) {
@@ -197,7 +226,7 @@
                         {{/previous}}
 
                         {{#next}}
-                            <a rel="next" href="{{ path_to_root }}{{link}}" class="mobile-nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
+                            <a rel="next prefetch" href="{{ path_to_root }}{{link}}" class="mobile-nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
                                 <i class="fa fa-angle-right"></i>
                             </a>
                         {{/next}}
@@ -215,7 +244,7 @@
                 {{/previous}}
 
                 {{#next}}
-                    <a rel="next" href="{{ path_to_root }}{{link}}" class="nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
+                    <a rel="next prefetch" href="{{ path_to_root }}{{link}}" class="nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
                         <i class="fa fa-angle-right"></i>
                     </a>
                 {{/next}}
@@ -225,7 +254,7 @@
 
         {{#if live_reload_endpoint}}
         <!-- Livereload script (if served using the cli tool) -->
-        <script type="text/javascript">
+        <script>
             const wsProtocol = location.protocol === 'https:' ? 'wss:' : 'ws:';
             const wsAddress = wsProtocol + "//" + location.host + "/" + "{{{live_reload_endpoint}}}";
             const socket = new WebSocket(wsAddress);
@@ -244,7 +273,7 @@
 
         {{#if google_analytics}}
         <!-- Google Analytics Tag -->
-        <script type="text/javascript">
+        <script>
             var localAddrs = ["localhost", "127.0.0.1", ""];
 
             // make sure we don't activate google analytics if the developer is
@@ -262,43 +291,43 @@
         {{/if}}
 
         {{#if playground_line_numbers}}
-        <script type="text/javascript">
+        <script>
             window.playground_line_numbers = true;
         </script>
         {{/if}}
 
         {{#if playground_copyable}}
-        <script type="text/javascript">
+        <script>
             window.playground_copyable = true;
         </script>
         {{/if}}
 
         {{#if playground_js}}
-        <script src="{{ path_to_root }}ace.js" type="text/javascript" charset="utf-8"></script>
-        <script src="{{ path_to_root }}editor.js" type="text/javascript" charset="utf-8"></script>
-        <script src="{{ path_to_root }}mode-rust.js" type="text/javascript" charset="utf-8"></script>
-        <script src="{{ path_to_root }}theme-dawn.js" type="text/javascript" charset="utf-8"></script>
-        <script src="{{ path_to_root }}theme-tomorrow_night.js" type="text/javascript" charset="utf-8"></script>
+        <script src="{{ path_to_root }}ace.js"></script>
+        <script src="{{ path_to_root }}editor.js"></script>
+        <script src="{{ path_to_root }}mode-rust.js"></script>
+        <script src="{{ path_to_root }}theme-dawn.js"></script>
+        <script src="{{ path_to_root }}theme-tomorrow_night.js"></script>
         {{/if}}
 
         {{#if search_js}}
-        <script src="{{ path_to_root }}elasticlunr.min.js" type="text/javascript" charset="utf-8"></script>
-        <script src="{{ path_to_root }}mark.min.js" type="text/javascript" charset="utf-8"></script>
-        <script src="{{ path_to_root }}searcher.js" type="text/javascript" charset="utf-8"></script>
+        <script src="{{ path_to_root }}elasticlunr.min.js"></script>
+        <script src="{{ path_to_root }}mark.min.js"></script>
+        <script src="{{ path_to_root }}searcher.js"></script>
         {{/if}}
 
-        <script src="{{ path_to_root }}clipboard.min.js" type="text/javascript" charset="utf-8"></script>
-        <script src="{{ path_to_root }}highlight.js" type="text/javascript" charset="utf-8"></script>
-        <script src="{{ path_to_root }}book.js" type="text/javascript" charset="utf-8"></script>
+        <script src="{{ path_to_root }}clipboard.min.js"></script>
+        <script src="{{ path_to_root }}highlight.js"></script>
+        <script src="{{ path_to_root }}book.js"></script>
 
         <!-- Custom JS scripts -->
         {{#each additional_js}}
-        <script type="text/javascript" src="{{ ../path_to_root }}{{this}}"></script>
+        <script src="{{ ../path_to_root }}{{this}}"></script>
         {{/each}}
 
         {{#if is_print}}
         {{#if mathjax_support}}
-        <script type="text/javascript">
+        <script>
         window.addEventListener('load', function() {
             MathJax.Hub.Register.StartupHook('End', function() {
                 window.setTimeout(window.print, 100);
@@ -306,7 +335,7 @@
         });
         </script>
         {{else}}
-        <script type="text/javascript">
+        <script>
         window.addEventListener('load', function() {
             window.setTimeout(window.print, 100);
         });
@@ -314,5 +343,6 @@
         {{/if}}
         {{/if}}
 
+    </div>
     </body>
-</html>
+</html>
\ No newline at end of file