diff --git a/images/addons/jinja.svg b/images/addons/jinja.svg
new file mode 100644
index 0000000000..0bc9ea4e8b
--- /dev/null
+++ b/images/addons/jinja.svg
@@ -0,0 +1,132 @@
+<?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/images/addons/map.png b/images/addons/map.png
deleted file mode 100644
index 38e6ed90d1..0000000000
Binary files a/images/addons/map.png and /dev/null differ
diff --git a/images/addons/map.svg b/images/addons/map.svg
new file mode 100644
index 0000000000..86112957af
--- /dev/null
+++ b/images/addons/map.svg
@@ -0,0 +1 @@
+<?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 512 512" 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 x="0" y="0" width="512" height="512" style="fill:#fff;"/><g transform="matrix(1,0,0,1,9,35)"><g transform="matrix(72,0,0,72,68.9911,277.622)"><path d="M0.394,-0l-0.138,-0l0,-0.517c-0.05,0.047 -0.109,0.081 -0.177,0.104l0,-0.125c0.036,-0.011 0.075,-0.034 0.117,-0.066c0.042,-0.033 0.071,-0.071 0.086,-0.115l0.112,0l-0,0.719Z" style="fill:#f00;fill-rule:nonzero;"/></g><g transform="matrix(72,0,0,72,109.034,277.622)"><path d="M0.042,-0.398l-0,-0.126l0.5,-0l-0,0.126l-0.5,-0Zm-0,0.216l-0,-0.126l0.5,-0l-0,0.126l-0.5,0Z" style="fill-opacity:0.37;fill-rule:nonzero;"/></g><g transform="matrix(72,0,0,72,151.081,277.622)"><path d="M0.043,-0.354c0,-0.072 0.011,-0.134 0.033,-0.183c0.016,-0.037 0.039,-0.069 0.067,-0.098c0.028,-0.029 0.059,-0.051 0.092,-0.065c0.045,-0.019 0.096,-0.028 0.155,-0.028c0.105,-0 0.19,0.033 0.253,0.098c0.063,0.066 0.095,0.157 0.095,0.273c-0,0.116 -0.032,0.206 -0.094,0.271c-0.063,0.066 -0.147,0.098 -0.252,0.098c-0.107,0 -0.191,-0.032 -0.254,-0.097c-0.063,-0.065 -0.095,-0.155 -0.095,-0.269Zm0.149,-0.004c0,0.081 0.019,0.142 0.057,0.184c0.037,0.042 0.084,0.063 0.142,0.063c0.058,-0 0.105,-0.021 0.142,-0.063c0.037,-0.041 0.055,-0.103 0.055,-0.186c0,-0.082 -0.018,-0.144 -0.054,-0.184c-0.036,-0.04 -0.083,-0.06 -0.143,-0.06c-0.059,-0 -0.107,0.02 -0.144,0.061c-0.036,0.041 -0.055,0.102 -0.055,0.185Z" style="fill-rule:nonzero;"/></g><g transform="matrix(72,0,0,72,207.085,277.622)"><path d="M0.074,-0l0,-0.716l0.141,0l0.293,0.478l-0,-0.478l0.134,0l0,0.716l-0.145,-0l-0.289,-0.467l0,0.467l-0.134,-0Z" style="fill-rule:nonzero;"/></g><g transform="matrix(72,0,0,72,68.9911,351.978)"><path d="M0.274,-0.719c0.07,0 0.124,0.025 0.163,0.074c0.047,0.059 0.07,0.156 0.07,0.292c-0,0.135 -0.024,0.233 -0.07,0.292c-0.039,0.049 -0.093,0.073 -0.163,0.073c-0.069,0 -0.125,-0.027 -0.168,-0.08c-0.043,-0.054 -0.064,-0.149 -0.064,-0.286c-0,-0.135 0.023,-0.232 0.07,-0.292c0.039,-0.048 0.093,-0.073 0.162,-0.073Zm0,0.114c-0.016,0 -0.031,0.005 -0.044,0.016c-0.013,0.01 -0.023,0.029 -0.03,0.057c-0.01,0.035 -0.014,0.095 -0.014,0.179c-0,0.084 0.004,0.142 0.012,0.173c0.009,0.031 0.019,0.052 0.032,0.063c0.013,0.01 0.028,0.015 0.044,0.015c0.017,0 0.032,-0.005 0.045,-0.015c0.013,-0.011 0.023,-0.03 0.03,-0.057c0.01,-0.035 0.014,-0.095 0.014,-0.179c0,-0.084 -0.004,-0.142 -0.012,-0.173c-0.009,-0.032 -0.02,-0.053 -0.032,-0.063c-0.013,-0.011 -0.028,-0.016 -0.045,-0.016Z" style="fill:#f00;fill-rule:nonzero;"/></g><g transform="matrix(72,0,0,72,109.034,351.978)"><path d="M0.042,-0.398l-0,-0.126l0.5,-0l-0,0.126l-0.5,-0Zm-0,0.216l-0,-0.126l0.5,-0l-0,0.126l-0.5,0Z" style="fill-opacity:0.37;fill-rule:nonzero;"/></g><g transform="matrix(72,0,0,72,151.081,351.978)"><path d="M0.043,-0.354c0,-0.072 0.011,-0.134 0.033,-0.183c0.016,-0.037 0.039,-0.069 0.067,-0.098c0.028,-0.029 0.059,-0.051 0.092,-0.065c0.045,-0.019 0.096,-0.028 0.155,-0.028c0.105,-0 0.19,0.033 0.253,0.098c0.063,0.066 0.095,0.157 0.095,0.273c-0,0.116 -0.032,0.206 -0.094,0.271c-0.063,0.066 -0.147,0.098 -0.252,0.098c-0.107,0 -0.191,-0.032 -0.254,-0.097c-0.063,-0.065 -0.095,-0.155 -0.095,-0.269Zm0.149,-0.004c0,0.081 0.019,0.142 0.057,0.184c0.037,0.042 0.084,0.063 0.142,0.063c0.058,-0 0.105,-0.021 0.142,-0.063c0.037,-0.041 0.055,-0.103 0.055,-0.186c0,-0.082 -0.018,-0.144 -0.054,-0.184c-0.036,-0.04 -0.083,-0.06 -0.143,-0.06c-0.059,-0 -0.107,0.02 -0.144,0.061c-0.036,0.041 -0.055,0.102 -0.055,0.185Z" style="fill-rule:nonzero;"/></g><g transform="matrix(72,0,0,72,207.085,351.978)"><path d="M0.074,-0l-0,-0.716l0.49,0l0,0.121l-0.346,0l0,0.17l0.299,-0l0,0.121l-0.299,-0l0,0.304l-0.144,-0Z" style="fill-rule:nonzero;"/></g><g transform="matrix(72,0,0,72,251.065,351.978)"><path d="M0.074,-0l-0,-0.716l0.49,0l0,0.121l-0.346,0l0,0.17l0.299,-0l0,0.121l-0.299,-0l0,0.304l-0.144,-0Z" style="fill-rule:nonzero;"/></g></g><path d="M196.216,220.203c-0.318,2.334 -1.166,4.323 -2.545,5.967c-1.38,1.644 -2.971,2.785 -4.774,3.421c-1.803,0.636 -3.66,0.663 -5.569,0.08c-1.909,-0.584 -3.501,-1.989 -4.774,-4.217c-1.06,-1.803 -1.67,-3.686 -1.829,-5.649c-0.159,-1.962 -0.345,-4.004 -0.557,-6.126c-0.212,-2.333 -0.451,-4.375 -0.716,-6.126c-0.265,-1.75 -0.557,-3.792 -0.875,-6.126c-0.955,-6.364 -2.016,-12.649 -3.183,-18.855c-1.167,-6.205 -2.493,-12.437 -3.978,-18.696c-2.121,5.304 -4.137,10.555 -6.046,15.753c-1.909,5.197 -3.819,10.448 -5.728,15.752c-1.485,3.925 -2.944,7.876 -4.376,11.854c-1.432,3.978 -3.103,7.823 -5.012,11.536c-0.637,1.273 -1.697,2.307 -3.182,3.103c-1.485,0.795 -3.077,1.246 -4.774,1.352c-1.697,0.106 -3.288,-0.132 -4.773,-0.716c-1.485,-0.583 -2.599,-1.564 -3.342,-2.943c-4.561,-8.805 -9.069,-17.556 -13.525,-26.254c-4.455,-8.699 -8.91,-17.45 -13.365,-26.255c-0.531,5.41 -1.008,10.847 -1.432,16.31c-0.425,5.463 -0.902,10.899 -1.432,16.309c-0.107,1.697 -0.213,3.766 -0.319,6.206c-0.106,2.439 -0.291,4.906 -0.557,7.399c-0.265,2.492 -0.583,4.879 -0.954,7.16c-0.372,2.28 -0.982,4.057 -1.83,5.33c-1.273,2.122 -2.944,3.501 -5.012,4.137c-2.069,0.637 -4.084,0.69 -6.047,0.159c-1.962,-0.53 -3.606,-1.617 -4.932,-3.262c-1.326,-1.644 -1.936,-3.739 -1.83,-6.285c0.212,-4.349 0.583,-8.645 1.114,-12.888c0.53,-4.243 1.007,-8.539 1.432,-12.888c0.848,-9.441 1.723,-18.829 2.625,-28.164c0.902,-9.335 1.777,-18.776 2.626,-28.323c0.212,-2.758 0.769,-5.303 1.67,-7.637c0.902,-2.334 2.838,-3.978 5.808,-4.933c1.167,-0.424 2.387,-0.583 3.66,-0.477c1.273,0.106 2.439,0.477 3.5,1.114c2.334,1.485 4.164,3.527 5.49,6.126c1.326,2.599 2.572,5.065 3.739,7.399c2.015,3.818 3.978,7.664 5.887,11.535c1.91,3.872 3.819,7.718 5.728,11.536c2.334,4.88 4.694,9.68 7.081,14.4c2.387,4.721 4.853,9.468 7.399,14.241c0.636,-1.591 1.246,-3.182 1.83,-4.773c0.583,-1.591 1.193,-3.183 1.83,-4.774c1.166,-2.758 2.254,-5.542 3.262,-8.353c1.007,-2.811 2.042,-5.596 3.102,-8.354c1.485,-3.607 2.891,-7.16 4.217,-10.661c1.326,-3.5 2.625,-7.054 3.898,-10.66c1.061,-2.652 2.069,-5.516 3.023,-8.593c0.955,-3.076 2.493,-5.675 4.615,-7.796c1.485,-1.592 3.103,-2.546 4.853,-2.864c1.75,-0.319 3.394,-0.186 4.932,0.397c1.539,0.584 2.918,1.565 4.137,2.944c1.22,1.379 2.095,2.97 2.626,4.773c0.636,2.44 1.379,5.198 2.227,8.274c0.849,3.077 1.592,5.835 2.228,8.274c1.167,4.456 2.228,8.831 3.182,13.128c0.955,4.296 1.857,8.671 2.705,13.127c1.485,7.319 2.785,14.559 3.899,21.719c1.114,7.16 2.095,14.4 2.943,21.719l0,1.114Z" style="fill-rule:nonzero;"/><path d="M290.095,219.726c-0.318,2.333 -1.114,4.322 -2.387,5.967c-1.273,1.644 -2.731,2.784 -4.376,3.421c-1.644,0.636 -3.394,0.716 -5.25,0.238c-1.857,-0.477 -3.581,-1.723 -5.172,-3.739c-1.379,-1.697 -2.148,-3.58 -2.307,-5.649c-0.159,-2.068 -0.451,-4.11 -0.875,-6.126c-1.061,-5.834 -2.599,-11.827 -4.614,-17.98c-6.577,0.106 -13.101,0.159 -19.572,0.159c-6.47,0 -12.941,0.054 -19.412,0.16c-0.955,2.758 -1.777,5.569 -2.466,8.433c-0.69,2.864 -1.353,5.675 -1.989,8.433c-0.53,2.121 -1.008,4.323 -1.432,6.603c-0.424,2.281 -1.379,4.27 -2.864,5.967c-1.804,2.122 -3.739,3.315 -5.808,3.58c-2.068,0.265 -3.925,-0.079 -5.569,-1.034c-1.644,-0.955 -2.97,-2.413 -3.978,-4.376c-1.008,-1.962 -1.352,-4.216 -1.034,-6.762c0.318,-3.289 0.955,-6.524 1.909,-9.706c0.955,-3.183 1.857,-6.365 2.705,-9.547c4.774,-18.246 10.926,-35.907 18.458,-52.986c0.636,-1.485 1.299,-2.917 1.989,-4.296c0.689,-1.379 1.352,-2.758 1.989,-4.137c0.742,-1.485 1.485,-3.076 2.227,-4.773c0.743,-1.698 1.618,-3.262 2.626,-4.694c1.007,-1.432 2.201,-2.652 3.58,-3.66c1.379,-1.008 3.076,-1.512 5.091,-1.512c2.652,0 4.88,0.849 6.683,2.546c7.214,7.213 13.154,15.355 17.821,24.424c4.668,9.07 8.858,18.325 12.57,27.766c2.228,-0.106 4.403,-0.106 6.524,0c2.122,0.106 4.031,1.061 5.728,2.864c1.485,1.485 2.361,3.077 2.626,4.774c0.265,1.697 0.106,3.341 -0.478,4.932c-0.583,1.592 -1.538,2.971 -2.864,4.137c-1.326,1.167 -2.943,1.963 -4.853,2.387c1.061,3.713 1.989,7.505 2.785,11.377c0.795,3.872 1.458,7.77 1.989,11.695l-0,1.114Zm-32.46,-43.28c-2.015,-4.773 -4.163,-9.52 -6.444,-14.241c-2.281,-4.72 -4.853,-9.202 -7.717,-13.445c-2.122,4.667 -4.111,9.308 -5.967,13.923c-1.856,4.614 -3.58,9.308 -5.171,14.081c4.985,-0.106 9.361,-0.159 13.127,-0.159c3.766,0 7.823,-0.053 12.172,-0.159Z" style="fill-rule:nonzero;"/><path d="M306.643,134.758c0.318,-1.167 0.848,-2.307 1.591,-3.421c0.743,-1.114 1.618,-2.095 2.625,-2.944c1.008,-0.848 2.122,-1.458 3.342,-1.83c1.22,-0.371 2.466,-0.344 3.739,0.08c3.925,-1.591 7.929,-2.917 12.013,-3.978c4.084,-1.061 8.168,-1.671 12.252,-1.83c4.084,-0.159 8.115,0.212 12.093,1.114c3.978,0.902 7.823,2.572 11.536,5.012c2.97,1.91 5.596,4.296 7.876,7.16c2.281,2.864 4.164,5.888 5.649,9.07c2.546,5.728 3.713,11.43 3.5,17.105c-0.212,5.675 -1.538,10.952 -3.977,15.832c-2.44,4.88 -5.861,9.176 -10.263,12.888c-4.403,3.713 -9.574,6.418 -15.514,8.115c-4.455,1.273 -8.99,1.883 -13.605,1.83c-4.614,-0.053 -9.149,-0.345 -13.604,-0.875l-0,15.434c-0,1.167 0.053,2.387 0.159,3.66c0.106,1.273 0.133,2.546 0.08,3.819c-0.053,1.273 -0.213,2.519 -0.478,3.739c-0.265,1.22 -0.769,2.36 -1.511,3.421c-1.273,2.121 -2.917,3.421 -4.933,3.898c-2.015,0.478 -3.951,0.372 -5.808,-0.318c-1.856,-0.689 -3.447,-1.856 -4.773,-3.501c-1.326,-1.644 -1.989,-3.633 -1.989,-5.966l-0,-28.641c-2.016,-1.061 -3.501,-2.387 -4.455,-3.978c-0.955,-1.591 -1.379,-3.209 -1.273,-4.853c0.106,-1.644 0.636,-3.209 1.591,-4.694c0.955,-1.485 2.281,-2.705 3.978,-3.66l-0,-40.733l0.159,-0.955Zm46.303,7.001c-4.456,-1.803 -8.99,-2.334 -13.605,-1.591c-4.614,0.742 -9.096,2.121 -13.445,4.137l-0,34.687c4.986,0.849 10.077,1.061 15.275,0.637c5.198,-0.425 9.971,-2.016 14.32,-4.774c3.077,-2.015 5.198,-4.561 6.365,-7.638c1.167,-3.076 1.591,-6.205 1.273,-9.387c-0.318,-3.183 -1.379,-6.232 -3.182,-9.15c-1.804,-2.917 -4.137,-5.224 -7.001,-6.921Z" style="fill-rule:nonzero;"/><path d="M420.57,166.74c-0,4.137 -1.22,7.293 -3.66,9.468c-2.439,2.174 -5.171,3.341 -8.194,3.5c-3.023,0.159 -5.834,-0.742 -8.433,-2.705c-2.599,-1.962 -4.058,-5.012 -4.376,-9.149c-0.212,-2.758 0.239,-5.065 1.352,-6.922c1.114,-1.856 2.599,-3.288 4.456,-4.296c1.856,-1.007 3.872,-1.564 6.046,-1.67c2.175,-0.107 4.217,0.265 6.126,1.113c1.909,0.849 3.501,2.148 4.774,3.899c1.272,1.75 1.909,4.004 1.909,6.762Zm0.318,48.371c0,4.137 -1.246,7.293 -3.739,9.468c-2.493,2.174 -5.277,3.315 -8.354,3.421c-3.076,0.106 -5.913,-0.796 -8.512,-2.705c-2.599,-1.91 -4.058,-4.933 -4.376,-9.07c-0.318,-4.243 0.796,-7.452 3.341,-9.626c2.546,-2.175 5.437,-3.342 8.672,-3.501c3.236,-0.159 6.206,0.769 8.911,2.785c2.705,2.015 4.057,5.091 4.057,9.228Z" style="fill-rule:nonzero;"/></svg>
\ No newline at end of file
diff --git a/images/addons/pidcontroller.png b/images/addons/pidcontroller.png
deleted file mode 100644
index 8f5f24a11a..0000000000
Binary files a/images/addons/pidcontroller.png and /dev/null differ
diff --git a/images/addons/pidcontroller.svg b/images/addons/pidcontroller.svg
new file mode 100644
index 0000000000..ec1b2f2f0a
--- /dev/null
+++ b/images/addons/pidcontroller.svg
@@ -0,0 +1 @@
+<?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 524 346" 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-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;"><rect x="-0" y="-0" width="524" height="346" style="fill:#fff;"/><g><path d="M40,260l460,0" style="fill:none;stroke:#000;stroke-opacity:0.28;stroke-width:1px;"/><path d="M40,200l460,0" style="fill:none;stroke:#000;stroke-opacity:0.28;stroke-width:1px;"/><path d="M40,140l460,0" style="fill:none;stroke:#000;stroke-opacity:0.28;stroke-width:1px;"/><path d="M40,80l460,0" style="fill:none;stroke:#000;stroke-opacity:0.28;stroke-width:1px;"/><path d="M120,320l0,-240" style="fill:none;stroke:#000;stroke-opacity:0.28;stroke-width:1px;"/><path d="M200,320l0,-240" style="fill:none;stroke:#000;stroke-opacity:0.28;stroke-width:1px;"/><path d="M280,320l0,-240" style="fill:none;stroke:#000;stroke-opacity:0.28;stroke-width:1px;"/><path d="M360,320l0,-240" style="fill:none;stroke:#000;stroke-opacity:0.28;stroke-width:1px;"/><path d="M440,320l0,-240" style="fill:none;stroke:#000;stroke-opacity:0.28;stroke-width:1px;"/></g><path d="M40,177c0,0 17.568,-126.417 49,-125c31.432,1.417 71.5,154 134,151c44.043,-2.114 58.088,-35.972 127,-37c68.912,-1.028 90.802,11.257 142,9" style="fill:none;stroke:#449ac4;stroke-width:12px;"/><path d="M40,307c0,0 47.579,-148.588 101,-148c44.166,0.486 61.082,50.377 140,48c37.945,-1.143 48.866,-14.579 123,-14c61.121,0.477 53.181,4.299 90,3" style="fill:none;stroke:#10ad4f;stroke-width:12px;"/><path id="axes" d="M40,39l0,282l454,0" style="fill:none;stroke:#000;stroke-width:12px;"/></svg>
\ No newline at end of file
diff --git a/images/addons/pwm.png b/images/addons/pwm.png
deleted file mode 100644
index 5d4f14cfa4..0000000000
Binary files a/images/addons/pwm.png and /dev/null differ
diff --git a/images/addons/pwm.svg b/images/addons/pwm.svg
new file mode 100644
index 0000000000..0cb6925d1b
--- /dev/null
+++ b/images/addons/pwm.svg
@@ -0,0 +1 @@
+<?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-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;"><rect x="0" y="0" width="500" height="500" style="fill:#fff;"/><path d="M40,220l40,0l0,-160l80,0l0,160l40,0l0,-160l80,0l0,160l40,0l0,-160l80,0l0,160l40,0" style="fill:none;stroke:#922222;stroke-width:12px;"/><path d="M40,440l40,0l0,-160l20,0l0,160l80,0l0,-160l20,0l0,160l80,0l0,-160l20,0l0,160l80,0l0,-160l20,0l0,160l60,0" style="fill:none;stroke:#007e00;stroke-width:12px;"/></svg>
\ No newline at end of file