diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index 865c6859..5196b205 100644
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -9,5 +9,6 @@ python:
     - method: pip
       path: .
 sphinx:
+  configuration: docs/conf.py
   builder: dirhtml
   fail_on_warning: true
diff --git a/README.md b/README.md
index d1a6870d..182c3e96 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+<div align="center"><img src="https://raw.githubusercontent.com/pallets/jinja/refs/heads/stable/docs/_static/jinja-horizontal.svg" alt="" height="150"></div>
+
 # Jinja
 
 Jinja is a fast, expressive, extensible templating engine. Special
diff --git a/artwork/jinjalogo.svg b/artwork/jinjalogo.svg
deleted file mode 100644
index 0bc9ea4e..00000000
--- a/artwork/jinjalogo.svg
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="300"
-   height="120"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docbase="/Users/mitsuhiko/Development/jinja2/artwork"
-   sodipodi:docname="jinjalogo.svg"
-   inkscape:export-filename="/Users/mitsuhiko/Development/jinja2/docs/_static/jinjabanner.png"
-   inkscape:export-xdpi="60"
-   inkscape:export-ydpi="60"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient6558">
-      <stop
-         style="stop-color:#575757;stop-opacity:1;"
-         offset="0"
-         id="stop6560" />
-      <stop
-         style="stop-color:#2f2f2f;stop-opacity:1;"
-         offset="1"
-         id="stop6562" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6558"
-       id="radialGradient6564"
-       cx="61.297766"
-       cy="60.910986"
-       fx="61.297766"
-       fy="60.910986"
-       r="44.688254"
-       gradientTransform="matrix(1,0,0,0.945104,0,3.343747)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6558"
-       id="radialGradient6580"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.945104,0.355158,3.334402)"
-       cx="61.297766"
-       cy="60.910986"
-       fx="61.297766"
-       fy="60.910986"
-       r="44.688254" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6558"
-       id="linearGradient4173"
-       x1="255.15521"
-       y1="32.347946"
-       x2="279.8912"
-       y2="32.347946"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.8073249,0,0,0.8073249,57.960878,7.4036303)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6558"
-       id="linearGradient5145"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7902775,0,0,0.82474,60.019977,8.0684132)"
-       x1="255.15521"
-       y1="32.347946"
-       x2="279.8912"
-       y2="32.347946" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.8"
-     inkscape:cx="137.4752"
-     inkscape:cy="57.574575"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     width="300px"
-     height="120px"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1396"
-     inkscape:window-height="900"
-     inkscape:window-x="0"
-     inkscape:window-y="22" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#f4f4f4;fill-opacity:1;stroke:#e7e7e7;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;font-family:Bitstream Vera Sans;stroke-miterlimit:4;stroke-dasharray:none"
-       d="M 165.36463,80.874808 L 165.36463,80.874808 L 153.32556,80.874808 L 153.32556,81.8344 L 147.64994,81.8344 L 147.64994,36.035583 L 165.36463,36.035583 L 165.36463,20.333129 C 170.58154,21.031083 173.07533,22.077914 172.84609,23.473621 C 172.78871,24.055258 172.21545,24.549594 171.12624,24.956624 L 171.12624,36.035583 L 189.09895,36.035583 L 189.09895,82.532286 L 183.33733,82.532286 L 183.33733,80.874808 L 171.12624,80.874808 L 171.12624,102.94548 L 165.36463,102.94548 L 165.36463,80.874808 M 153.32556,55.489173 L 153.32556,55.489173 L 165.36463,55.489173 L 165.36463,41.793146 L 153.32556,41.793146 L 153.32556,55.489173 M 171.12624,55.489173 L 171.12624,55.489173 L 183.33733,55.489173 L 183.33733,41.793146 L 171.12624,41.793146 L 171.12624,55.489173 M 183.33733,61.333977 L 183.33733,61.333977 L 171.12624,61.333977 L 171.12624,75.030006 L 183.33733,75.030006 L 183.33733,61.333977 M 165.36463,61.333977 L 165.36463,61.333977 L 153.32556,61.333977 L 153.32556,75.030006 L 165.36463,75.030006 L 165.36463,61.333977 M 132.85897,59.414792 C 137.33069,63.136883 140.99969,67.934848 143.86618,73.808701 L 139.13654,77.385372 C 137.24467,72.965445 134.6362,69.12707 131.31114,65.87024 L 131.31114,102.94548 L 125.63554,102.94548 L 125.63554,68.57455 C 122.31042,71.947693 118.52671,74.913707 114.28436,77.47261 L 109.64069,73.372526 C 121.50782,67.091566 130.62312,55.489212 136.98668,38.565417 L 116.26221,38.565417 L 116.26221,32.720615 L 125.80754,32.720615 L 125.80754,20.333129 C 130.85245,21.031083 133.31761,22.048838 133.20299,23.386383 C 133.14561,24.026183 132.57235,24.549594 131.48307,24.956624 L 131.48307,32.720615 L 140.77043,32.720615 L 143.60824,36.733469 C 140.68444,45.51526 137.10137,53.075692 132.85897,59.414792 M 254.11016,49.469901 L 254.11016,49.469901 L 254.11016,20.333129 C 259.21243,21.031083 261.67755,22.048838 261.50562,23.386383 C 261.44823,23.909869 261.04699,24.346044 260.30172,24.694917 C 260.30164,24.694986 260.30164,24.694986 260.30172,24.694917 L 260.30172,24.694917 L 259.78578,24.956624 L 259.78578,49.469901 L 277.15652,49.469901 L 277.15652,55.227471 L 259.78578,55.227471 L 259.78578,93.785712 L 281.45616,93.785712 L 281.45616,99.63051 L 232.35378,99.63051 L 232.35378,93.785712 L 254.11016,93.785712 L 254.11016,55.227471 L 236.22346,55.227471 L 236.22346,49.469901 L 254.11016,49.469901 M 225.5603,59.327554 C 231.12111,63.107798 235.62145,67.876693 239.06127,73.634235 L 234.76157,77.647079 C 231.60845,72.180322 227.82475,67.934848 223.41044,64.910648 L 223.41044,102.94548 L 217.73484,102.94548 L 217.73484,67.44049 C 212.91919,71.627831 207.70222,75.030021 202.084,77.647079 L 197.87027,73.198053 C 212.66118,66.917101 224.01239,55.372897 231.92377,38.565417 L 205.35172,38.565417 L 205.35172,32.720615 L 217.99283,32.720615 L 217.99283,20.333129 C 223.03774,21.031083 225.50291,22.048838 225.38829,23.386383 C 225.33089,24.026183 224.75765,24.549594 223.66837,24.956624 L 223.66837,32.720615 L 236.22346,32.720615 L 238.80326,36.733469 C 235.13421,45.51526 230.71987,53.046611 225.5603,59.327554"
-       id="text4761" />
-    <path
-       style="font-size:44.09793472px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#b41717;fill-opacity:1;stroke:#7f2828;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Candara;stroke-miterlimit:4;stroke-dasharray:none"
-       d="M 149.14708,37.774469 C 148.97807,41.117899 148.84526,44.824225 148.74871,48.893456 C 148.67626,52.962754 148.3818,70.641328 148.38184,75.524422 C 148.3818,79.065795 148.05588,81.991266 147.40406,84.300835 C 146.75219,86.610422 145.72612,88.557071 144.32585,90.140779 C 142.94969,91.724494 141.17522,92.901283 139.00239,93.671139 C 136.82953,94.440996 134.22211,94.825935 131.18014,94.825935 C 128.83828,94.825935 126.73787,94.59498 124.87889,94.133049 L 125.4221,89.31593 C 127.13623,90.0418 128.92278,90.404734 130.78177,90.404733 C 132.85805,90.404734 134.66875,90.140782 136.2139,89.612876 C 137.78315,89.062981 139.02651,88.216133 139.94396,87.072335 C 140.8855,85.928548 141.54942,84.520804 141.93572,82.8491 C 142.34613,81.177412 142.55134,78.988811 142.55136,76.283285 C 142.55134,66.297119 142.62852,44.659257 142.26641,37.774469 L 149.14708,37.774469 M 166.38498,80.732697 L 159.83024,80.732697 C 160.16821,76.333498 160.33723,71.307412 160.33723,65.654424 C 160.33723,59.2976 159.91471,53.963567 159.06973,49.652319 L 166.31257,48.761483 C 166.02284,53.358679 165.87799,58.98965 165.87799,65.654424 C 165.87799,70.933479 166.04699,75.959565 166.38498,80.732697 M 167.90601,39.490159 C 167.90598,40.611994 167.5076,41.590815 166.7109,42.42662 C 165.91418,43.240515 164.79155,43.647442 163.343,43.647399 C 162.11172,43.647442 161.146,43.295504 160.44588,42.591595 C 159.76988,41.865769 159.43188,40.996927 159.43188,39.98507 C 159.43188,38.885304 159.84231,37.928485 160.66315,37.114591 C 161.48399,36.30078 162.61869,35.893853 164.06727,35.893811 C 165.25023,35.893853 166.17975,36.256783 166.85575,36.982609 C 167.55588,37.686526 167.90598,38.522373 167.90601,39.490159 M 206.72748,80.732697 L 200.13651,80.732697 C 200.66763,74.947749 200.93319,68.634899 200.9332,61.794122 C 200.93319,58.406756 200.1727,56.097177 198.65174,54.865371 C 197.15487,53.61163 195.00619,52.984747 192.20564,52.984714 C 188.77731,52.984747 185.61465,54.117535 182.71753,56.383099 C 182.71753,63.883761 182.76583,72.000287 182.86238,80.732697 L 176.27142,80.732697 C 176.68182,73.254058 176.88707,67.843042 176.88707,64.499632 C 176.88707,59.352589 176.3559,54.359493 175.29363,49.520339 L 181.66734,48.695493 L 182.35539,52.720761 L 182.64511,52.720761 C 186.21823,49.773323 190.04483,48.299592 194.12499,48.299567 C 198.13265,48.299592 201.23499,49.113454 203.43201,50.741118 C 205.62895,52.346863 206.72747,55.217334 206.72748,59.352563 C 206.72747,59.770507 206.70331,60.595362 206.65507,61.827118 C 206.60675,63.058915 206.5826,63.883761 206.58262,64.30167 C 206.5826,67.975018 206.63088,73.452022 206.72748,80.732697 M 222.69791,48.695493 C 222.28747,55.514282 222.08225,62.355041 222.08225,69.21778 C 222.08225,71.043461 222.14262,73.463019 222.26332,76.476468 C 222.40822,79.467925 222.4806,81.502559 222.48063,82.580363 C 222.4806,89.685068 219.51105,93.996287 213.57195,95.514024 L 211.76124,93.006484 C 213.90995,91.356766 215.2378,89.597085 215.74478,87.727431 C 216.49321,85.043912 216.86743,79.324953 216.86743,70.570535 C 216.86743,61.178248 216.3846,54.16153 215.41887,49.520339 L 222.69791,48.695493 M 224.2551,39.490159 C 224.2551,40.611994 223.85673,41.590815 223.06006,42.42662 C 222.26332,43.240515 221.14069,43.647442 219.69213,43.647399 C 218.46084,43.647442 217.49515,43.295504 216.795,42.591595 C 216.119,41.865769 215.781,40.996927 215.781,39.98507 C 215.781,38.885304 216.19144,37.928485 217.01231,37.114591 C 217.83316,36.30078 218.96785,35.893853 220.4164,35.893811 C 221.5994,35.893853 222.52889,36.256783 223.20492,36.982609 C 223.90503,37.686526 224.2551,38.522373 224.2551,39.490159 M 259.60008,80.732697 L 253.91446,80.930661 C 253.62473,79.852857 253.47987,78.830045 253.4799,77.862216 L 253.11774,77.862216 C 250.14817,80.325772 246.10427,81.557546 240.98606,81.557547 C 238.20962,81.557546 235.8195,80.820682 233.81563,79.346948 C 231.81178,77.851221 230.80988,75.728607 230.80988,72.979099 C 230.80988,69.591724 232.37914,66.875216 235.51769,64.829574 C 238.65625,62.761967 244.48667,61.67316 253.00913,61.563165 C 253.08155,61.035275 253.11772,60.430386 253.11774,59.748497 C 253.11772,57.043003 252.32104,55.239336 250.72765,54.337474 C 249.15832,53.435661 246.76819,52.984747 243.55721,52.984714 C 239.76681,52.984747 236.03678,53.413668 232.3671,54.271484 L 232.9827,49.718301 C 236.60411,48.77251 240.76873,48.299592 245.47658,48.299567 C 249.77395,48.299592 253.09359,49.113454 255.43545,50.741118 C 257.77728,52.346863 258.94819,55.096363 258.94824,58.989625 C 258.94819,60.023469 258.88785,61.904117 258.76715,64.631608 C 258.67054,67.337133 258.62228,69.140806 258.6223,70.042632 C 258.62228,74.045913 258.94819,77.609265 259.60008,80.732697 M 253.19019,74.331856 C 253.06945,70.988469 253.00909,67.986016 253.00913,65.324484 C 248.47027,65.324498 245.01786,65.632443 242.65187,66.248318 C 238.69248,67.348131 236.71278,69.448748 236.71278,72.550177 C 236.71278,75.541643 239.03044,77.037371 243.66588,77.037366 C 247.64942,77.037371 250.82416,76.135534 253.19019,74.331856"
-       id="text3736"
-       sodipodi:nodetypes="ccsscssccscccsccccsccsccsscsssccccscscccsccccscsssccscscccscccsscsssccccccscsccscsccscscsccccssc" />
-    <path
-       style="fill:url(#radialGradient6564);fill-opacity:1.0;fill-rule:evenodd;stroke:#323232;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="M 105.45673,18.675923 C 105.45673,18.675923 88.211949,26.918461 74.172834,28.737898 C 60.133727,30.557333 33.360434,32.377571 28.045622,31.093256 C 22.730818,29.808941 18.915645,28.309196 18.915645,28.309196 L 20.021441,32.056583 L 16.609513,35.052471 L 17.2144,36.121726 L 18.61792,36.22764 L 22.92773,36.762252 L 23.532621,38.688909 L 25.937975,38.905784 L 27.143021,42.970927 C 27.143021,42.970927 32.254764,43.399628 33.758953,43.399628 C 35.263142,43.399628 38.271966,43.187802 38.271966,43.187802 L 38.371202,44.791657 L 39.477002,45.003495 L 39.477002,46.824227 L 37.066917,48.967759 L 37.671807,49.073671 L 37.671807,49.820127 C 37.671807,49.820127 32.255457,50.252157 30.049301,49.93109 C 27.843157,49.610006 27.440747,49.608286 27.440747,49.608286 L 27.242258,49.820127 L 27.143021,50.783455 L 27.643946,50.783455 L 27.84242,54.959544 L 38.976091,54.530844 L 38.172728,68.980747 L 38.073481,70.796442 L 28.645781,70.261816 L 28.546544,66.408513 L 30.649462,66.408513 L 30.852673,64.910557 L 32.757107,64.481857 L 33.059555,64.058192 L 25.937975,62.343374 L 20.522364,63.947229 L 21.42496,64.698732 L 22.327572,64.698732 L 22.426809,65.984848 L 24.331254,66.09076 L 24.331254,69.838147 L 22.228335,70.372777 L 22.630009,71.225146 L 23.130934,71.547931 L 23.130934,74.437917 L 24.435218,74.437917 L 24.435218,87.813529 L 22.327572,88.13632 L 22.630009,91.989617 L 23.929569,92.206492 L 23.731093,100.98236 L 29.449141,101.08826 L 28.244105,92.418334 L 36.868446,92.206492 L 36.268285,96.912181 L 35.464925,100.23086 L 44.188501,100.33677 L 44.287739,91.777793 L 50.303506,91.243181 L 50.005786,96.700351 L 49.802585,99.90807 L 54.920484,99.90807 L 54.717274,91.132217 L 55.421397,91.243181 L 55.619882,87.067076 L 54.816521,87.067076 L 54.518798,85.352258 L 54.017874,80.429702 L 54.216359,74.760706 L 55.31743,74.760706 L 55.31743,71.336105 L 53.913913,71.442015 L 54.117112,67.402096 L 55.747469,67.240708 L 55.823083,65.929374 L 56.749319,65.793192 L 57.699176,65.071956 L 51.985842,63.896802 L 46.31977,65.15265 L 46.872668,66.060507 L 47.47283,66.010066 L 48.172228,65.984848 L 48.299828,67.639144 L 49.878196,67.563497 L 49.906548,71.144447 L 43.111042,70.988097 L 43.337879,67.160002 L 43.559978,63.679927 L 43.559978,59.105378 L 43.763188,54.288748 L 57.373101,53.592733 L 73.567955,52.659674 L 73.71917,55.736265 L 73.142647,63.120082 L 72.892183,69.9945 L 66.928387,69.888585 L 66.900039,65.071956 L 69.106918,64.991267 L 69.206169,63.629486 L 70.108765,63.493308 L 70.061506,63.226006 L 70.964116,63.175568 L 71.465028,62.504773 L 64.721507,60.926122 L 58.001612,62.368592 L 58.4789,63.200785 L 59.230285,63.1453 L 59.230285,63.523577 L 60.156518,63.523577 L 60.156518,65.046738 L 62.136575,65.071956 L 62.112937,69.298485 L 60.109259,69.298485 L 60.080907,70.261816 L 60.785031,70.342507 L 60.70942,74.009202 L 62.188552,74.089909 L 62.013701,88.620507 L 60.057282,89.018952 L 60.080907,89.714967 L 60.761406,89.714967 L 60.761406,93.437137 L 61.886113,93.437137 L 61.588391,98.52109 L 61.210343,102.95945 L 68.331912,103.14605 L 68.105084,99.29275 L 67.580538,96.085028 L 67.476575,93.300955 L 73.520696,93.195041 L 73.345845,97.502272 L 73.317494,102.05159 L 76.729426,102.3189 L 81.3653,102.1323 L 82.820807,101.70358 L 82.017437,99.26753 L 81.818959,95.439438 L 81.440912,92.710853 L 87.206218,92.499027 L 86.955759,95.842931 L 86.932133,101.08826 L 89.238253,101.30009 L 91.520751,101.24965 L 92.621828,100.90165 L 91.969693,95.923633 L 91.747577,92.176239 L 92.725793,92.070324 L 92.749427,88.726422 L 93.02352,88.670945 L 92.976244,87.949712 L 91.846823,87.949712 L 91.619996,85.488427 L 91.520751,74.811143 L 92.371377,74.785924 L 92.371377,71.280616 L 92.725793,71.336105 L 92.725793,70.640088 L 91.468773,70.529127 L 91.497126,66.463987 L 93.600043,66.277382 L 93.477182,64.910557 L 94.403419,64.829863 L 94.351424,64.562549 L 95.580099,63.947229 L 89.337489,62.69138 L 82.995657,63.977495 L 83.39733,64.723951 L 84.375543,64.643256 L 84.427528,64.966046 L 85.254515,64.966046 L 85.301775,66.569901 L 87.357445,66.544681 L 87.532293,70.478688 L 80.264217,70.423216 L 79.413593,64.512124 L 78.733106,61.380041 L 78.184923,55.761484 L 78.510996,52.473053 L 92.999878,51.373557 L 93.047136,46.476221 L 93.774891,46.289613 L 93.727651,45.543159 L 93.174743,45.220372 C 93.174629,45.220372 85.252181,46.395266 82.745197,46.66284 C 82.0389,46.738209 82.09239,46.733258 81.516524,46.79397 L 81.440912,45.886118 L 78.444837,44.317564 L 78.482644,42.491786 L 79.512842,42.461518 L 79.588444,39.949808 C 79.588444,39.949808 85.728225,39.546834 88.009582,39.0117 C 90.290937,38.476559 93.524432,37.942456 93.524432,37.942456 L 95.055545,33.79662 L 98.089437,32.913987 L 98.339888,32.217972 L 105.20628,30.316548 L 105.98602,29.676006 L 103.37744,23.976741 L 103.62792,22.690624 L 104.95584,21.994611 L 105.91041,19.079404 L 105.45673,18.675923 z M 72.466874,40.403728 L 72.429067,42.476654 L 73.983813,42.542211 L 73.884576,44.509221 L 70.836515,46.506487 L 70.647496,47.081457 L 71.876167,47.091543 L 71.866712,47.575729 L 62.552432,48.029652 L 62.613863,46.652742 L 63.039175,45.966809 L 63.067524,45.528025 L 63.07698,44.579832 L 63.341609,43.949374 L 63.440849,43.439982 L 63.440849,43.076841 L 63.842533,41.47297 L 72.466874,40.403728 z M 52.987688,42.168984 L 52.760853,43.561027 L 53.488599,44.418431 L 53.441349,45.916386 L 54.117112,46.960408 L 53.942262,48.191039 L 54.443185,48.912273 L 44.939872,49.2855 L 44.916247,48.967759 L 46.017333,48.831579 L 46.069307,48.428097 L 43.66394,47.121797 L 43.536351,45.03375 L 44.689411,44.978276 L 44.788661,42.72883 L 52.987688,42.168984 z M 67.051262,74.276518 L 72.81657,74.649742 L 72.618099,82.411833 L 73.36947,88.776857 L 67.254465,88.565018 L 67.051262,74.276518 z M 28.44258,74.599304 L 37.671807,75.078442 L 36.868446,80.429702 L 36.868446,84.928593 L 37.520583,87.440302 L 28.494569,87.869006 L 28.44258,74.599304 z M 87.508658,74.649742 L 87.508658,87.924488 L 81.644113,88.353194 L 81.440912,81.342592 L 80.788764,74.811143 L 87.508658,74.649742 z M 43.087416,74.947312 L 49.906548,74.972531 L 49.977434,87.278902 L 43.611966,87.389863 L 43.285891,83.400379 L 43.262266,79.441156 L 43.087416,74.947312 z "
-       id="path4735" />
-  </g>
-</svg>
diff --git a/docs/_static/jinja-horizontal.svg b/docs/_static/jinja-horizontal.svg
new file mode 100644
index 00000000..22065683
--- /dev/null
+++ b/docs/_static/jinja-horizontal.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 460 170" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g id="Name">
+        <path d="M460,121.968l-10.392,0l-4.778,-8.241l-16.603,8.958c-9.237,0 -15.448,-3.344 -18.633,-10.033c-1.593,-3.265 -2.688,-6.789 -3.285,-10.571c-0.597,-3.783 -0.896,-7.724 -0.896,-11.825c0,-4.101 0.04,-7.127 0.12,-9.078c0.079,-1.951 0.278,-4.221 0.597,-6.809c0.318,-2.588 0.776,-4.758 1.374,-6.509c0.597,-1.752 1.453,-3.564 2.568,-5.435c1.114,-1.872 2.468,-3.365 4.061,-4.479c3.583,-2.469 8.242,-3.703 13.975,-3.703l16.364,-0l15.528,-0.956l0,68.681Zm-15.528,-21.739l0,-32.011l-11.825,-0c-4.38,-0 -7.426,1.672 -9.138,5.017c-1.712,3.344 -2.568,8.341 -2.568,14.99c0,6.649 0.816,11.327 2.449,14.035c1.632,2.707 4.718,4.061 9.257,4.061l11.825,-6.092Z" style="fill-rule:nonzero;"/>
+        <path d="M395.738,56.273l0,68.204c0,4.857 -1.533,9.038 -4.598,12.542c-3.066,3.503 -7.585,5.255 -13.558,5.255l-8.839,0l0,-13.139l5.973,0c3.663,0 5.494,-1.871 5.494,-5.614l0,-67.248l15.528,0Zm-7.644,-28.547c3.742,-0 6.171,0.577 7.286,1.732c1.115,1.154 1.672,3.583 1.672,7.286c0,3.703 -0.577,6.131 -1.732,7.286c-1.155,1.155 -3.583,1.732 -7.286,1.732c-3.703,0 -6.132,-0.597 -7.286,-1.792c-1.155,-1.194 -1.732,-3.623 -1.732,-7.286c-0,-3.663 0.577,-6.072 1.732,-7.226c1.154,-1.155 3.603,-1.732 7.346,-1.732Z" style="fill-rule:nonzero;"/>
+        <path d="M364.682,121.968l-15.528,0l0,-43.597c0,-3.902 -0.796,-6.57 -2.389,-8.003c-1.592,-1.433 -3.822,-2.15 -6.689,-2.15l-13.975,5.853l0,47.897l-15.528,0l0,-68.203l11.587,-0l3.583,8.122l19.111,-8.839c5.336,0 9.974,1.971 13.916,5.913c3.941,3.942 5.912,9.695 5.912,17.26l0,45.747Z" style="fill-rule:nonzero;"/>
+        <path d="M286.804,27.726c3.742,-0 6.171,0.577 7.286,1.732c1.115,1.154 1.672,3.583 1.672,7.286c0,3.703 -0.577,6.131 -1.732,7.286c-1.155,1.155 -3.583,1.732 -7.286,1.732c-3.703,0 -6.132,-0.597 -7.286,-1.792c-1.155,-1.194 -1.732,-3.623 -1.732,-7.286c-0,-3.663 0.577,-6.072 1.732,-7.226c1.154,-1.155 3.603,-1.732 7.346,-1.732Zm7.644,94.242l-15.528,0l0,-65.695l15.528,0l0,65.695Z" style="fill-rule:nonzero;"/>
+        <path d="M262.556,36.923l0,54.706c0,11.387 -2.349,19.41 -7.047,24.069c-4.698,4.658 -11.507,6.987 -20.425,6.987c-5.734,0 -10.532,-0.756 -14.394,-2.269c-3.862,-1.513 -7.425,-3.902 -10.69,-7.167l9.317,-10.153c1.353,1.354 3.404,2.488 6.151,3.404c2.747,0.916 5.893,1.374 9.436,1.374c3.544,-0 6.271,-0.856 8.182,-2.568c1.912,-1.712 2.867,-4.917 2.867,-9.616l0,-58.767l16.603,0Z" style="fill-rule:nonzero;"/>
+    </g>
+    <g id="Icon">
+        <path id="Box" d="M170,17l0,136c0,9.383 -7.617,17 -17,17l-136,0c-9.383,0 -17,-7.617 -17,-17l0,-136c0,-9.383 7.617,-17 17,-17l136,0c9.383,0 17,7.617 17,17Z" style="fill:url(#_Linear1);"/>
+        <path id="Shadow" d="M170,83.945l0,69.055c0,9.383 -7.617,17 -17,17l-56.093,0l-40.75,-40.75c0.613,0.531 1.446,0.862 2.353,0.862l5.603,-0c1.846,-0 3.385,-1.369 3.385,-3.012l0,-32.034c0,-0.328 0.308,-0.602 0.678,-0.602l34.598,-0.055c0.37,0 0.677,0.274 0.677,0.603l0,32.197c0,1.643 1.539,3.012 3.386,3.012l5.603,0c1.846,0 3.386,-1.369 3.386,-3.012l-0,-32.252c-0,-0.329 0.307,-0.603 0.677,-0.603c-0,0 8.619,-0.054 8.742,-0.109c0.369,-0.219 0.615,-0.602 0.615,-1.04l0,-4.819c0,-0.657 -0.615,-1.205 -1.416,-1.205l-8.557,0l0,-0.055l-0.061,0l-0,-1.807c-0,-0.328 0.307,-0.602 0.677,-0.602l7.941,0c0.739,0 1.355,-0.548 1.355,-1.205l-0,-4.873c-0,-0.657 -0.616,-1.205 -1.355,-1.205l-7.941,0c-0.37,0 -0.677,-0.274 -0.677,-0.602l-0,-3.121c-0,-0.767 0.738,-1.479 1.723,-1.479l1.047,0c0.739,0 1.17,-0.712 1.354,-1.424l1.047,-3.23c0.123,-0.438 0.554,-0.822 1.046,-0.986c7.942,-1.752 11.205,-6.954 13.914,-15.113l-0,-0.055c0.143,-0.97 -0.088,-1.571 -0.426,-1.948l34.469,34.469Zm-127.748,-20.809c1.483,1.288 3.234,2.35 5.3,3.073c0.431,0.164 0.923,0.328 1.354,0.438c0.616,0.109 0.862,0.602 0.985,0.931l1.047,3.23c0.185,0.767 0.739,1.424 1.354,1.424l1.047,0c0.923,0 1.662,0.657 1.724,1.479l-0,2.235l-12.811,-12.81Zm3.266,21.25c0.244,0.204 0.571,0.331 0.926,0.331l7.942,0c0.369,0 0.677,0.274 0.677,0.602l-0,1.315c-0,0.328 -0.308,0.602 -0.677,0.602l-6.018,-0l-2.85,-2.85Zm0.012,9.775c0.184,0.182 0.42,0.303 0.668,0.303l8.249,0c0.369,0 0.677,0.274 0.677,0.602l0,8.69l-9.594,-9.595Zm58.044,-22.038l0,4.764c0,0.657 -0.43,1.15 -0.985,1.15l-11.081,-0c-0.554,-0 -0.985,-0.493 -0.985,-1.15l0,-4.764c0,-0.603 0.431,-1.15 0.985,-1.15l11.081,-0c0.493,0.054 0.985,0.547 0.985,1.15Zm-22.839,-0l-0,4.764c-0,0.602 -0.431,1.15 -0.985,1.15l-11.082,-0c-0.554,-0 -0.985,-0.493 -0.985,-1.15l0,-4.764c0,-0.603 0.431,-1.15 0.985,-1.15l11.082,-0c0.492,0.054 0.985,0.547 0.985,1.15Z" style="fill:#630b28;"/>
+        <path id="Icon1" serif:id="Icon" d="M134.356,48.85l-0.369,0c-18.1,6.024 -41.802,6.024 -48.389,5.914l-6.095,-0.109c-17.976,-0.657 -27.149,-7.557 -43.217,-14.73c-1.108,-0.493 -2.401,0.328 -2.278,1.478c0.123,3.943 1.17,20.48 13.544,24.806c0.431,0.164 0.923,0.328 1.354,0.438c0.616,0.109 0.862,0.602 0.985,0.931l1.047,3.23c0.185,0.767 0.739,1.424 1.354,1.424l1.047,0c0.923,0 1.662,0.657 1.724,1.479l-0,3.121c-0,0.328 -0.308,0.602 -0.677,0.602l-7.942,0c-0.739,0 -1.354,0.548 -1.354,1.205l-0,4.873c-0,0.657 0.615,1.205 1.354,1.205l7.942,0c0.369,0 0.677,0.274 0.677,0.602l-0,1.315c-0,0.328 -0.308,0.602 -0.677,0.602l-7.942,-0c-0.739,0.055 -1.293,0.547 -1.293,1.205l0,4.873c0,0.548 0.493,1.15 1.047,1.15l8.249,0c0.369,0 0.677,0.274 0.677,0.602l0,32.034c0,1.643 1.539,3.012 3.386,3.012l5.603,-0c1.846,-0 3.385,-1.369 3.385,-3.012l0,-32.034c0,-0.328 0.308,-0.602 0.678,-0.602l34.598,-0.055c0.37,0 0.677,0.274 0.677,0.603l0,32.197c0,1.643 1.539,3.012 3.386,3.012l5.603,0c1.846,0 3.386,-1.369 3.386,-3.012l-0,-32.252c-0,-0.329 0.307,-0.603 0.677,-0.603c-0,0 8.619,-0.054 8.742,-0.109c0.369,-0.219 0.615,-0.602 0.615,-1.04l0,-4.819c0,-0.657 -0.615,-1.205 -1.416,-1.205l-8.557,0l0,-0.055l-0.061,0l-0,-1.807c-0,-0.328 0.307,-0.602 0.677,-0.602l7.941,0c0.739,0 1.355,-0.548 1.355,-1.205l-0,-4.873c-0,-0.657 -0.616,-1.205 -1.355,-1.205l-7.941,0c-0.37,0 -0.677,-0.274 -0.677,-0.602l-0,-3.121c-0,-0.767 0.738,-1.479 1.723,-1.479l1.047,0c0.739,0 1.17,-0.712 1.354,-1.424l1.047,-3.23c0.123,-0.438 0.554,-0.822 1.046,-0.986c7.942,-1.752 11.205,-6.954 13.914,-15.113l-0,-0.055c0.307,-2.081 -1.108,-2.464 -1.601,-2.574Zm-30.782,23.273l0,4.764c0,0.657 -0.43,1.15 -0.985,1.15l-11.081,-0c-0.554,-0 -0.985,-0.493 -0.985,-1.15l0,-4.764c0,-0.603 0.431,-1.15 0.985,-1.15l11.081,-0c0.493,0.054 0.985,0.547 0.985,1.15Zm-22.839,-0l-0,4.764c-0,0.602 -0.431,1.15 -0.985,1.15l-11.082,-0c-0.554,-0 -0.985,-0.493 -0.985,-1.15l0,-4.764c0,-0.603 0.431,-1.15 0.985,-1.15l11.082,-0c0.492,0.054 0.985,0.547 0.985,1.15Z" style="fill:#fff;fill-rule:nonzero;"/>
+    </g>
+    <defs>
+        <linearGradient id="_Linear1" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.04095e-14,170,-170,1.04095e-14,90.9806,0)"><stop offset="0" style="stop-color:#f6cadc;stop-opacity:1"/><stop offset="1" style="stop-color:#7f0d18;stop-opacity:1"/></linearGradient>
+    </defs>
+</svg>
diff --git a/docs/_static/jinja-icon.svg b/docs/_static/jinja-icon.svg
new file mode 100644
index 00000000..0700e8d8
--- /dev/null
+++ b/docs/_static/jinja-icon.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 500 500" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <rect id="Icon" x="0" y="0" width="500" height="500" style="fill:none;"/>
+    <clipPath id="_clip1">
+        <rect x="0" y="0" width="500" height="500"/>
+    </clipPath>
+    <g clip-path="url(#_clip1)">
+        <path d="M491.941,72.796l-1.81,-0c-88.724,29.526 -204.909,29.526 -237.199,28.989l-29.877,-0.536c-88.119,-3.222 -133.085,-37.043 -211.849,-72.206c-5.432,-2.416 -11.77,1.61 -11.166,7.247c0.604,19.327 5.734,100.39 66.392,121.596c2.112,0.805 4.526,1.61 6.639,2.147c3.018,0.537 4.225,2.953 4.828,4.563l5.131,15.837c0.905,3.758 3.621,6.979 6.639,6.979l5.13,0c4.527,0 8.148,3.221 8.45,7.248l-0,15.3c-0,1.61 -1.509,2.953 -3.32,2.953l-38.929,-0c-3.622,-0 -6.64,2.684 -6.64,5.905l0,23.89c0,3.221 3.018,5.905 6.64,5.905l38.929,-0c1.811,-0 3.32,1.342 3.32,2.953l-0,6.442c-0,1.61 -1.509,2.952 -3.32,2.952l-38.929,0c-3.622,0.269 -6.338,2.685 -6.338,5.906l0,23.889c0,2.685 2.414,5.637 5.13,5.637l40.439,0c1.811,0 3.32,1.342 3.32,2.953l-0,157.027c-0,8.053 7.544,14.764 16.597,14.764l27.462,-0c9.054,-0 16.598,-6.711 16.598,-14.764l0,-157.027c0,-1.611 1.509,-2.953 3.32,-2.953l169.6,-0.268c1.811,-0 3.32,1.342 3.32,2.952l-0,157.833c-0,8.053 7.544,14.764 16.598,14.764l27.462,-0c9.053,-0 16.598,-6.711 16.598,-14.764l-0,-158.101c-0,-1.611 1.508,-2.953 3.319,-2.953c0,0 42.249,-0.268 42.853,-0.537c1.811,-1.073 3.018,-2.952 3.018,-5.1l-0,-23.621c-0,-3.221 -3.018,-5.905 -6.941,-5.905l-41.948,-0l0,-0.269l-0.301,0l-0,-8.857c-0,-1.611 1.508,-2.953 3.319,-2.953l38.93,-0c3.621,-0 6.639,-2.684 6.639,-5.905l-0,-23.89c-0,-3.221 -3.018,-5.905 -6.639,-5.905l-38.93,-0c-1.811,-0 -3.319,-1.343 -3.319,-2.953l-0,-15.3c-0,-3.758 3.621,-7.248 8.449,-7.248l5.131,0c3.621,0 5.733,-3.489 6.639,-6.979l5.13,-15.837c0.604,-2.147 2.716,-4.026 5.13,-4.831c38.93,-8.59 54.924,-34.09 68.203,-74.085l-0,-0.268c1.508,-10.2 -5.432,-12.079 -7.847,-12.616Zm-150.89,114.08l0,23.352c0,3.221 -2.112,5.637 -4.828,5.637l-54.321,0c-2.716,0 -4.828,-2.416 -4.828,-5.637l-0,-23.352c-0,-2.953 2.112,-5.637 4.828,-5.637l54.321,-0c2.414,0.268 4.828,2.684 4.828,5.637Zm-111.96,-0l-0,23.352c-0,2.953 -2.112,5.637 -4.828,5.637l-54.321,0c-2.716,0 -4.828,-2.416 -4.828,-5.637l-0,-23.352c-0,-2.953 2.112,-5.637 4.828,-5.637l54.321,-0c2.414,0.268 4.828,2.684 4.828,5.637Z" style="fill:#7e0c1b;fill-rule:nonzero;"/>
+    </g>
+</svg>
diff --git a/docs/_static/jinja-logo-sidebar.png b/docs/_static/jinja-logo-sidebar.png
deleted file mode 100644
index 455b4c3c..00000000
Binary files a/docs/_static/jinja-logo-sidebar.png and /dev/null differ
diff --git a/docs/_static/jinja-logo.png b/docs/_static/jinja-logo.png
deleted file mode 100644
index 7f8ca5bb..00000000
Binary files a/docs/_static/jinja-logo.png and /dev/null differ
diff --git a/docs/_static/jinja-vertical.svg b/docs/_static/jinja-vertical.svg
new file mode 100644
index 00000000..08f54e66
--- /dev/null
+++ b/docs/_static/jinja-vertical.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 250 405" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g id="Name">
+        <path d="M250,384.243l-10.392,-0l-4.778,-8.242l-16.603,8.958c-9.237,0 -15.448,-3.344 -18.633,-10.033c-1.593,-3.265 -2.688,-6.789 -3.285,-10.571c-0.597,-3.782 -0.896,-7.724 -0.896,-11.825c0,-4.101 0.04,-7.127 0.12,-9.078c0.079,-1.951 0.278,-4.22 0.597,-6.808c0.318,-2.588 0.776,-4.758 1.374,-6.51c0.597,-1.752 1.453,-3.564 2.568,-5.435c1.114,-1.871 2.468,-3.364 4.061,-4.479c3.583,-2.469 8.242,-3.703 13.975,-3.703l16.364,-0l15.528,-0.956l-0,68.682Zm-15.528,-21.739l0,-32.012l-11.825,0c-4.38,0 -7.426,1.672 -9.138,5.017c-1.712,3.344 -2.568,8.341 -2.568,14.99c0,6.649 0.816,11.328 2.449,14.035c1.632,2.708 4.718,4.061 9.257,4.061l11.825,-6.091Z" style="fill-rule:nonzero;"/>
+        <path d="M185.738,318.548l0,68.203c0,4.858 -1.533,9.038 -4.598,12.542c-3.066,3.504 -7.585,5.255 -13.558,5.255l-8.839,0l0,-13.139l5.973,0c3.663,0 5.494,-1.871 5.494,-5.613l0,-67.248l15.528,-0Zm-7.644,-28.548c3.742,0 6.171,0.577 7.286,1.732c1.115,1.155 1.672,3.583 1.672,7.286c0,3.703 -0.577,6.132 -1.732,7.286c-1.155,1.155 -3.583,1.732 -7.286,1.732c-3.703,0 -6.132,-0.597 -7.286,-1.791c-1.155,-1.195 -1.732,-3.624 -1.732,-7.287c-0,-3.663 0.577,-6.071 1.732,-7.226c1.154,-1.155 3.603,-1.732 7.346,-1.732Z" style="fill-rule:nonzero;"/>
+        <path d="M154.682,384.243l-15.528,-0l0,-43.598c0,-3.902 -0.796,-6.57 -2.389,-8.003c-1.592,-1.433 -3.822,-2.15 -6.689,-2.15l-13.975,5.853l0,47.898l-15.528,-0l0,-68.204l11.587,0l3.583,8.122l19.111,-8.838c5.336,-0 9.974,1.97 13.916,5.912c3.941,3.942 5.912,9.695 5.912,17.26l0,45.748Z" style="fill-rule:nonzero;"/>
+        <path d="M76.804,290c3.742,0 6.171,0.577 7.286,1.732c1.115,1.155 1.672,3.583 1.672,7.286c0,3.703 -0.577,6.132 -1.732,7.286c-1.155,1.155 -3.583,1.732 -7.286,1.732c-3.703,0 -6.132,-0.597 -7.286,-1.791c-1.155,-1.195 -1.732,-3.624 -1.732,-7.287c-0,-3.663 0.577,-6.071 1.732,-7.226c1.154,-1.155 3.603,-1.732 7.346,-1.732Zm7.644,94.243l-15.528,-0l0,-65.695l15.528,-0l0,65.695Z" style="fill-rule:nonzero;"/>
+        <path d="M52.556,299.197l0,54.706c0,11.388 -2.349,19.41 -7.047,24.069c-4.698,4.658 -11.507,6.987 -20.425,6.987c-5.734,0 -10.532,-0.756 -14.394,-2.269c-3.862,-1.513 -7.425,-3.902 -10.69,-7.167l9.317,-10.153c1.353,1.354 3.404,2.489 6.151,3.404c2.747,0.916 5.893,1.374 9.436,1.374c3.544,0 6.271,-0.856 8.182,-2.568c1.912,-1.712 2.867,-4.917 2.867,-9.615l0,-58.768l16.603,0Z" style="fill-rule:nonzero;"/>
+    </g>
+    <g id="Icon">
+        <path id="Box" d="M250,25l0,200c0,13.798 -11.202,25 -25,25l-200,0c-13.798,0 -25,-11.202 -25,-25l0,-200c0,-13.798 11.202,-25 25,-25l200,0c13.798,0 25,11.202 25,25Z" style="fill:url(#_Linear1);"/>
+        <path id="Shadow" d="M250,123.448l0,101.552c0,13.798 -11.202,25 -25,25l-82.49,0l-59.926,-59.926c0.901,0.781 2.126,1.267 3.461,1.267l8.238,-0c2.716,-0 4.979,-2.013 4.979,-4.429l0,-47.109c0,-0.483 0.453,-0.885 0.996,-0.885l50.88,-0.081c0.544,0 0.996,0.403 0.996,0.886l0,47.35c0,2.416 2.264,4.429 4.98,4.429l8.238,-0c2.716,-0 4.98,-2.013 4.98,-4.429l-0,-47.431c-0,-0.483 0.452,-0.885 0.996,-0.885c-0,-0 12.674,-0.081 12.855,-0.161c0.544,-0.323 0.906,-0.886 0.906,-1.53l-0,-7.087c-0,-0.966 -0.906,-1.771 -2.083,-1.771l-12.584,-0l0,-0.081l-0.09,0l-0,-2.657c-0,-0.484 0.452,-0.886 0.996,-0.886l11.678,-0c1.087,-0 1.992,-0.805 1.992,-1.772l0,-7.167c0,-0.966 -0.905,-1.771 -1.992,-1.771l-11.678,-0c-0.544,-0 -0.996,-0.403 -0.996,-0.886l-0,-4.59c-0,-1.127 1.086,-2.174 2.535,-2.174l1.539,-0c1.086,-0 1.72,-1.047 1.991,-2.094l1.54,-4.751c0.181,-0.644 0.814,-1.208 1.539,-1.45c11.678,-2.576 16.477,-10.226 20.46,-22.225l0,-0.081c0.211,-1.426 -0.129,-2.31 -0.625,-2.864l50.689,50.689Zm-187.864,-30.601c2.181,1.893 4.755,3.456 7.793,4.519c0.634,0.241 1.358,0.483 1.992,0.644c0.906,0.161 1.268,0.886 1.449,1.369l1.539,4.751c0.271,1.127 1.086,2.094 1.992,2.094l1.539,-0c1.358,-0 2.444,0.966 2.535,2.174l-0,3.287l-18.839,-18.838Zm4.802,31.249c0.358,0.301 0.839,0.488 1.362,0.488l11.679,-0c0.543,-0 0.996,0.402 0.996,0.886l-0,1.932c-0,0.483 -0.453,0.886 -0.996,0.886l-8.849,0l-4.192,-4.192Zm0.017,14.376c0.272,0.268 0.618,0.446 0.983,0.446l12.131,-0c0.543,-0 0.996,0.402 0.996,0.885l0,12.779l-14.11,-14.11Zm85.36,-32.409l0,7.006c0,0.966 -0.633,1.691 -1.448,1.691l-16.296,-0c-0.815,-0 -1.449,-0.725 -1.449,-1.691l0,-7.006c0,-0.886 0.634,-1.691 1.449,-1.691l16.296,-0c0.724,0.08 1.448,0.805 1.448,1.691Zm-33.588,-0l0,7.006c0,0.885 -0.633,1.691 -1.448,1.691l-16.296,-0c-0.815,-0 -1.449,-0.725 -1.449,-1.691l0,-7.006c0,-0.886 0.634,-1.691 1.449,-1.691l16.296,-0c0.724,0.08 1.448,0.805 1.448,1.691Z" style="fill:#630b28;"/>
+        <path id="Icon1" serif:id="Icon" d="M197.582,71.839l-0.543,-0c-26.617,8.858 -61.472,8.858 -71.16,8.697l-8.962,-0.161c-26.436,-0.967 -39.926,-11.113 -63.555,-21.662c-1.63,-0.725 -3.531,0.483 -3.35,2.174c0.181,5.798 1.72,30.117 19.917,36.479c0.634,0.241 1.358,0.483 1.992,0.644c0.906,0.161 1.268,0.886 1.449,1.369l1.539,4.751c0.271,1.127 1.086,2.094 1.992,2.094l1.539,-0c1.358,-0 2.444,0.966 2.535,2.174l-0,4.59c-0,0.483 -0.453,0.886 -0.996,0.886l-11.679,-0c-1.087,-0 -1.992,0.805 -1.992,1.771l0,7.167c0,0.967 0.905,1.772 1.992,1.772l11.679,-0c0.543,-0 0.996,0.402 0.996,0.886l-0,1.932c-0,0.483 -0.453,0.886 -0.996,0.886l-11.679,0c-1.087,0.081 -1.901,0.805 -1.901,1.772l-0,7.167c-0,0.805 0.724,1.691 1.539,1.691l12.131,-0c0.543,-0 0.996,0.402 0.996,0.885l0,47.109c0,2.416 2.264,4.429 4.98,4.429l8.238,-0c2.716,-0 4.979,-2.013 4.979,-4.429l0,-47.109c0,-0.483 0.453,-0.885 0.996,-0.885l50.88,-0.081c0.544,0 0.996,0.403 0.996,0.886l0,47.35c0,2.416 2.264,4.429 4.98,4.429l8.238,-0c2.716,-0 4.98,-2.013 4.98,-4.429l-0,-47.431c-0,-0.483 0.452,-0.885 0.996,-0.885c-0,-0 12.674,-0.081 12.855,-0.161c0.544,-0.323 0.906,-0.886 0.906,-1.53l-0,-7.087c-0,-0.966 -0.906,-1.771 -2.083,-1.771l-12.584,-0l0,-0.081l-0.09,0l-0,-2.657c-0,-0.484 0.452,-0.886 0.996,-0.886l11.678,-0c1.087,-0 1.992,-0.805 1.992,-1.772l0,-7.167c0,-0.966 -0.905,-1.771 -1.992,-1.771l-11.678,-0c-0.544,-0 -0.996,-0.403 -0.996,-0.886l-0,-4.59c-0,-1.127 1.086,-2.174 2.535,-2.174l1.539,-0c1.086,-0 1.72,-1.047 1.991,-2.094l1.54,-4.751c0.181,-0.644 0.814,-1.208 1.539,-1.45c11.678,-2.576 16.477,-10.226 20.46,-22.225l0,-0.081c0.453,-3.06 -1.629,-3.623 -2.354,-3.784Zm-45.267,34.224l0,7.006c0,0.966 -0.633,1.691 -1.448,1.691l-16.296,-0c-0.815,-0 -1.449,-0.725 -1.449,-1.691l0,-7.006c0,-0.886 0.634,-1.691 1.449,-1.691l16.296,-0c0.724,0.08 1.448,0.805 1.448,1.691Zm-33.588,-0l0,7.006c0,0.885 -0.633,1.691 -1.448,1.691l-16.296,-0c-0.815,-0 -1.449,-0.725 -1.449,-1.691l0,-7.006c0,-0.886 0.634,-1.691 1.449,-1.691l16.296,-0c0.724,0.08 1.448,0.805 1.448,1.691Z" style="fill:#fff;fill-rule:nonzero;"/>
+    </g>
+    <defs>
+        <linearGradient id="_Linear1" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.53081e-14,250,-250,1.53081e-14,133.795,0)"><stop offset="0" style="stop-color:#f6cadc;stop-opacity:1"/><stop offset="1" style="stop-color:#7f0d18;stop-opacity:1"/></linearGradient>
+    </defs>
+</svg>
diff --git a/docs/conf.py b/docs/conf.py
index 280610e5..ec264ed9 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -49,7 +49,7 @@ html_sidebars = {
 }
 singlehtml_sidebars = {"index": ["project.html", "localtoc.html", "ethicalads.html"]}
 html_static_path = ["_static"]
-html_favicon = "_static/jinja-logo-sidebar.png"
-html_logo = "_static/jinja-logo-sidebar.png"
+html_favicon = "_static/jinja-icon.svg"
+html_logo = "_static/jinja-vertical.svg"
 html_title = f"Jinja Documentation ({version})"
 html_show_sourcelink = False
diff --git a/docs/index.rst b/docs/index.rst
index 4ce20719..15794205 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -3,9 +3,9 @@
 Jinja
 =====
 
-.. image:: _static/jinja-logo.png
+.. image:: _static/jinja-horizontal.svg
     :align: center
-    :target: https://palletsprojects.com/p/jinja/
+    :height: 200px
 
 Jinja is a fast, expressive, extensible templating engine. Special
 placeholders in the template allow writing code similar to Python