From be893ef08c4bad048a88a202d16881ee37fc5514 Mon Sep 17 00:00:00 2001
From: Aaron Carlisle <carlisle.b3d@gmail.com>
Date: Thu, 14 Mar 2024 21:57:44 -0400
Subject: [PATCH 01/30] Switch  the manual theme to Furo

Since moving from the Wiki we have used the `sphinx_rtd_theme` which has worked well but has become a little dated and has had slow development. This changes to use "Furo" instead.

Furo is a lightweight theme that is responsive and has native dark mode support.

Dark mode is one of the major enhancements but this change also brings:

- Content is slightly larger making text and images easier to view
- Site navigation and page navigation is split into two navigation trees. The site navigation is on the left and page on the right if the page has multiple headings.
- Return to top button
- Content is centered on the screen which helps with wide monitors
- No more breadcrumbs

So far the caveat that I have noticed with this is slower compile times and larger pages, this is due to the better sidebar navigation.

This change also brings a lot of simplifications to customizations that we made to the `sphinx_rtd_theme`. There is still likely room for improvement in the future.
---
 build_files/templates/base.html               |  11 +
 .../templates/components/analytics.html       |  13 +
 .../footer_contribute.html}                   |  19 +-
 .../{layout.html => components/linktags.html} |   6 +-
 build_files/templates/page.html               |   6 +
 .../variant-selector.html}                    |  18 +-
 build_files/theme/css/theme_overrides.css     | 376 +++---------------
 build_files/theme/css/version_switch.css      |  66 ++-
 manual/conf.py                                |  35 +-
 requirements.txt                              |   2 +-
 10 files changed, 148 insertions(+), 404 deletions(-)
 create mode 100644 build_files/templates/base.html
 create mode 100644 build_files/templates/components/analytics.html
 rename build_files/templates/{footer.html => components/footer_contribute.html} (79%)
 rename build_files/templates/{layout.html => components/linktags.html} (94%)
 create mode 100644 build_files/templates/page.html
 rename build_files/templates/{versions.html => sidebar/variant-selector.html} (71%)

diff --git a/build_files/templates/base.html b/build_files/templates/base.html
new file mode 100644
index 000000000..f959cab35
--- /dev/null
+++ b/build_files/templates/base.html
@@ -0,0 +1,11 @@
+{%- extends "!base.html" -%}
+
+{%- block linktags -%}
+{{ super() }}
+{%- include "components/linktags.html" -%}
+{%- endblock -%}
+
+{%- block theme_scripts -%}
+{{ super() }}
+{%- include "components/analytics.html" -%}
+{%- endblock -%}
\ No newline at end of file
diff --git a/build_files/templates/components/analytics.html b/build_files/templates/components/analytics.html
new file mode 100644
index 000000000..804052199
--- /dev/null
+++ b/build_files/templates/components/analytics.html
@@ -0,0 +1,13 @@
+{%- if analytics_id %}
+<!-- Theme Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id={{ theme_analytics_id }}"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag() { dataLayer.push(arguments); }
+  gtag('js', new Date());
+
+  gtag('config', '{{ analytics_id }}', {
+    'anonymize_ip': 'false',
+  });
+</script>
+{%- endif %}
\ No newline at end of file
diff --git a/build_files/templates/footer.html b/build_files/templates/components/footer_contribute.html
similarity index 79%
rename from build_files/templates/footer.html
rename to build_files/templates/components/footer_contribute.html
index 71f07a1e8..530fdcfaf 100644
--- a/build_files/templates/footer.html
+++ b/build_files/templates/components/footer_contribute.html
@@ -1,21 +1,19 @@
-{%- extends "!footer.html" %}
-{%- block extrafooter %}
 {%- if not pagename in ("search", "404", "genindex", "advanced/command_line/arguments") and hasdoc(pagename) %}
 <div class="footer-contribute">
   <ul>
     <li>{# Add the `display=source` because GITEA's rendering misses Sphinx's features and shows warnings. #}
       <a href="https://projects.blender.org/blender/blender-manual/{#
-              #}src/branch/main/manual/{{ pagename }}{{ page_source_suffix }}?display=source"
-         class="fa fa-edit"> {{ _('View Source') }}</a>
+              #}src/branch/main/manual/{{ pagename }}{{ page_source_suffix }}?display=source" class="fa fa-edit"> {{
+        _('View Source') }}</a>
     </li>
     <li>
       <a href="https://translate.blender.org/zen/blender-manual/{#
-              #}manual/{{ language }}/?q=location%3Amanual%2F{{ pagename }}"
-         class="fa fa-edit"> {{ _('View Translation') }}</a>
+              #}manual/{{ language }}/?q=location%3Amanual%2F{{ pagename }}" class="fa fa-edit"> {{ _('View
+        Translation') }}</a>
     </li>{#
     <li>
       <a href="https://projects.blender.org/blender/blender-manual/src/branch/main/manual/{{ pagename }}{{ page_source_suffix }}"
-         class="fa fa-edit"> {{ _('Edit Page') }}</a>
+        class="fa fa-edit"> {{ _('Edit Page') }}</a>
     </li>#}
     <li>
       <a href="https://projects.blender.org/blender/documentation/issues/new?{#
@@ -27,10 +25,9 @@
               #}Permanent+Link%5D%28https%3A%2F%2Fdocs.blender.org%2F{#
               #}manual%2F{{ language }}%2F{{ version }}%2F{{ pagename }}{{ file_suffix }}%29%0D%0A%0D%0A%2A%2A{#
               #}Short+description+of+error%2A%2A%0D%0A%5B{#
-              #}Please+fill+out+a+short+description+of+the+error+here%5D%0D%0A"
-         class="fa fa-bug"> {{ _('Report issue on this page') }}</a>
+              #}Please+fill+out+a+short+description+of+the+error+here%5D%0D%0A" class="fa fa-bug"> {{ _('Report issue
+        on this page') }}</a>
     </li>
   </ul>
 </div>
-{%- endif %}
-{% endblock %}
+{%- endif %}
\ No newline at end of file
diff --git a/build_files/templates/layout.html b/build_files/templates/components/linktags.html
similarity index 94%
rename from build_files/templates/layout.html
rename to build_files/templates/components/linktags.html
index 1d7fa8ba1..747a8bf22 100644
--- a/build_files/templates/layout.html
+++ b/build_files/templates/components/linktags.html
@@ -1,5 +1,3 @@
-{%- extends "!layout.html" %}
-{%- block linktags %}
 <link rel="alternate" hreflang="en" href="https://docs.blender.org/manual/en/latest/" />
 <link rel="alternate" hreflang="ar" href="https://docs.blender.org/manual/ar/latest/" />
 <link rel="alternate" hreflang="de" href="https://docs.blender.org/manual/de/latest/" />
@@ -20,6 +18,4 @@
 <link rel="alternate" hreflang="vi" href="https://docs.blender.org/manual/vi/latest/" />
 <link rel="alternate" hreflang="zh-Hans" href="https://docs.blender.org/manual/zh-hans/latest/" />
 <link rel="alternate" hreflang="zh-Hant" href="https://docs.blender.org/manual/zh-hant/latest/" />
-<link rel="alternate" hreflang="x-default" href="https://docs.blender.org/manual/en/latest/" />
-{{ super() }}
-{%- endblock %}
+<link rel="alternate" hreflang="x-default" href="https://docs.blender.org/manual/en/latest/" />
\ No newline at end of file
diff --git a/build_files/templates/page.html b/build_files/templates/page.html
new file mode 100644
index 000000000..f220bfeee
--- /dev/null
+++ b/build_files/templates/page.html
@@ -0,0 +1,6 @@
+{%- extends "!page.html" -%}
+
+{%- block footer -%}
+{{ super() }}
+{%- include "components/footer_contribute.html" -%}
+{%- endblock footer -%}
\ No newline at end of file
diff --git a/build_files/templates/versions.html b/build_files/templates/sidebar/variant-selector.html
similarity index 71%
rename from build_files/templates/versions.html
rename to build_files/templates/sidebar/variant-selector.html
index ec4e3ea94..9bf23d3b6 100644
--- a/build_files/templates/versions.html
+++ b/build_files/templates/sidebar/variant-selector.html
@@ -2,28 +2,24 @@
   <ul id="versionwrap" role="presentation">
     <li role="presentation">
       <span id="version-popover" class="version-btn" tabindex="0" role="button" aria-label="versions selector"
-            aria-haspopup="true" aria-controls="version-vsnlist" aria-disabled="true">
+        aria-haspopup="true" aria-controls="version-vsnlist" aria-disabled="true">
         {{ release }}
       </span>
       <div class="version-dialog" aria-hidden="true">
-        <div class="version-arrow" aria-hidden="true"></div>
         <div class="version-title">Versions</div>
-        <ul id="version-vsnlist" class="version-list" role="menu" aria-labelledby="version-popover"
-                                      aria-hidden="true">
+        <ul id="version-vsnlist" class="version-list" role="menu" aria-labelledby="version-popover" aria-hidden="true">
           <li role="presentation">Loading...</li>
         </ul>
       </div>
     </li>
     <li role="presentation">
       <span id="lang-popover" class="version-btn" tabindex="0" role="button" aria-label="language selector"
-            aria-haspopup="true" aria-controls="version-langlist">
+        aria-haspopup="true" aria-controls="version-langlist">
         {% if language is not none %} {{ language }} {% else %} en {% endif %}
       </span>
       <div class="version-dialog" aria-hidden="true">
-        <div class="version-arrow" aria-hidden="true"></div>
         <div class="version-title">Languages</div>
-        <ul id="version-langlist" class="version-list" role="menu" aria-labelledby="lang-popover"
-                                       aria-hidden="true">
+        <ul id="version-langlist" class="version-list" role="menu" aria-labelledby="lang-popover" aria-hidden="true">
           <li role="presentation">Loading...</li>
         </ul>
       </div>
@@ -37,9 +33,9 @@
     <div class="admonition warning">
       <p class="first admonition-title">Note</p>
       <p class="last">
-      You are not using the most up to date version of the documentation.
-      <a href="#"></a> is the newest version.
+        You are not using the most up to date version of the documentation.
+        <a href="#"></a> is the newest version.
       </p>
     </div>
   </template>
-</div>
+</div>
\ No newline at end of file
diff --git a/build_files/theme/css/theme_overrides.css b/build_files/theme/css/theme_overrides.css
index 563732e01..8fa08c2e3 100644
--- a/build_files/theme/css/theme_overrides.css
+++ b/build_files/theme/css/theme_overrides.css
@@ -6,108 +6,38 @@
  *		https://www.sphinx-doc.org/en/master/extdev/appapi.html#sphinx.application.Sphinx.add_css_file
  */
 
-h5 {
-	margin-bottom: 5px
+/* Slightly decrease text to make the text fit on one line */
+.sidebar-brand-text {
+	font-size: 1.4rem;
 }
 
-/* Sidebar menu links. */
-.wy-menu-vertical li.toctree-l2.current li.toctree-l3>a:hover {
-	background: #c0c0c0
+/* Add more visual weight to defintion terms */
+dl dt {
+	font-weight: bold !important
 }
 
-.wy-menu-vertical li.toctree-l3.current li.toctree-l4>a:hover {
-	background: #b5b5b5
-}
+/* Fixes to field list, see #104636 */
+dl.field-list {
+	display: grid;
+	grid-template-columns: fit-content(24px) auto !important;
 
-.wy-menu-vertical li.toctree-l4 {
-	font-size: 1em
-}
-
-.wy-menu-vertical li.current a {
-	border: 0
-}
-
-.wy-side-nav-search>a:hover {
-	background: none;
-	opacity: 0.9
-}
-
-.wy-side-nav-search>a.icon::before {
-	content: none
-}
-
-.wy-menu-vertical p.caption {
-	color: #e6e6e6;
-}
-
-/* Ensure background of input fields is light color even when a local theme wants it to be dark. */
-input[type="text"],
-input[type="search"],
-input[type="password"],
-input[type="email"],
-input[type="url"],
-input[type="date"],
-input[type="month"],
-input[type="week"],
-input[type="time"],
-input[type="datetime"],
-input[type="datetime-local"],
-input[type="number"],
-input[type="tel"],
-input[type="color"] {
-	background-color: #FCFCFC;
+	p {
+		margin-bottom: 0;
+	}
 }
 
 /* Boxed paragraphs. */
-.rst-content .refbox .admonition-title {
-	background-color: #bbb
+.admonition.refbox {
+	border-color: rgb(50, 50, 50);
 }
 
-.rst-content .refbox {
-	background-color: #e3e3e3
+.admonition.refbox>.admonition-title {
+	background-color: rgba(50, 50, 50, 0.1);
+	border-color: rgb(50, 50, 50);
 }
 
-.rst-content .seealso .admonition-title {
-	background-color: #7a87e6
-}
-
-.rst-content .seealso {
-	background-color: #e7ebfa
-}
-
-.rst-content .important .admonition-title {
-	background-color: #ddca3b
-}
-
-.rst-content .important {
-	background-color: #f6f3a5
-}
-
-/* refbox =, seealso ( > ), note ( i ), tip i , hint (+), warn / ! \ */
-.refbox .admonition-title::before {
-	content: "\f00b"
-}
-
-.seealso .admonition-title::before {
-	content: "\f138"
-}
-
-.note .admonition-title::before {
-	content: "\f05a"
-}
-
-.tip .admonition-title::before {
-	content: "\f129";
-	width: 0.75em;
-	text-align: center
-}
-
-.hint .admonition-title::before {
-	content: "\f055"
-}
-
-.warning .admonition-title::before {
-	content: "\f071"
+.admonition.refbox>.admonition-title::before {
+	background-color: rgb(50, 50, 50);
 }
 
 /* 'refbox' field. */
@@ -120,27 +50,8 @@ input[type="color"] {
 	font-weight: normal
 }
 
-/* Ugly 'red' literals. */
-.rst-content tt.literal,
-.rst-content tt.literal,
-.rst-content code.literal {
-	color: #404040;
-	border-radius: .4em;
-}
 
-/* Literal blocks that use too much padding, make them look like regular literals. */
-.rst-content pre.literal-block {
-	font-size: 75%;
-	margin: 0;
-	padding: 2px 4px;
-	color: #404040;
-	background: #ffffff;
-	white-space: normal;
-	display: inline;
-	border-radius: .4em;
-}
-
-/* Fix definisions with different ids. */
+/* Fix definitions with different ids. */
 .rst-content dl.simple {
 	margin-bottom: 0px;
 }
@@ -162,113 +73,35 @@ input[type="color"] {
 	padding-top: 12px;
 }
 
-/* Without this, paragraphs in bullet points within definition lists have too much vertical padding. */
-.rst-content li>p {
-	margin-bottom: 0px !important;
-}
-
 /* TABLE & FIGURE */
 
-/* captions text style */
-.rst-content .figure .caption,
-.rst-content figure figcaption>p,
-.rst-content table.docutils caption,
-.rst-content table.field-list caption {
-	font: italic 90%/18px Lato, proxima-nova, 'Helvetica Neue', Arial, sans-serif;
-	color: #808080;
-}
-
-/* Captions top padding. */
-.rst-content .figure .caption,
-.rst-content figure figcaption {
-	margin-top: 4px;
-}
-
-.rst-content table.docutils caption {
-	padding: 0.5em;
-}
-
-/* Text word wrap. */
-.wy-table-responsive table td,
-.wy-table-responsive table th {
-	white-space: normal;
-}
-
 /* Cell's vertical align. */
 /* use "valign" class for middle align. */
-.rst-content table.docutils:not(.valign) td {
+table.docutils:not(.valign) td {
 	vertical-align: baseline;
 }
 
-/* Field list align. */
-.rst-content table.field-list td {
-	padding-top: 8px;
-}
-
-/* Table header cells border color. */
-.rst-content table.docutils th {
-	border-color: #e1e4e5;
-}
-
-/* Figure in table margin. */
-.rst-content td div.figure,
-.rst-content td figure {
-	margin-top: 4px;
-	margin-bottom: 0;
-}
-
-/* Figure legend. */
-.legend {
-	font-size: 90%;
-	color: #484848;
-	margin-top: -20px;
-}
-
-.rst-content dl .legend {
-	margin-top: -10px;
-}
-
-@media screen and (max-width: 768px) {
-
-	.wy-table-responsive table:not(.footnote) {
-		min-width: 520px;
-	}
-
-	.rst-content table.docutils caption {
-		text-align: left;
-	}
-
-	img {
-		width: auto;
-	}
-
-}
-
 /* End TABLE & FIGURE. */
 
-/* Video center. */
-iframe {
-	display: block;
-	margin: 0 auto 24px auto;
-	border: 0;
-	max-width: 100%;
-}
-
-/* Copyright font scale down. */
-footer p {
-	font-size: smaller
-}
-
 .footer-contribute {
 	display: block;
-	font-size: smaller;
-	margin-top: -12px
+	font-size: var(--font-size--small);
+}
+
+.bottom-of-page {
+	padding-bottom: 0;
+}
+
+.footer-contribute ul {
+	margin: 0;
+	padding: 0;
+	padding-bottom: 1rem
 }
 
 .footer-contribute li {
 	display: inline;
 	list-style-type: none;
-	padding-right: 20px;
+	padding-right: 1.5rem;
 }
 
 /* Quotes for Fig. "link". */
@@ -280,17 +113,16 @@ a[href^="#fig-"]::after {
 	content: "\201d";
 }
 
-/* Intermediate headline. */
-.rubric {
-	font-family: "Roboto Slab", "ff-tisa-web-pro", "Georgia", Arial, sans-serif
-}
-
 /* ".. container::" lead, block text float around image. */
 .lead {
 	clear: both;
 	width: 100%;
 }
 
+a {
+	text-decoration: none;
+}
+
 /* Mark external links. */
 a.external {
 	color: #656AE0;
@@ -303,33 +135,11 @@ a.external {
 	color: #2980B9;
 }
 
-/* Draws a box around menuselection role. */
-.menuselection {
-	font-family: "Lato", "proxima-nova", "Helvetica Neue", Arial, sans-serif;
-	font-size: 90%;
-	font-weight: normal;
-	background-color: rgba(255, 255, 255, 0.65);
-	border: solid #E1E4E5 1px;
-	padding: 2px 5px;
-	border-radius: .4em;
-}
-
-@media screen and (max-width: 420px) {
-	.menuselection {
-		white-space: normal
-	}
-}
-
 .caption .menuselection {
 	background-color: transparent;
 	border: none;
 }
 
-/* Remove indent on line break. */
-.rst-content .line-block {
-	margin-left: 0px
-}
-
 /* Applied on main index:sections. */
 
 .global-index-toc {
@@ -339,7 +149,7 @@ a.external {
 /* Start section cards. */
 .toc-cards {
 	display: grid;
-	grid-template-columns: repeat(auto-fit, minmax(225px, 1fr));
+	grid-template-columns: repeat(auto-fit, minmax(350px, 1fr));
 	grid-gap: 20px;
 	list-style-type: none;
 	margin-bottom: 24px;
@@ -379,20 +189,19 @@ a.external {
 }
 
 .card dl dt {
-	padding: 18px 15px 0px !important
+	padding: 0px 15px 0px !important
 }
 
 .card dl dd {
 	padding: 0px 15px 5px 15px;
 	font-style: normal;
 	margin: 0px;
-	color: #808080;
+	color: var(--color-foreground-secondary);
 	font-size: 90%;
 }
 
 .card {
-	box-shadow: rgba(0, 0, 0, 0.05) 0px 1px 4px 0px,
-		rgba(211, 216, 223, 0.33) 0px 15px 20px -1px;
+	box-shadow: 0 .2rem .5rem rgba(0, 0, 0, .05), 0 0 .0625rem rgba(0, 0, 0, .1);
 }
 
 #getting-started .card {
@@ -402,107 +211,22 @@ a.external {
 /* End section cards. */
 
 /* Start custom toctree. */
-.toctree-wrapper .toctree-l1>a {
-	margin-bottom: 0.15em
-}
-
 /* Indent all lines following the first. */
 .toctree-wrapper * a {
 	display: block;
-	width: 90%;
-	text-indent: -1em;
-	margin-left: 1em;
-	/*invert indent*/
 	padding-top: 0.25em;
-	line-height: 1.25em;
+}
+
+.toctree-wrapper ul {
+	width: 90%;
+	list-style: none;
+	padding-left: 0;
 }
 
 /* Underline provided by nested ul (not li). */
 .toctree-wrapper * ul {
+	border-top: solid var(--color-background-border) 2px;
 	padding-left: 2em;
-	border-top: solid #ececec 1px;
 }
 
-.toctree-wrapper>ul {
-	margin-left: 1em
-}
-
-.rst-content .toctree-wrapper ul li ul {
-	margin-bottom: 0.75em;
-	padding-top: 0.5em;
-}
-
-.rst-content .toctree-wrapper ul li a:hover {
-	color: #25afef
-}
-
-.rst-content .toctree-wrapper ul li a:visited:hover {
-	color: #C961DA
-}
-
-.toctree-wrapper .toctree-l1>a {
-	font-size: 104%
-}
-
-.toctree-wrapper .toctree-l2>a {
-	font-size: 102%
-}
-
-.toctree-wrapper .toctree-l3>a {
-	font-size: 100%
-}
-
-.toctree-wrapper .toctree-l1>ul {
-	border-color: #bfbfbf
-}
-
-.toctree-wrapper .toctree-l2>ul {
-	border-color: #e1e0e0
-}
-
-.toctree-wrapper .toctree-l3>ul {
-	border-color: #ececec
-}
-
-/* Remove list styling, css rule hierarchy. */
-.rst-content .toctree-wrapper ul li,
-.rst-content .toctree-wrapper ul li li,
-.rst-content .toctree-wrapper ul li li li {
-	list-style-type: none;
-	margin-left: 0px;
-}
-
-/* End custom toctree. */
-
-/* Start genindex consistency. */
-.genindextable * strong {
-	font-weight: normal
-}
-
-.genindex-jumpbox {
-	margin-bottom: 1.245em
-}
-
-.indextable {
-	margin-bottom: 1.245em
-}
-
-/* End genindex consistency. */
-
-/* Correctly display keyboard shortcuts inside definition lists (theme.css explicitly excludes this case for some reason) */
-dt>kbd {
-	font-weight: normal;
-	font-size: 80%;
-	background-color: #fff;
-	border: 1px solid #a6a6a6;
-	border-radius: 4px;
-	box-shadow: 0 2px grey;
-	padding: 2.4px 6px;
-	margin: auto 0;
-}
-
-/* Fixes to field list, see #104636 */
-
-.field-list {
-	grid-template-columns: fit-content(24px) auto !important;
-}
\ No newline at end of file
+/* End custom toctree. */
\ No newline at end of file
diff --git a/build_files/theme/css/version_switch.css b/build_files/theme/css/version_switch.css
index 28a73440c..b5fa108d7 100644
--- a/build_files/theme/css/version_switch.css
+++ b/build_files/theme/css/version_switch.css
@@ -14,36 +14,38 @@
 }
 
 #versionwrap {
+	margin: 0;
 	display: flex;
 	padding-top: 2px;
-	font-size: 90%;
+	padding-left: 0;
+	font-size: var(--sidebar-item-font-size);
 	justify-content: center;
 	flex-wrap: wrap;
 }
 
+#versionwrap>ul {
+	list-style: none;
+}
+
+#versionwrap>li {
+	display: flex;
+	width: 50%;
+}
+
+
 .version-btn {
 	display: inline-block;
-	background-color: #272525;
-	width: 140px;
+	background-color: var(--color-sidebar-background);
+	width: 100%;
 	text-align: center;
 	padding: 3px 10px;
 	margin: 0px 5px 4px;
 	vertical-align: middle;
-	color: #27AE60;
-	border: solid 1px #444444;
+	color: var(--color-link);
+	border: solid 1px var(--color-sidebar-background-border);
 	border-radius: 3px;
 	cursor: pointer;
 	z-index: 400;
-	transition: border-color 0.4s;
-}
-
-.version-btn::after {
-	content: "\f0d8";
-	display: inline;
-	font: normal normal normal 16px/1 FontAwesome;
-	color: #8d8c8c;
-	vertical-align: top;
-	padding-left: 0.5em;
 }
 
 .version-btn-open::after {
@@ -57,7 +59,7 @@
 
 .version-btn-open {
 	color: gray;
-	border: solid 1px gray;
+	border: solid 1px var(--color-sidebar-background-border);
 }
 
 .version-btn.wait {
@@ -73,7 +75,7 @@
 	display: none;
 	position: absolute;
 	bottom: 28px;
-	width: 140px;
+	width: 50%;
 	margin: 0 5px;
 	padding-bottom: 4px;
 	background-color: #0003;
@@ -81,6 +83,7 @@
 	box-shadow: 0 0 6px #000C;
 	z-index: 999;
 	max-height: calc(100vh - 30px);
+	overflow-x: clip;
 	overflow-y: auto;
 	cursor: default;
 }
@@ -90,15 +93,17 @@
 	color: black;
 	text-align: center;
 	font-size: 102%;
-	background-color: #27ae60;
-	border-bottom: solid 1.5px #444;
+	background-color: var(--color-brand-primary);
+	border-bottom: solid 1.5px var(--color-sidebar-background-border);
 }
 
 .version-list {
+	padding-left: 0;
+	margin-top: 0;
 	margin-bottom: 4px;
 	text-align: center;
 	background-color: #000C;
-	border: solid 1px gray;
+	border: solid 1px var(--color-sidebar-background-border);
 	border-radius: 0px 0px 3px 3px;
 }
 
@@ -112,12 +117,12 @@
 	width: 100%;
 	margin: 0;
 	padding: 4px 0px;
-	color: #404040;
+	color: var(--color-sidebar-link-text);
 }
 
 .version-list li {
-	background-color: #ede9e9;
-	color: #404040;
+	background-color: var(--color-sidebar-background);
+	color: var(--color-sidebar-link-text);
 	padding: 1px;
 }
 
@@ -134,17 +139,4 @@
 .version-list li.selected span {
 	cursor: default;
 	outline-color: red;
-}
-
-.version-arrow {
-	position: absolute;
-	width: 8px;
-	height: 8px;
-	left: 50%;
-	bottom: 4px;
-	margin-left: -4px;
-	transform: rotate(225deg);
-	background: #ede9e9;
-	border: 1px solid gray;
-	border-width: 1px 0 0 1px;
-}
+}
\ No newline at end of file
diff --git a/manual/conf.py b/manual/conf.py
index 8a98da452..e2eb64ef0 100644
--- a/manual/conf.py
+++ b/manual/conf.py
@@ -118,11 +118,11 @@ gettext_allow_fuzzy_translations = False
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = "default"
+html_theme = "basic"
 try:
-    import sphinx_rtd_theme
-    html_theme = "sphinx_rtd_theme"
-    del sphinx_rtd_theme
+    import furo
+    html_theme = "furo"
+    del furo
 except ModuleNotFoundError:
     pass
 
@@ -135,21 +135,30 @@ html_theme_options = {}
 # the configuration directory.
 html_theme_path = []
 
-if html_theme == "sphinx_rtd_theme":
+if html_theme == "furo":
     html_theme_options = {
-        "analytics_id": "UA-1418081-1",
-        # included in the title
-        "display_version": False,
-        "collapse_navigation": True,
-        "navigation_depth": -1,
+        "source_edit_link": "https://projects.blender.org/blender/blender-manual/src/branch/main/manual/{filename}",
     }
 
-    extensions.append('sphinx_rtd_theme')
+html_sidebars = {
+    "**": [
+        "sidebar/brand.html",
+        "sidebar/search.html",
+        "sidebar/scroll-start.html",
+        "sidebar/navigation.html",
+        "sidebar/scroll-end.html",
+        "sidebar/variant-selector.html",
+    ]
+}
+
+html_context = {
+    "analytics_id": "UA-1418081-1",
+}
 
 # The "title" for HTML documentation generated with Sphinx's own templates.
 # This is appended to the <title> tag of individual pages, and
 # used in the navigation bar as the "topmost" element.
-html_title = "Blender Manual"
+html_title = 'Blender %s Manual' % blender_version
 
 # The base URL which points to the root of the HTML documentation.
 # It is used to indicate the location of document using
@@ -168,7 +177,7 @@ html_logo = "../build_files/theme/blender-logo.svg"
 # the docs, or URL that points an image file for the favicon.
 html_favicon = "../build_files/theme/favicon.ico"
 
-if html_theme == "sphinx_rtd_theme":
+if html_theme == "furo":
     html_css_files = ["css/theme_overrides.css",
                       "css/version_switch.css"]
     html_js_files = ["js/version_switch.js"]
diff --git a/requirements.txt b/requirements.txt
index 645e5e388..23355a47d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,7 +13,7 @@ sphinx-intl==2.1.0
 
 # Only needed to match the theme used for the official documentation.
 # Without this theme, the default theme will be used.
-sphinx_rtd_theme==2.0.0
+furo==2024.1.29
 
 # Only for convenience, allows live updating while editing RST files.
 # Access by running:
-- 
2.30.2


From 8f5801c08b50629d96aa853d39abdaa2b397b664 Mon Sep 17 00:00:00 2001
From: Aaron Carlisle <carlisle.b3d@gmail.com>
Date: Sun, 17 Mar 2024 12:36:13 -0400
Subject: [PATCH 02/30] Remove jquery extension

---
 manual/conf.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/manual/conf.py b/manual/conf.py
index e2eb64ef0..8b2a75ea6 100644
--- a/manual/conf.py
+++ b/manual/conf.py
@@ -54,7 +54,6 @@ extensions = [
     'sphinx.ext.intersphinx',
     'sphinx.ext.mathjax',
     'sphinx.ext.todo',
-    'sphinxcontrib.jquery',
 ]
 
 # Is there a better way to check for PDF building?
-- 
2.30.2


From a2cc5f6f0317c3a321447a2d0e6624260f5c1cc0 Mon Sep 17 00:00:00 2001
From: Aaron Carlisle <carlisle.b3d@gmail.com>
Date: Sun, 17 Mar 2024 12:37:07 -0400
Subject: [PATCH 03/30] Let the theme choose the 'pygments_style'

---
 manual/conf.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/manual/conf.py b/manual/conf.py
index 8b2a75ea6..d3c90d421 100644
--- a/manual/conf.py
+++ b/manual/conf.py
@@ -94,9 +94,6 @@ numfig = False
 # if set to 0, figures, tables and code-blocks are continuously numbered starting at 1.
 numfig_secnum_depth = 0
 
-# The style name to use for Pygments highlighting of source code.
-pygments_style = 'default'
-
 
 # -- Options for Internationalization ----------------------------------------
 
-- 
2.30.2


From 6bfeb4c029fc4836120440ccf8466f9481f4a8fd Mon Sep 17 00:00:00 2001
From: Aaron Carlisle <carlisle.b3d@gmail.com>
Date: Sun, 17 Mar 2024 12:42:05 -0400
Subject: [PATCH 04/30] Cleanup: Remove css fixes from old theme

---
 build_files/theme/css/theme_overrides.css | 25 +----------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/build_files/theme/css/theme_overrides.css b/build_files/theme/css/theme_overrides.css
index 8fa08c2e3..fd26ae0ba 100644
--- a/build_files/theme/css/theme_overrides.css
+++ b/build_files/theme/css/theme_overrides.css
@@ -11,7 +11,7 @@
 	font-size: 1.4rem;
 }
 
-/* Add more visual weight to defintion terms */
+/* Add more visual weight to definition terms */
 dl dt {
 	font-weight: bold !important
 }
@@ -50,29 +50,6 @@ dl.field-list {
 	font-weight: normal
 }
 
-
-/* Fix definitions with different ids. */
-.rst-content dl.simple {
-	margin-bottom: 0px;
-}
-
-/* Fix nested block spacing. */
-.rst-content .document dl dt,
-.rst-content dd dl,
-.rst-content dl.field-list dd>p {
-	margin: 0;
-}
-
-/* Dont indent field lists */
-.rst-content dl.field-list dt {
-	padding-left: 0 !important;
-}
-
-/* Fix padding for normal definitions nested in field lists */
-.rst-content dl.field-list dd>dl.simple {
-	padding-top: 12px;
-}
-
 /* TABLE & FIGURE */
 
 /* Cell's vertical align. */
-- 
2.30.2


From 7aba81269b82929a982e6e16c1c2974b615a6371 Mon Sep 17 00:00:00 2001
From: Aaron Carlisle <carlisle.b3d@gmail.com>
Date: Sun, 17 Mar 2024 12:49:11 -0400
Subject: [PATCH 05/30] Cleanup: better organize theme css overrides

- Place "fixes" near top of file
- Place our custom stuff near the bottom
---
 build_files/theme/css/theme_overrides.css | 141 +++++++++++-----------
 1 file changed, 73 insertions(+), 68 deletions(-)

diff --git a/build_files/theme/css/theme_overrides.css b/build_files/theme/css/theme_overrides.css
index fd26ae0ba..2f34e5a9f 100644
--- a/build_files/theme/css/theme_overrides.css
+++ b/build_files/theme/css/theme_overrides.css
@@ -26,7 +26,53 @@ dl.field-list {
 	}
 }
 
-/* Boxed paragraphs. */
+/* TABLE & FIGURE */
+
+/* Cell's vertical align. */
+/* use "valign" class for middle align */
+table.docutils:not(.valign) td {
+	vertical-align: baseline;
+}
+
+/* End TABLE & FIGURE. */
+
+.caption .menuselection {
+	background-color: transparent;
+	border: none;
+}
+
+a {
+	text-decoration: none;
+}
+
+/* Quotes for Fig. "link". */
+a[href^="#fig-"]::before {
+	content: "\201c";
+}
+
+a[href^="#fig-"]::after {
+	content: "\201d";
+}
+
+/* Mark external links. */
+a.external {
+	color: #656AE0;
+}
+
+/* List blender.org as internal. */
+.external[href^="https://www.blender.org"],
+.external[href^="https://docs.blender.org"],
+.external[href^="https://wiki.blender.org"] {
+	color: #2980B9;
+}
+
+/* ".. container::" lead, block text float around image. */
+.lead {
+	clear: both;
+	width: 100%;
+}
+
+/* Start reference admonition. */
 .admonition.refbox {
 	border-color: rgb(50, 50, 50);
 }
@@ -50,72 +96,7 @@ dl.field-list {
 	font-weight: normal
 }
 
-/* TABLE & FIGURE */
-
-/* Cell's vertical align. */
-/* use "valign" class for middle align. */
-table.docutils:not(.valign) td {
-	vertical-align: baseline;
-}
-
-/* End TABLE & FIGURE. */
-
-.footer-contribute {
-	display: block;
-	font-size: var(--font-size--small);
-}
-
-.bottom-of-page {
-	padding-bottom: 0;
-}
-
-.footer-contribute ul {
-	margin: 0;
-	padding: 0;
-	padding-bottom: 1rem
-}
-
-.footer-contribute li {
-	display: inline;
-	list-style-type: none;
-	padding-right: 1.5rem;
-}
-
-/* Quotes for Fig. "link". */
-a[href^="#fig-"]::before {
-	content: "\201c";
-}
-
-a[href^="#fig-"]::after {
-	content: "\201d";
-}
-
-/* ".. container::" lead, block text float around image. */
-.lead {
-	clear: both;
-	width: 100%;
-}
-
-a {
-	text-decoration: none;
-}
-
-/* Mark external links. */
-a.external {
-	color: #656AE0;
-}
-
-/* List blender.org as internal. */
-.external[href^="https://www.blender.org"],
-.external[href^="https://docs.blender.org"],
-.external[href^="https://wiki.blender.org"] {
-	color: #2980B9;
-}
-
-.caption .menuselection {
-	background-color: transparent;
-	border: none;
-}
+/* End reference admonition. */
 
 /* Applied on main index:sections. */
 
@@ -206,4 +187,28 @@ a.external {
 	padding-left: 2em;
 }
 
-/* End custom toctree. */
\ No newline at end of file
+/* End custom toctree. */
+
+/* Start footer contribute link */
+.footer-contribute {
+	display: block;
+	font-size: var(--font-size--small);
+}
+
+.bottom-of-page {
+	padding-bottom: 0;
+}
+
+.footer-contribute ul {
+	margin: 0;
+	padding: 0;
+	padding-bottom: 1rem
+}
+
+.footer-contribute li {
+	display: inline;
+	list-style-type: none;
+	padding-right: 1.5rem;
+}
+
+/* End footer contribute link */
\ No newline at end of file
-- 
2.30.2


From 41348ae55e9ae5182d81ddf7f13adee6d773a2ec Mon Sep 17 00:00:00 2001
From: Aaron Carlisle <carlisle.b3d@gmail.com>
Date: Sun, 17 Mar 2024 13:13:16 -0400
Subject: [PATCH 06/30] FIgures: Improve captions

- Make text use the secondary font color
- Decrease whitespace above caption
- Increase whitespace below caption
---
 build_files/theme/css/theme_overrides.css | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/build_files/theme/css/theme_overrides.css b/build_files/theme/css/theme_overrides.css
index 2f34e5a9f..354dfc030 100644
--- a/build_files/theme/css/theme_overrides.css
+++ b/build_files/theme/css/theme_overrides.css
@@ -34,8 +34,26 @@ table.docutils:not(.valign) td {
 	vertical-align: baseline;
 }
 
+/* Decrease whitespace above figure and add it below */
+figure {
+	padding-bottom: 0.5rem;
+}
+
+figcaption {
+	margin-bottom: 0.5rem !important;
+
+	p {
+		margin-top: 0;
+	}
+}
+
 /* End TABLE & FIGURE. */
 
+/* Use secondary font color for caption text */
+figcaption {
+	color: var(--color-foreground-secondary);
+}
+
 .caption .menuselection {
 	background-color: transparent;
 	border: none;
-- 
2.30.2


From 3887d893206c9141638bc5b0156e5f1931638a09 Mon Sep 17 00:00:00 2001
From: Aaron Carlisle <carlisle.b3d@gmail.com>
Date: Sun, 17 Mar 2024 13:33:08 -0400
Subject: [PATCH 07/30] Force admonition to span the full width if close to a
 figure

---
 build_files/theme/css/theme_overrides.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/build_files/theme/css/theme_overrides.css b/build_files/theme/css/theme_overrides.css
index 354dfc030..01c10e270 100644
--- a/build_files/theme/css/theme_overrides.css
+++ b/build_files/theme/css/theme_overrides.css
@@ -49,6 +49,11 @@ figcaption {
 
 /* End TABLE & FIGURE. */
 
+/* Force admonition to span the full width if close to a figure */
+.admonition {
+	clear: both;
+}
+
 /* Use secondary font color for caption text */
 figcaption {
 	color: var(--color-foreground-secondary);
-- 
2.30.2


From 3cd1430049f92f5217bc80081272cd24d3609b13 Mon Sep 17 00:00:00 2001
From: Aaron Carlisle <carlisle.b3d@gmail.com>
Date: Sun, 17 Mar 2024 13:33:32 -0400
Subject: [PATCH 08/30] Improve contrast of reference admonitions

---
 build_files/theme/css/theme_overrides.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build_files/theme/css/theme_overrides.css b/build_files/theme/css/theme_overrides.css
index 01c10e270..50be5d3b1 100644
--- a/build_files/theme/css/theme_overrides.css
+++ b/build_files/theme/css/theme_overrides.css
@@ -101,12 +101,12 @@ a.external {
 }
 
 .admonition.refbox>.admonition-title {
-	background-color: rgba(50, 50, 50, 0.1);
+	background-color: rgba(50, 50, 50, 0.2);
 	border-color: rgb(50, 50, 50);
 }
 
 .admonition.refbox>.admonition-title::before {
-	background-color: rgb(50, 50, 50);
+	background-color: var(--color-content-foreground);
 }
 
 /* 'refbox' field. */
-- 
2.30.2


From 4e2271deff193d789a9f59bbecec409f30e655ae Mon Sep 17 00:00:00 2001
From: Aaron Carlisle <carlisle.b3d@gmail.com>
Date: Sun, 17 Mar 2024 14:06:16 -0400
Subject: [PATCH 09/30] Adjust kbd styles to our liking

- Style the parent kbd element and not the individual children
---
 build_files/theme/css/theme_overrides.css | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/build_files/theme/css/theme_overrides.css b/build_files/theme/css/theme_overrides.css
index 50be5d3b1..c50287fb7 100644
--- a/build_files/theme/css/theme_overrides.css
+++ b/build_files/theme/css/theme_overrides.css
@@ -59,6 +59,26 @@ figcaption {
 	color: var(--color-foreground-secondary);
 }
 
+/* A bit hacky, revert the themes styling of kbd */
+kbd:not(.compound) {
+	all: revert;
+}
+
+/* Only style parent kbd elements instead of the individual children */
+:not(dl.option-list)> :not(dt):not(kbd):not(kbd)>kbd {
+	background-color: var(--color-background-secondary);
+	border: 1px solid var(--color-foreground-border);
+	border-radius: .2rem;
+	box-shadow: 0 .0625rem 0 rgba(0, 0, 0, .2),
+		inset 0 0 0 .125rem var(--color-background-primary);
+	color: var(--color-foreground-primary);
+	display: inline-block;
+	font-size: var(--font-size--small--3);
+	margin: 0 .2rem;
+	padding: 0 .2rem;
+	vertical-align: text-bottom;
+}
+
 .caption .menuselection {
 	background-color: transparent;
 	border: none;
-- 
2.30.2


From d4ff0a6da5cb6d260f77573da7b1083aa503771e Mon Sep 17 00:00:00 2001
From: Aaron Carlisle <carlisle.b3d@gmail.com>
Date: Sun, 17 Mar 2024 14:28:13 -0400
Subject: [PATCH 10/30] Adjust heading font size to our liking

---
 build_files/theme/css/theme_overrides.css | 28 +++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/build_files/theme/css/theme_overrides.css b/build_files/theme/css/theme_overrides.css
index c50287fb7..67b3b2abd 100644
--- a/build_files/theme/css/theme_overrides.css
+++ b/build_files/theme/css/theme_overrides.css
@@ -6,6 +6,34 @@
  *		https://www.sphinx-doc.org/en/master/extdev/appapi.html#sphinx.application.Sphinx.add_css_file
  */
 
+h1,
+h2,
+h3 {
+	margin-top: 1.75rem;
+	margin-bottom: 1rem;
+}
+
+h1 {
+	font-size: 2em;
+}
+
+h2 {
+	font-size: 1.5em;
+}
+
+h3 {
+	font-size: 1.25em;
+}
+
+h4,
+h5,
+h6 {
+	margin-top: 1.25rem;
+	margin-bottom: 0.75rem;
+	font-size: 1.125em;
+}
+
+
 /* Slightly decrease text to make the text fit on one line */
 .sidebar-brand-text {
 	font-size: 1.4rem;
-- 
2.30.2


From 606377240fbbfd29f39d7179e3762f968c26e9c3 Mon Sep 17 00:00:00 2001
From: Aaron Carlisle <carlisle.b3d@gmail.com>
Date: Sun, 17 Mar 2024 14:41:03 -0400
Subject: [PATCH 11/30] Style menuselection the same as kbd

---
 build_files/theme/css/theme_overrides.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build_files/theme/css/theme_overrides.css b/build_files/theme/css/theme_overrides.css
index 67b3b2abd..56aa67403 100644
--- a/build_files/theme/css/theme_overrides.css
+++ b/build_files/theme/css/theme_overrides.css
@@ -93,7 +93,8 @@ kbd:not(.compound) {
 }
 
 /* Only style parent kbd elements instead of the individual children */
-:not(dl.option-list)> :not(dt):not(kbd):not(kbd)>kbd {
+:not(dl.option-list)> :not(dt):not(kbd):not(kbd)>kbd,
+.menuselection {
 	background-color: var(--color-background-secondary);
 	border: 1px solid var(--color-foreground-border);
 	border-radius: .2rem;
-- 
2.30.2


From 8ed55169d1fafeac71fb36e64b4fd8e532b154f9 Mon Sep 17 00:00:00 2001
From: Aaron Carlisle <carlisle.b3d@gmail.com>
Date: Sun, 17 Mar 2024 14:41:34 -0400
Subject: [PATCH 12/30] Dont decrease font size of kbd and menuselection

---
 build_files/theme/css/theme_overrides.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build_files/theme/css/theme_overrides.css b/build_files/theme/css/theme_overrides.css
index 56aa67403..37bd5300a 100644
--- a/build_files/theme/css/theme_overrides.css
+++ b/build_files/theme/css/theme_overrides.css
@@ -102,7 +102,6 @@ kbd:not(.compound) {
 		inset 0 0 0 .125rem var(--color-background-primary);
 	color: var(--color-foreground-primary);
 	display: inline-block;
-	font-size: var(--font-size--small--3);
 	margin: 0 .2rem;
 	padding: 0 .2rem;
 	vertical-align: text-bottom;
-- 
2.30.2


From 06b5fbd9f9dcafed86aedf50dd47ce1806f60c94 Mon Sep 17 00:00:00 2001
From: Aaron Carlisle <carlisle.b3d@gmail.com>
Date: Sun, 17 Mar 2024 14:56:07 -0400
Subject: [PATCH 13/30] Small tweaks to kbd and menuselection

---
 build_files/theme/css/theme_overrides.css | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/build_files/theme/css/theme_overrides.css b/build_files/theme/css/theme_overrides.css
index 37bd5300a..8fc5ae0d9 100644
--- a/build_files/theme/css/theme_overrides.css
+++ b/build_files/theme/css/theme_overrides.css
@@ -83,7 +83,8 @@ figcaption {
 }
 
 /* Use secondary font color for caption text */
-figcaption {
+figcaption,
+caption {
 	color: var(--color-foreground-secondary);
 }
 
@@ -98,11 +99,10 @@ kbd:not(.compound) {
 	background-color: var(--color-background-secondary);
 	border: 1px solid var(--color-foreground-border);
 	border-radius: .2rem;
-	box-shadow: 0 .0625rem 0 rgba(0, 0, 0, .2),
-		inset 0 0 0 .125rem var(--color-background-primary);
+	box-shadow: 0 .0625rem 0 rgba(0, 0, 0, .2), inset 0 0 0 .125rem var(--color-background-secondary);
 	color: var(--color-foreground-primary);
 	display: inline-block;
-	margin: 0 .2rem;
+	margin: 0;
 	padding: 0 .2rem;
 	vertical-align: text-bottom;
 }
-- 
2.30.2


From ffca813bde78aaf0d59026b8cabdcbba11a60b9e Mon Sep 17 00:00:00 2001
From: Aaron Carlisle <carlisle.b3d@gmail.com>
Date: Sun, 17 Mar 2024 15:42:12 -0400
Subject: [PATCH 14/30] Tweaks to kbd, menu selection

- Vertical-align baseline
- Keep styling in definition terms
---
 build_files/theme/css/theme_overrides.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/build_files/theme/css/theme_overrides.css b/build_files/theme/css/theme_overrides.css
index 8fc5ae0d9..c38891b64 100644
--- a/build_files/theme/css/theme_overrides.css
+++ b/build_files/theme/css/theme_overrides.css
@@ -94,7 +94,7 @@ kbd:not(.compound) {
 }
 
 /* Only style parent kbd elements instead of the individual children */
-:not(dl.option-list)> :not(dt):not(kbd):not(kbd)>kbd,
+:not(dl.option-list)> :not(kbd):not(kbd)>kbd,
 .menuselection {
 	background-color: var(--color-background-secondary);
 	border: 1px solid var(--color-foreground-border);
@@ -104,7 +104,6 @@ kbd:not(.compound) {
 	display: inline-block;
 	margin: 0;
 	padding: 0 .2rem;
-	vertical-align: text-bottom;
 }
 
 .caption .menuselection {
-- 
2.30.2


From 1c3cdb4299204bd0b67b17a92df195e0af776d9d Mon Sep 17 00:00:00 2001
From: Aaron Carlisle <carlisle.b3d@gmail.com>
Date: Sun, 17 Mar 2024 15:59:08 -0400
Subject: [PATCH 15/30] Directly edit when using the pencil icon

---
 manual/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manual/conf.py b/manual/conf.py
index d3c90d421..227c5f589 100644
--- a/manual/conf.py
+++ b/manual/conf.py
@@ -133,7 +133,7 @@ html_theme_path = []
 
 if html_theme == "furo":
     html_theme_options = {
-        "source_edit_link": "https://projects.blender.org/blender/blender-manual/src/branch/main/manual/{filename}",
+        "source_edit_link": "https://projects.blender.org/blender/blender-manual/_edit/main/manual/{filename}",
     }
 
 html_sidebars = {
-- 
2.30.2


From c28a14da7ccb2238c691d8dec5fa342aa98f1974 Mon Sep 17 00:00:00 2001
From: Aaron Carlisle <carlisle.b3d@gmail.com>
Date: Sun, 17 Mar 2024 16:05:08 -0400
Subject: [PATCH 16/30] Fix: Building without furo

---
 manual/conf.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/manual/conf.py b/manual/conf.py
index 227c5f589..99b2ad4a8 100644
--- a/manual/conf.py
+++ b/manual/conf.py
@@ -136,16 +136,16 @@ if html_theme == "furo":
         "source_edit_link": "https://projects.blender.org/blender/blender-manual/_edit/main/manual/{filename}",
     }
 
-html_sidebars = {
-    "**": [
-        "sidebar/brand.html",
-        "sidebar/search.html",
-        "sidebar/scroll-start.html",
-        "sidebar/navigation.html",
-        "sidebar/scroll-end.html",
-        "sidebar/variant-selector.html",
-    ]
-}
+    html_sidebars = {
+        "**": [
+            "sidebar/brand.html",
+            "sidebar/search.html",
+            "sidebar/scroll-start.html",
+            "sidebar/navigation.html",
+            "sidebar/scroll-end.html",
+            "sidebar/variant-selector.html",
+        ]
+    }
 
 html_context = {
     "analytics_id": "UA-1418081-1",
-- 
2.30.2


From 070acc741e9f1279b06fe02ba078a354c7bbbfdb Mon Sep 17 00:00:00 2001
From: Aaron Carlisle <carlisle.b3d@gmail.com>
Date: Mon, 18 Mar 2024 16:58:08 -0400
Subject: [PATCH 17/30] Fix Field Lists with short terms

---
 build_files/theme/css/theme_overrides.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_files/theme/css/theme_overrides.css b/build_files/theme/css/theme_overrides.css
index c38891b64..3a49b31c0 100644
--- a/build_files/theme/css/theme_overrides.css
+++ b/build_files/theme/css/theme_overrides.css
@@ -47,7 +47,7 @@ dl dt {
 /* Fixes to field list, see #104636 */
 dl.field-list {
 	display: grid;
-	grid-template-columns: fit-content(24px) auto !important;
+	grid-template-columns: auto minmax(80%, 95%);
 
 	p {
 		margin-bottom: 0;
-- 
2.30.2


From bfe6f7aeea1cf2203d986027bf9c66432f18a134 Mon Sep 17 00:00:00 2001
From: Aaron Carlisle <carlisle.b3d@gmail.com>
Date: Mon, 18 Mar 2024 17:08:36 -0400
Subject: [PATCH 18/30] Improve HR and toctrees

---
 build_files/theme/css/theme_overrides.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/build_files/theme/css/theme_overrides.css b/build_files/theme/css/theme_overrides.css
index 3a49b31c0..3e888343c 100644
--- a/build_files/theme/css/theme_overrides.css
+++ b/build_files/theme/css/theme_overrides.css
@@ -33,6 +33,11 @@ h6 {
 	font-size: 1.125em;
 }
 
+/* Reduce the margins on top/bottom of horizontal lines. */
+hr.docutils {
+	margin: 1rem 0;
+}
+
 
 /* Slightly decrease text to make the text fit on one line */
 .sidebar-brand-text {
@@ -253,6 +258,7 @@ a.external {
 
 /* Underline provided by nested ul (not li). */
 .toctree-wrapper * ul {
+	margin-bottom: 1rem !important;
 	border-top: solid var(--color-background-border) 2px;
 	padding-left: 2em;
 }
-- 
2.30.2


From b80a843c5c63acb645d60a18af0ae5b7b4ba47ad Mon Sep 17 00:00:00 2001
From: Aaron Carlisle <carlisle.b3d@gmail.com>
Date: Mon, 18 Mar 2024 17:42:54 -0400
Subject: [PATCH 19/30] Make text smaller for captions

---
 build_files/theme/css/theme_overrides.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build_files/theme/css/theme_overrides.css b/build_files/theme/css/theme_overrides.css
index 3e888343c..8f3aed601 100644
--- a/build_files/theme/css/theme_overrides.css
+++ b/build_files/theme/css/theme_overrides.css
@@ -91,6 +91,7 @@ figcaption {
 figcaption,
 caption {
 	color: var(--color-foreground-secondary);
+	font-size: var(--font-size--small)
 }
 
 /* A bit hacky, revert the themes styling of kbd */
-- 
2.30.2


From 8f2f7f854830b8e23973f59d6e00efb506e2d3aa Mon Sep 17 00:00:00 2001
From: Aaron Carlisle <carlisle.b3d@gmail.com>
Date: Mon, 18 Mar 2024 20:47:02 -0400
Subject: [PATCH 20/30] Use Blender Blue as the brand color

---
 manual/conf.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/manual/conf.py b/manual/conf.py
index 99b2ad4a8..4a618bb06 100644
--- a/manual/conf.py
+++ b/manual/conf.py
@@ -134,6 +134,10 @@ html_theme_path = []
 if html_theme == "furo":
     html_theme_options = {
         "source_edit_link": "https://projects.blender.org/blender/blender-manual/_edit/main/manual/{filename}",
+        "light_css_variables": {
+            "color-brand-primary": "#265787",
+            "color-brand-content": "#265787",
+        },
     }
 
     html_sidebars = {
-- 
2.30.2


From 91ec48cfb0d940b96bb98629605470b7c861c197 Mon Sep 17 00:00:00 2001
From: Aaron Carlisle <carlisle.b3d@gmail.com>
Date: Mon, 18 Mar 2024 20:54:28 -0400
Subject: [PATCH 21/30] Adjust external links dynamically

---
 build_files/theme/css/theme_overrides.css | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/build_files/theme/css/theme_overrides.css b/build_files/theme/css/theme_overrides.css
index 8f3aed601..ca59bfcb3 100644
--- a/build_files/theme/css/theme_overrides.css
+++ b/build_files/theme/css/theme_overrides.css
@@ -132,14 +132,21 @@ a[href^="#fig-"]::after {
 
 /* Mark external links. */
 a.external {
-	color: #656AE0;
+	filter: brightness(150%);
 }
 
 /* List blender.org as internal. */
 .external[href^="https://www.blender.org"],
 .external[href^="https://docs.blender.org"],
-.external[href^="https://wiki.blender.org"] {
-	color: #2980B9;
+.external[href^="https://projects.blender.org"],
+.external[href^="https://builder.blender.org"],
+.external[href^="https://code.blender.org"],
+.external[href^="https://translate.blender.org"],
+.external[href^="https://fund.blender.org"],
+.external[href^="blender_manual_html.zip"],
+.external[href^="blender_manual_epub.zip"],
+.external[href^="https://archive.blender.org"] {
+	filter: revert;
 }
 
 /* ".. container::" lead, block text float around image. */
-- 
2.30.2


From 22310baf698445c3296296548e4c5de50f97ffc1 Mon Sep 17 00:00:00 2001
From: Aaron Carlisle <carlisle.b3d@gmail.com>
Date: Mon, 18 Mar 2024 21:14:06 -0400
Subject: [PATCH 22/30] Add rubrics to heading customizations

---
 build_files/theme/css/theme_overrides.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build_files/theme/css/theme_overrides.css b/build_files/theme/css/theme_overrides.css
index ca59bfcb3..88840586d 100644
--- a/build_files/theme/css/theme_overrides.css
+++ b/build_files/theme/css/theme_overrides.css
@@ -27,7 +27,8 @@ h3 {
 
 h4,
 h5,
-h6 {
+h6,
+.rubric {
 	margin-top: 1.25rem;
 	margin-bottom: 0.75rem;
 	font-size: 1.125em;
-- 
2.30.2


From 2545188c5c5245e964a89e5ae7838e28c4efb52f Mon Sep 17 00:00:00 2001
From: Aaron Carlisle <carlisle.b3d@gmail.com>
Date: Mon, 18 Mar 2024 21:15:12 -0400
Subject: [PATCH 23/30] Add animation to sidebar arrow

---
 build_files/theme/css/theme_overrides.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build_files/theme/css/theme_overrides.css b/build_files/theme/css/theme_overrides.css
index 88840586d..a26462d4b 100644
--- a/build_files/theme/css/theme_overrides.css
+++ b/build_files/theme/css/theme_overrides.css
@@ -45,6 +45,10 @@ hr.docutils {
 	font-size: 1.4rem;
 }
 
+.toctree-checkbox~label .icon svg {
+	transition: transform 0.25s ease-out;
+}
+
 /* Add more visual weight to definition terms */
 dl dt {
 	font-weight: bold !important
-- 
2.30.2


From 7c0c75b64d2041766ad208684e7cef9549a6f413 Mon Sep 17 00:00:00 2001
From: Aaron Carlisle <carlisle.b3d@gmail.com>
Date: Mon, 18 Mar 2024 21:32:25 -0400
Subject: [PATCH 24/30] Small fixes to toc trees

---
 build_files/theme/css/theme_overrides.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/build_files/theme/css/theme_overrides.css b/build_files/theme/css/theme_overrides.css
index a26462d4b..cc737cd9c 100644
--- a/build_files/theme/css/theme_overrides.css
+++ b/build_files/theme/css/theme_overrides.css
@@ -264,7 +264,6 @@ a.external {
 }
 
 .toctree-wrapper ul {
-	width: 90%;
 	list-style: none;
 	padding-left: 0;
 }
@@ -272,7 +271,7 @@ a.external {
 /* Underline provided by nested ul (not li). */
 .toctree-wrapper * ul {
 	margin-bottom: 1rem !important;
-	border-top: solid var(--color-background-border) 2px;
+	border-top: solid var(--color-background-border) 1px;
 	padding-left: 2em;
 }
 
-- 
2.30.2


From 94d54717021f65da02357415a96a46e92a4f68e2 Mon Sep 17 00:00:00 2001
From: Aaron Carlisle <carlisle.b3d@gmail.com>
Date: Mon, 18 Mar 2024 21:49:20 -0400
Subject: [PATCH 25/30] Increase the font sizes of various text

---
 build_files/theme/css/theme_overrides.css | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/build_files/theme/css/theme_overrides.css b/build_files/theme/css/theme_overrides.css
index cc737cd9c..f19a6f173 100644
--- a/build_files/theme/css/theme_overrides.css
+++ b/build_files/theme/css/theme_overrides.css
@@ -6,6 +6,14 @@
  *		https://www.sphinx-doc.org/en/master/extdev/appapi.html#sphinx.application.Sphinx.add_css_file
  */
 
+body {
+	--sidebar-caption-font-size: var(--font-size--normal);
+	--toc-title-font-size: var(--font-size--normal);
+	--toc-font-size: var(--sidebar-item-font-size);
+	--admonition-font-size: var(--font-size--normal);
+	--admonition-title-font-size: var(--font-size--normal);
+}
+
 h1,
 h2,
 h3 {
-- 
2.30.2


From 4920d607f62183336a1126aebac76472d947a318 Mon Sep 17 00:00:00 2001
From: Aaron Carlisle <carlisle.b3d@gmail.com>
Date: Mon, 18 Mar 2024 22:14:07 -0400
Subject: [PATCH 26/30] Version Switch: Fixes for dark mode

---
 build_files/theme/css/version_switch.css | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/build_files/theme/css/version_switch.css b/build_files/theme/css/version_switch.css
index b5fa108d7..14e15ecaf 100644
--- a/build_files/theme/css/version_switch.css
+++ b/build_files/theme/css/version_switch.css
@@ -78,7 +78,6 @@
 	width: 50%;
 	margin: 0 5px;
 	padding-bottom: 4px;
-	background-color: #0003;
 	border-radius: 3px;
 	box-shadow: 0 0 6px #000C;
 	z-index: 999;
@@ -90,9 +89,10 @@
 
 .version-title {
 	padding: 5px;
-	color: black;
+	color: var(--color-content-foreground);
 	text-align: center;
 	font-size: 102%;
+	font-weight: 700;
 	background-color: var(--color-brand-primary);
 	border-bottom: solid 1.5px var(--color-sidebar-background-border);
 }
@@ -102,7 +102,6 @@
 	margin-top: 0;
 	margin-bottom: 4px;
 	text-align: center;
-	background-color: #000C;
 	border: solid 1px var(--color-sidebar-background-border);
 	border-radius: 0px 0px 3px 3px;
 }
@@ -128,15 +127,10 @@
 
 .version-list li:hover,
 .version-list li a:focus {
-	background-color: #b9cfda;
+	background-color: var(--color-background-hover);
 }
 
-.version-list li.selected,
-.version-list li.selected:hover {
-	background-color: #8d8c8c;
-}
-
-.version-list li.selected span {
-	cursor: default;
-	outline-color: red;
+.version-list li.selected {
+	background: var(--color-sidebar-item-background--current);
+	font-weight: 700;
 }
\ No newline at end of file
-- 
2.30.2


From a844c51e95b8d61fe476954a52082c7a3153e8ad Mon Sep 17 00:00:00 2001
From: Aaron Carlisle <carlisle.b3d@gmail.com>
Date: Mon, 18 Mar 2024 22:18:14 -0400
Subject: [PATCH 27/30] Hide contribute links when printing to PDF

---
 build_files/theme/css/theme_overrides.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/build_files/theme/css/theme_overrides.css b/build_files/theme/css/theme_overrides.css
index f19a6f173..f2952bdd9 100644
--- a/build_files/theme/css/theme_overrides.css
+++ b/build_files/theme/css/theme_overrides.css
@@ -307,4 +307,10 @@ a.external {
 	padding-right: 1.5rem;
 }
 
+@media print {
+	.footer-contribute {
+		display: none;
+	}
+}
+
 /* End footer contribute link */
\ No newline at end of file
-- 
2.30.2


From 2c0d479260e3e940f4e4c8f5f3625250672a46cd Mon Sep 17 00:00:00 2001
From: Aaron Carlisle <carlisle.b3d@gmail.com>
Date: Tue, 19 Mar 2024 00:06:52 -0400
Subject: [PATCH 28/30] Cleanup: Remove unused CSS

---
 build_files/theme/css/version_switch.css | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/build_files/theme/css/version_switch.css b/build_files/theme/css/version_switch.css
index 14e15ecaf..4e718829d 100644
--- a/build_files/theme/css/version_switch.css
+++ b/build_files/theme/css/version_switch.css
@@ -1,18 +1,3 @@
-/* Override RTD theme */
-.rst-versions {
-	border-top: 0px;
-	overflow: visible;
-}
-
-.version-btn.vdeact {
-	cursor: default;
-	color: dimgray;
-}
-
-.version-btn.vdeact::after {
-	content: "";
-}
-
 #versionwrap {
 	margin: 0;
 	display: flex;
-- 
2.30.2


From 4060c755b362c8b8f048a7bb50759866bfae6317 Mon Sep 17 00:00:00 2001
From: Aaron Carlisle <carlisle.b3d@gmail.com>
Date: Tue, 19 Mar 2024 00:09:39 -0400
Subject: [PATCH 29/30] Cleanup: Whitespace

---
 build_files/theme/css/version_switch.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build_files/theme/css/version_switch.css b/build_files/theme/css/version_switch.css
index 4e718829d..e17d715c4 100644
--- a/build_files/theme/css/version_switch.css
+++ b/build_files/theme/css/version_switch.css
@@ -17,7 +17,6 @@
 	width: 50%;
 }
 
-
 .version-btn {
 	display: inline-block;
 	background-color: var(--color-sidebar-background);
-- 
2.30.2


From c42be80e8d5424fee04ce94c764d90d8b63a3127 Mon Sep 17 00:00:00 2001
From: Aaron Carlisle <carlisle.b3d@gmail.com>
Date: Tue, 19 Mar 2024 22:44:51 -0400
Subject: [PATCH 30/30] Remove google analytics

---
 build_files/templates/base.html                 |  2 +-
 build_files/templates/components/analytics.html | 13 -------------
 manual/conf.py                                  |  4 ----
 3 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100644 build_files/templates/components/analytics.html

diff --git a/build_files/templates/base.html b/build_files/templates/base.html
index f959cab35..e9f9363ed 100644
--- a/build_files/templates/base.html
+++ b/build_files/templates/base.html
@@ -7,5 +7,5 @@
 
 {%- block theme_scripts -%}
 {{ super() }}
-{%- include "components/analytics.html" -%}
+<script defer data-domain="docs.blender.org" src="https://analytics.blender.org/js/script.js"></script>
 {%- endblock -%}
\ No newline at end of file
diff --git a/build_files/templates/components/analytics.html b/build_files/templates/components/analytics.html
deleted file mode 100644
index 804052199..000000000
--- a/build_files/templates/components/analytics.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{%- if analytics_id %}
-<!-- Theme Analytics -->
-<script async src="https://www.googletagmanager.com/gtag/js?id={{ theme_analytics_id }}"></script>
-<script>
-  window.dataLayer = window.dataLayer || [];
-  function gtag() { dataLayer.push(arguments); }
-  gtag('js', new Date());
-
-  gtag('config', '{{ analytics_id }}', {
-    'anonymize_ip': 'false',
-  });
-</script>
-{%- endif %}
\ No newline at end of file
diff --git a/manual/conf.py b/manual/conf.py
index 4a618bb06..4c6671712 100644
--- a/manual/conf.py
+++ b/manual/conf.py
@@ -151,10 +151,6 @@ if html_theme == "furo":
         ]
     }
 
-html_context = {
-    "analytics_id": "UA-1418081-1",
-}
-
 # The "title" for HTML documentation generated with Sphinx's own templates.
 # This is appended to the <title> tag of individual pages, and
 # used in the navigation bar as the "topmost" element.
-- 
2.30.2