Index: trunk/images/presets/power/power_source-biofuel.svg
===================================================================
--- trunk/images/presets/power/power_source-biofuel.svg	(revision 10917)
+++ trunk/images/presets/power/power_source-biofuel.svg	(revision 10918)
@@ -1,4 +1,5 @@
 <?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/"
@@ -9,11 +10,11 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="20"
+   width="16"
+   height="16"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
+   inkscape:version="0.91 r13725"
    version="1.0"
-   sodipodi:docname="2020_stBN_powergensource_burn.svg"
+   sodipodi:docname="power_source-gas.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <metadata
@@ -27,4 +28,5 @@
         <cc:license
            rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:title></dc:title>
       </cc:Work>
       <cc:License
@@ -40,6 +42,6 @@
   </metadata>
   <sodipodi:namedview
-     inkscape:window-height="804"
-     inkscape:window-width="962"
+     inkscape:window-height="1018"
+     inkscape:window-width="1920"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
@@ -52,10 +54,11 @@
      id="base"
      showgrid="true"
-     inkscape:zoom="23.1"
-     inkscape:cx="9.5682046"
-     inkscape:cy="10"
-     inkscape:window-x="95"
-     inkscape:window-y="9"
-     inkscape:current-layer="svg2">
+     inkscape:zoom="32"
+     inkscape:cx="6.9004192"
+     inkscape:cy="10.644037"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:current-layer="svg2"
+     inkscape:window-maximized="1">
     <inkscape:grid
        type="xygrid"
@@ -64,28 +67,4 @@
        enabled="true" />
   </sodipodi:namedview>
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <inkscape:perspective
-       id="perspective2461"
-       inkscape:persp3d-origin="10 : 6.6666667 : 1"
-       inkscape:vp_z="20 : 10 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 10 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective2466"
-       inkscape:persp3d-origin="400 : 200 : 1"
-       inkscape:vp_z="800 : 300 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 300 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
   <sodipodi:namedview
      id="namedview10"
@@ -142,51 +121,48 @@
     </rdf:RDF>
   </metadata>
+  <ellipse
+     style="fill:#00EE76;fill-opacity:1;stroke:#000000;stroke-width:0.80000001;stroke-opacity:1"
+     id="background"
+     cx="8"
+     cy="8"
+     rx="7.6000004"
+     ry="7.5999999" />
+  <rect
+     style="fill:#000000"
+     x="5"
+     y="7"
+     width="2"
+     height="6"
+     id="rect2939" />
   <path
-     sodipodi:type="arc"
-     style="fill:#00EE76;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-     id="background"
-     sodipodi:cx="10"
-     sodipodi:cy="10"
-     sodipodi:rx="9.5"
-     sodipodi:ry="9.5"
-     d="M 19.5,10 A 9.5,9.5 0 1 1 0.5,10 A 9.5,9.5 0 1 1 19.5,10 z" />
-  <g
-     id="g2391">
-    <rect
-       id="rect2939"
-       height="8"
-       width="2"
-       y="9"
-       x="7"
-       style="fill:#000000" />
-    <path
-       id="path2941"
-       d="M 8.0000001,6.0000004 C 8.0000001,6.0000004 8.0000001,4.0000004 10,4.0000004 C 12,4.0000004 12,2.0000004 12,2.0000004"
-       style="fill:none;stroke:#000000;stroke-opacity:1" />
-    <rect
-       id="rect2943"
-       height="6"
-       width="2"
-       y="11"
-       x="10"
-       style="fill:#000000" />
-    <path
-       id="path2945"
-       d="M 11,8.0000004 C 11,8.0000004 11,6.0000004 13,6.0000004 C 15,6.0000004 15,4.0000004 15,4.0000004"
-       style="fill:none;stroke:#000000;stroke-opacity:1" />
-    <rect
-       id="rect2947"
-       height="1"
-       width="2"
-       y="7.0000005"
-       x="7"
-       style="fill:#000000" />
-    <rect
-       id="rect2949"
-       height="1"
-       width="2"
-       y="9"
-       x="10"
-       style="fill:#000000" />
-  </g>
+     inkscape:connector-curvature="0"
+     style="fill:none;stroke:#000000;stroke-width:0.80864745;stroke-opacity:1"
+     d="m 5.9796932,4.5406871 c 0,0 0,-1.6020611 1.6326736,-1.6020611 1.6326736,0 1.6326736,-1.6020611 1.6326736,-1.6020611"
+     id="path2941" />
+  <rect
+     style="fill:#000000"
+     x="8"
+     y="8"
+     width="2"
+     height="5"
+     id="rect2943" />
+  <rect
+     style="fill:#000000"
+     x="5"
+     y="5"
+     width="1.9999994"
+     height="0.99999976"
+     id="rect2947" />
+  <rect
+     style="fill:#000000"
+     x="8"
+     y="6"
+     width="2.0000012"
+     height="0.99999595"
+     id="rect2949" />
+  <path
+     inkscape:connector-curvature="0"
+     style="fill:none;stroke:#000000;stroke-width:0.69512463;stroke-opacity:1"
+     d="m 9.06003,5.2659558 c 0,0 0,-1.3571756 1.424129,-1.3571756 1.424129,0 1.424129,-1.3571757 1.424129,-1.3571757"
+     id="path2941-2" />
 </svg>
Index: trunk/images/presets/power/power_source-coal.svg
===================================================================
--- trunk/images/presets/power/power_source-coal.svg	(revision 10917)
+++ trunk/images/presets/power/power_source-coal.svg	(revision 10918)
@@ -1,4 +1,5 @@
 <?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/"
@@ -9,11 +10,11 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="20"
+   width="16"
+   height="16"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
+   inkscape:version="0.91 r13725"
    version="1.0"
-   sodipodi:docname="2020_stBN_powergensource_burn.svg"
+   sodipodi:docname="power_source-gas.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <metadata
@@ -27,4 +28,5 @@
         <cc:license
            rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:title></dc:title>
       </cc:Work>
       <cc:License
@@ -40,6 +42,6 @@
   </metadata>
   <sodipodi:namedview
-     inkscape:window-height="804"
-     inkscape:window-width="962"
+     inkscape:window-height="1018"
+     inkscape:window-width="1920"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
@@ -52,10 +54,11 @@
      id="base"
      showgrid="true"
-     inkscape:zoom="23.1"
-     inkscape:cx="9.5682046"
-     inkscape:cy="10"
-     inkscape:window-x="95"
-     inkscape:window-y="9"
-     inkscape:current-layer="svg2">
+     inkscape:zoom="32"
+     inkscape:cx="6.9004192"
+     inkscape:cy="10.644037"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:current-layer="svg2"
+     inkscape:window-maximized="1">
     <inkscape:grid
        type="xygrid"
@@ -64,28 +67,4 @@
        enabled="true" />
   </sodipodi:namedview>
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <inkscape:perspective
-       id="perspective2461"
-       inkscape:persp3d-origin="10 : 6.6666667 : 1"
-       inkscape:vp_z="20 : 10 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 10 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective2466"
-       inkscape:persp3d-origin="400 : 200 : 1"
-       inkscape:vp_z="800 : 300 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 300 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
   <sodipodi:namedview
      id="namedview10"
@@ -142,51 +121,48 @@
     </rdf:RDF>
   </metadata>
+  <ellipse
+     style="fill:#8B4513;fill-opacity:1;stroke:#000000;stroke-width:0.80000001;stroke-opacity:1"
+     id="background"
+     cx="8"
+     cy="8"
+     rx="7.6000004"
+     ry="7.5999999" />
+  <rect
+     style="fill:#000000"
+     x="5"
+     y="7"
+     width="2"
+     height="6"
+     id="rect2939" />
   <path
-     sodipodi:type="arc"
-     style="fill:#8B4513;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-     id="background"
-     sodipodi:cx="10"
-     sodipodi:cy="10"
-     sodipodi:rx="9.5"
-     sodipodi:ry="9.5"
-     d="M 19.5,10 A 9.5,9.5 0 1 1 0.5,10 A 9.5,9.5 0 1 1 19.5,10 z" />
-  <g
-     id="g2391">
-    <rect
-       id="rect2939"
-       height="8"
-       width="2"
-       y="9"
-       x="7"
-       style="fill:#000000" />
-    <path
-       id="path2941"
-       d="M 8.0000001,6.0000004 C 8.0000001,6.0000004 8.0000001,4.0000004 10,4.0000004 C 12,4.0000004 12,2.0000004 12,2.0000004"
-       style="fill:none;stroke:#000000;stroke-opacity:1" />
-    <rect
-       id="rect2943"
-       height="6"
-       width="2"
-       y="11"
-       x="10"
-       style="fill:#000000" />
-    <path
-       id="path2945"
-       d="M 11,8.0000004 C 11,8.0000004 11,6.0000004 13,6.0000004 C 15,6.0000004 15,4.0000004 15,4.0000004"
-       style="fill:none;stroke:#000000;stroke-opacity:1" />
-    <rect
-       id="rect2947"
-       height="1"
-       width="2"
-       y="7.0000005"
-       x="7"
-       style="fill:#000000" />
-    <rect
-       id="rect2949"
-       height="1"
-       width="2"
-       y="9"
-       x="10"
-       style="fill:#000000" />
-  </g>
+     inkscape:connector-curvature="0"
+     style="fill:none;stroke:#000000;stroke-width:0.80864745;stroke-opacity:1"
+     d="m 5.9796932,4.5406871 c 0,0 0,-1.6020611 1.6326736,-1.6020611 1.6326736,0 1.6326736,-1.6020611 1.6326736,-1.6020611"
+     id="path2941" />
+  <rect
+     style="fill:#000000"
+     x="8"
+     y="8"
+     width="2"
+     height="5"
+     id="rect2943" />
+  <rect
+     style="fill:#000000"
+     x="5"
+     y="5"
+     width="1.9999994"
+     height="0.99999976"
+     id="rect2947" />
+  <rect
+     style="fill:#000000"
+     x="8"
+     y="6"
+     width="2.0000012"
+     height="0.99999595"
+     id="rect2949" />
+  <path
+     inkscape:connector-curvature="0"
+     style="fill:none;stroke:#000000;stroke-width:0.69512463;stroke-opacity:1"
+     d="m 9.06003,5.2659558 c 0,0 0,-1.3571756 1.424129,-1.3571756 1.424129,0 1.424129,-1.3571757 1.424129,-1.3571757"
+     id="path2941-2" />
 </svg>
Index: trunk/images/presets/power/power_source-gas.svg
===================================================================
--- trunk/images/presets/power/power_source-gas.svg	(revision 10917)
+++ trunk/images/presets/power/power_source-gas.svg	(revision 10918)
@@ -1,4 +1,5 @@
 <?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/"
@@ -9,11 +10,11 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="20"
+   width="16"
+   height="16"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
+   inkscape:version="0.91 r13725"
    version="1.0"
-   sodipodi:docname="2020_stBN_powergensource_burn.svg"
+   sodipodi:docname="power_source-gas.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <metadata
@@ -27,4 +28,5 @@
         <cc:license
            rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:title></dc:title>
       </cc:Work>
       <cc:License
@@ -40,6 +42,6 @@
   </metadata>
   <sodipodi:namedview
-     inkscape:window-height="804"
-     inkscape:window-width="962"
+     inkscape:window-height="1018"
+     inkscape:window-width="1920"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
@@ -52,10 +54,11 @@
      id="base"
      showgrid="true"
-     inkscape:zoom="23.1"
-     inkscape:cx="9.5682046"
-     inkscape:cy="10"
-     inkscape:window-x="95"
-     inkscape:window-y="9"
-     inkscape:current-layer="svg2">
+     inkscape:zoom="32"
+     inkscape:cx="6.9004192"
+     inkscape:cy="10.644037"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:current-layer="svg2"
+     inkscape:window-maximized="1">
     <inkscape:grid
        type="xygrid"
@@ -64,28 +67,4 @@
        enabled="true" />
   </sodipodi:namedview>
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <inkscape:perspective
-       id="perspective2461"
-       inkscape:persp3d-origin="10 : 6.6666667 : 1"
-       inkscape:vp_z="20 : 10 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 10 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective2466"
-       inkscape:persp3d-origin="400 : 200 : 1"
-       inkscape:vp_z="800 : 300 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 300 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
   <sodipodi:namedview
      id="namedview10"
@@ -142,51 +121,48 @@
     </rdf:RDF>
   </metadata>
+  <ellipse
+     style="fill:#ffff00;fill-opacity:1;stroke:#000000;stroke-width:0.80000001;stroke-opacity:1"
+     id="background"
+     cx="8"
+     cy="8"
+     rx="7.6000004"
+     ry="7.5999999" />
+  <rect
+     style="fill:#000000"
+     x="5"
+     y="7"
+     width="2"
+     height="6"
+     id="rect2939" />
   <path
-     sodipodi:type="arc"
-     style="fill:#ffff00;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-     id="background"
-     sodipodi:cx="10"
-     sodipodi:cy="10"
-     sodipodi:rx="9.5"
-     sodipodi:ry="9.5"
-     d="M 19.5,10 A 9.5,9.5 0 1 1 0.5,10 A 9.5,9.5 0 1 1 19.5,10 z" />
-  <g
-     id="g2391">
-    <rect
-       id="rect2939"
-       height="8"
-       width="2"
-       y="9"
-       x="7"
-       style="fill:#000000" />
-    <path
-       id="path2941"
-       d="M 8.0000001,6.0000004 C 8.0000001,6.0000004 8.0000001,4.0000004 10,4.0000004 C 12,4.0000004 12,2.0000004 12,2.0000004"
-       style="fill:none;stroke:#000000;stroke-opacity:1" />
-    <rect
-       id="rect2943"
-       height="6"
-       width="2"
-       y="11"
-       x="10"
-       style="fill:#000000" />
-    <path
-       id="path2945"
-       d="M 11,8.0000004 C 11,8.0000004 11,6.0000004 13,6.0000004 C 15,6.0000004 15,4.0000004 15,4.0000004"
-       style="fill:none;stroke:#000000;stroke-opacity:1" />
-    <rect
-       id="rect2947"
-       height="1"
-       width="2"
-       y="7.0000005"
-       x="7"
-       style="fill:#000000" />
-    <rect
-       id="rect2949"
-       height="1"
-       width="2"
-       y="9"
-       x="10"
-       style="fill:#000000" />
-  </g>
+     inkscape:connector-curvature="0"
+     style="fill:none;stroke:#000000;stroke-width:0.80864745;stroke-opacity:1"
+     d="m 5.9796932,4.5406871 c 0,0 0,-1.6020611 1.6326736,-1.6020611 1.6326736,0 1.6326736,-1.6020611 1.6326736,-1.6020611"
+     id="path2941" />
+  <rect
+     style="fill:#000000"
+     x="8"
+     y="8"
+     width="2"
+     height="5"
+     id="rect2943" />
+  <rect
+     style="fill:#000000"
+     x="5"
+     y="5"
+     width="1.9999994"
+     height="0.99999976"
+     id="rect2947" />
+  <rect
+     style="fill:#000000"
+     x="8"
+     y="6"
+     width="2.0000012"
+     height="0.99999595"
+     id="rect2949" />
+  <path
+     inkscape:connector-curvature="0"
+     style="fill:none;stroke:#000000;stroke-width:0.69512463;stroke-opacity:1"
+     d="m 9.06003,5.2659558 c 0,0 0,-1.3571756 1.424129,-1.3571756 1.424129,0 1.424129,-1.3571757 1.424129,-1.3571757"
+     id="path2941-2" />
 </svg>
Index: trunk/images/presets/power/power_source-geothermal.svg
===================================================================
--- trunk/images/presets/power/power_source-geothermal.svg	(revision 10917)
+++ trunk/images/presets/power/power_source-geothermal.svg	(revision 10918)
@@ -10,12 +10,14 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="20"
+   width="16"
+   height="16"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
+   inkscape:version="0.91 r13725"
    version="1.0"
-   sodipodi:docname="power_source-water.svg"
+   sodipodi:docname="power_source-geothermal2.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs14" />
   <metadata
      id="metadata10">
@@ -54,7 +56,7 @@
      id="base"
      showgrid="true"
-     inkscape:zoom="11.8"
-     inkscape:cx="10"
-     inkscape:cy="10"
+     inkscape:zoom="33.37544"
+     inkscape:cx="0.88431149"
+     inkscape:cy="7.3901301"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
@@ -67,28 +69,4 @@
        enabled="true" />
   </sodipodi:namedview>
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <inkscape:perspective
-       id="perspective2461"
-       inkscape:persp3d-origin="10 : 6.6666667 : 1"
-       inkscape:vp_z="20 : 10 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 10 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective2466"
-       inkscape:persp3d-origin="400 : 200 : 1"
-       inkscape:vp_z="800 : 300 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 300 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
   <sodipodi:namedview
      id="namedview10"
@@ -145,29 +123,30 @@
     </rdf:RDF>
   </metadata>
-  <path
-     sodipodi:type="arc"
-     style="fill:#ff4b00;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+  <ellipse
+     style="fill:#ff4b00;fill-opacity:1;stroke:#000000;stroke-width:0.80000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
      id="background"
-     sodipodi:cx="10"
-     sodipodi:cy="10"
-     sodipodi:rx="9.5"
-     sodipodi:ry="9.5"
-     d="M 19.5,10 A 9.5,9.5 0 1 1 0.5,10 A 9.5,9.5 0 1 1 19.5,10 z" />
+     cx="8"
+     cy="8"
+     rx="7.6000004"
+     ry="7.5999999" />
   <g
      id="g2973"
-     transform="translate(2.6475,5.6455)"
-     style="stroke:#000000;stroke-opacity:1">
+     transform="matrix(0.70956312,0,0,0.80502669,2.8413415,4.4945337)"
+     style="stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
     <path
        id="path2959"
-       d="M 0.354,3.355 C 1.354,4.355 4.353,6.354 7.352,4.355 C 10.352,2.355 13.352,4.355 14.351,5.355"
-       style="fill:none;stroke:#000000;stroke-opacity:1" />
+       d="m 0.354,3.355 c 1,1 3.999,2.999 6.998,1 3,-2 6,0 6.999,1"
+       style="fill:none;stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
     <path
        id="path2961"
-       d="M 0.354,0.355 C 1.354,1.356 4.353,3.355 7.352,1.356 C 10.352,-0.644 13.352,1.356 14.351,2.355"
-       style="fill:none;stroke:#000000;stroke-opacity:1" />
+       d="m 0.354,0.355 c 1,1.001 3.999,3 6.998,1.001 3,-2 6,0 6.999,0.999"
+       style="fill:none;stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
     <path
        id="path2963"
-       d="M 0.354,6.354 C 1.354,7.355 4.353,9.353 7.352,7.355 C 10.352,5.355 13.352,7.355 14.351,8.354"
-       style="fill:none;stroke:#000000;stroke-opacity:1" />
+       d="m 0.354,6.354 c 1,1.001 3.999,2.999 6.998,1.001 3,-2 6,0 6.999,0.999"
+       style="fill:none;stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
   </g>
 </svg>
Index: trunk/images/presets/power/power_source-nuclear.svg
===================================================================
--- trunk/images/presets/power/power_source-nuclear.svg	(revision 10917)
+++ trunk/images/presets/power/power_source-nuclear.svg	(revision 10918)
@@ -1,4 +1,5 @@
 <?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/"
@@ -9,12 +10,14 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="20"
+   width="16"
+   height="16"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
+   inkscape:version="0.91 r13725"
    version="1.0"
-   sodipodi:docname="2020_stBN_powergensource_nuclear.svg"
+   sodipodi:docname="power_source-nuclear.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs15" />
   <metadata
      id="metadata10">
@@ -27,4 +30,5 @@
         <cc:license
            rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:title></dc:title>
       </cc:Work>
       <cc:License
@@ -40,6 +44,6 @@
   </metadata>
   <sodipodi:namedview
-     inkscape:window-height="480"
-     inkscape:window-width="640"
+     inkscape:window-height="988"
+     inkscape:window-width="1680"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
@@ -51,5 +55,12 @@
      pagecolor="#ffffff"
      id="base"
-     showgrid="true">
+     showgrid="true"
+     inkscape:zoom="33.37544"
+     inkscape:cx="6.6382163"
+     inkscape:cy="6.2111108"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2">
     <inkscape:grid
        type="xygrid"
@@ -58,28 +69,4 @@
        enabled="true" />
   </sodipodi:namedview>
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <inkscape:perspective
-       id="perspective2461"
-       inkscape:persp3d-origin="10 : 6.6666667 : 1"
-       inkscape:vp_z="20 : 10 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 10 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective2466"
-       inkscape:persp3d-origin="400 : 200 : 1"
-       inkscape:vp_z="800 : 300 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 300 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
   <sodipodi:namedview
      id="namedview10"
@@ -136,37 +123,36 @@
     </rdf:RDF>
   </metadata>
-  <path
-     sodipodi:type="arc"
-     style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+  <ellipse
+     style="fill:#ffff00;fill-opacity:1;stroke:#000000;stroke-width:0.80000001;stroke-opacity:1"
      id="background"
-     sodipodi:cx="10"
-     sodipodi:cy="10"
-     sodipodi:rx="9.5"
-     sodipodi:ry="9.5"
-     d="M 19.5,10 A 9.5,9.5 0 1 1 0.5,10 A 9.5,9.5 0 1 1 19.5,10 z" />
+     cx="8"
+     cy="8"
+     rx="7.6000004"
+     ry="7.5999999" />
   <g
      id="g2397"
-     style="fill:#000000">
+     style="fill:#000000"
+     transform="scale(0.8,0.80000003)">
     <path
        id="path4369"
-       d="M 14,3.074 L 11.5,7.404 C 12.396,7.922 13.001,8.889 13.001,10 L 18,10 C 18,7.041 16.39,4.457 14,3.074 z"
-       style="fill:#000000" />
+       d="m 14,3.074 -2.5,4.33 C 12.396,7.922 13.001,8.889 13.001,10 L 18,10 C 18,7.041 16.39,4.457 14,3.074 Z"
+       style="fill:#000000"
+       inkscape:connector-curvature="0" />
     <path
        id="path4371"
-       d="M 2.006,10 L 7.005,10 C 7.005,8.964 7.54,7.957 8.501,7.402 L 6.002,3.072 C 3.441,4.552 2.008,7.238 2.006,10 z"
-       style="fill:#000000" />
+       d="m 2.006,10 4.999,0 C 7.005,8.964 7.54,7.957 8.501,7.402 L 6.002,3.072 C 3.441,4.552 2.008,7.238 2.006,10 Z"
+       style="fill:#000000"
+       inkscape:connector-curvature="0" />
     <path
        id="path4373"
-       d="M 14,16.925 L 11.5,12.596 C 10.603,13.112 9.463,13.152 8.502,12.597 L 6.003,16.925 C 8.565,18.406 11.607,18.302 14,16.925 z"
-       style="fill:#000000" />
-    <path
-       d="M 12,10 A 2,2 0 1 1 8,10 A 2,2 0 1 1 12,10 z"
-       sodipodi:ry="2"
-       sodipodi:rx="2"
-       sodipodi:cy="10"
-       sodipodi:cx="10"
+       d="m 14,16.925 -2.5,-4.329 c -0.897,0.516 -2.037,0.556 -2.998,10e-4 l -2.499,4.328 c 2.562,1.481 5.604,1.377 7.997,0 z"
+       style="fill:#000000"
+       inkscape:connector-curvature="0" />
+    <circle
        id="path4395"
        style="fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1"
-       sodipodi:type="arc" />
+       cx="10"
+       cy="10"
+       r="2" />
   </g>
 </svg>
Index: trunk/images/presets/power/power_source-oil.svg
===================================================================
--- trunk/images/presets/power/power_source-oil.svg	(revision 10917)
+++ trunk/images/presets/power/power_source-oil.svg	(revision 10918)
@@ -1,4 +1,5 @@
 <?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/"
@@ -9,11 +10,11 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="20"
+   width="16"
+   height="16"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
+   inkscape:version="0.91 r13725"
    version="1.0"
-   sodipodi:docname="2020_stBN_powergensource_burn.svg"
+   sodipodi:docname="power_source-gas.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <metadata
@@ -27,4 +28,5 @@
         <cc:license
            rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:title></dc:title>
       </cc:Work>
       <cc:License
@@ -40,6 +42,6 @@
   </metadata>
   <sodipodi:namedview
-     inkscape:window-height="804"
-     inkscape:window-width="962"
+     inkscape:window-height="1018"
+     inkscape:window-width="1920"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
@@ -52,10 +54,11 @@
      id="base"
      showgrid="true"
-     inkscape:zoom="23.1"
-     inkscape:cx="9.5682046"
-     inkscape:cy="10"
-     inkscape:window-x="95"
-     inkscape:window-y="9"
-     inkscape:current-layer="svg2">
+     inkscape:zoom="32"
+     inkscape:cx="6.9004192"
+     inkscape:cy="10.644037"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:current-layer="svg2"
+     inkscape:window-maximized="1">
     <inkscape:grid
        type="xygrid"
@@ -64,28 +67,4 @@
        enabled="true" />
   </sodipodi:namedview>
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <inkscape:perspective
-       id="perspective2461"
-       inkscape:persp3d-origin="10 : 6.6666667 : 1"
-       inkscape:vp_z="20 : 10 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 10 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective2466"
-       inkscape:persp3d-origin="400 : 200 : 1"
-       inkscape:vp_z="800 : 300 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 300 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
   <sodipodi:namedview
      id="namedview10"
@@ -142,51 +121,48 @@
     </rdf:RDF>
   </metadata>
+  <ellipse
+     style="fill:#708090;fill-opacity:1;stroke:#000000;stroke-width:0.80000001;stroke-opacity:1"
+     id="background"
+     cx="8"
+     cy="8"
+     rx="7.6000004"
+     ry="7.5999999" />
+  <rect
+     style="fill:#000000"
+     x="5"
+     y="7"
+     width="2"
+     height="6"
+     id="rect2939" />
   <path
-     sodipodi:type="arc"
-     style="fill:#708090;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-     id="background"
-     sodipodi:cx="10"
-     sodipodi:cy="10"
-     sodipodi:rx="9.5"
-     sodipodi:ry="9.5"
-     d="M 19.5,10 A 9.5,9.5 0 1 1 0.5,10 A 9.5,9.5 0 1 1 19.5,10 z" />
-  <g
-     id="g2391">
-    <rect
-       id="rect2939"
-       height="8"
-       width="2"
-       y="9"
-       x="7"
-       style="fill:#000000" />
-    <path
-       id="path2941"
-       d="M 8.0000001,6.0000004 C 8.0000001,6.0000004 8.0000001,4.0000004 10,4.0000004 C 12,4.0000004 12,2.0000004 12,2.0000004"
-       style="fill:none;stroke:#000000;stroke-opacity:1" />
-    <rect
-       id="rect2943"
-       height="6"
-       width="2"
-       y="11"
-       x="10"
-       style="fill:#000000" />
-    <path
-       id="path2945"
-       d="M 11,8.0000004 C 11,8.0000004 11,6.0000004 13,6.0000004 C 15,6.0000004 15,4.0000004 15,4.0000004"
-       style="fill:none;stroke:#000000;stroke-opacity:1" />
-    <rect
-       id="rect2947"
-       height="1"
-       width="2"
-       y="7.0000005"
-       x="7"
-       style="fill:#000000" />
-    <rect
-       id="rect2949"
-       height="1"
-       width="2"
-       y="9"
-       x="10"
-       style="fill:#000000" />
-  </g>
+     inkscape:connector-curvature="0"
+     style="fill:none;stroke:#000000;stroke-width:0.80864745;stroke-opacity:1"
+     d="m 5.9796932,4.5406871 c 0,0 0,-1.6020611 1.6326736,-1.6020611 1.6326736,0 1.6326736,-1.6020611 1.6326736,-1.6020611"
+     id="path2941" />
+  <rect
+     style="fill:#000000"
+     x="8"
+     y="8"
+     width="2"
+     height="5"
+     id="rect2943" />
+  <rect
+     style="fill:#000000"
+     x="5"
+     y="5"
+     width="1.9999994"
+     height="0.99999976"
+     id="rect2947" />
+  <rect
+     style="fill:#000000"
+     x="8"
+     y="6"
+     width="2.0000012"
+     height="0.99999595"
+     id="rect2949" />
+  <path
+     inkscape:connector-curvature="0"
+     style="fill:none;stroke:#000000;stroke-width:0.69512463;stroke-opacity:1"
+     d="m 9.06003,5.2659558 c 0,0 0,-1.3571756 1.424129,-1.3571756 1.424129,0 1.424129,-1.3571757 1.424129,-1.3571757"
+     id="path2941-2" />
 </svg>
Index: trunk/images/presets/power/power_source-sun.svg
===================================================================
--- trunk/images/presets/power/power_source-sun.svg	(revision 10917)
+++ trunk/images/presets/power/power_source-sun.svg	(revision 10918)
@@ -1,4 +1,5 @@
 <?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/"
@@ -9,12 +10,14 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="20"
+   width="16"
+   height="16"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
+   inkscape:version="0.91 r13725"
    version="1.0"
-   sodipodi:docname="2020_stBN_powergensource_sun.svg"
+   sodipodi:docname="power_source-sun5.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs18" />
   <metadata
      id="metadata10">
@@ -27,4 +30,5 @@
         <cc:license
            rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:title></dc:title>
       </cc:Work>
       <cc:License
@@ -40,6 +44,6 @@
   </metadata>
   <sodipodi:namedview
-     inkscape:window-height="480"
-     inkscape:window-width="640"
+     inkscape:window-height="988"
+     inkscape:window-width="1680"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
@@ -51,5 +55,12 @@
      pagecolor="#ffffff"
      id="base"
-     showgrid="true">
+     showgrid="true"
+     inkscape:zoom="23.6"
+     inkscape:cx="8.6883174"
+     inkscape:cy="3.5715644"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2">
     <inkscape:grid
        type="xygrid"
@@ -58,28 +69,4 @@
        enabled="true" />
   </sodipodi:namedview>
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <inkscape:perspective
-       id="perspective2461"
-       inkscape:persp3d-origin="10 : 6.6666667 : 1"
-       inkscape:vp_z="20 : 10 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 10 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective2466"
-       inkscape:persp3d-origin="400 : 200 : 1"
-       inkscape:vp_z="800 : 300 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 300 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
   <sodipodi:namedview
      id="namedview10"
@@ -136,79 +123,56 @@
     </rdf:RDF>
   </metadata>
-  <path
-     sodipodi:type="arc"
-     style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+  <ellipse
+     style="fill:#ffff00;fill-opacity:1;stroke:#000000;stroke-width:0.74915254;stroke-opacity:1"
      id="background"
-     sodipodi:cx="10"
-     sodipodi:cy="10"
-     sodipodi:rx="9.5"
-     sodipodi:ry="9.5"
-     d="M 19.5,10 A 9.5,9.5 0 1 1 0.5,10 A 9.5,9.5 0 1 1 19.5,10 z" />
+     cx="7.4915257"
+     cy="8.5084743"
+     rx="7.1169496"
+     ry="7.1169491" />
   <rect
-     transform="matrix(-0.5,-0.8660254,0.8660254,-0.5,0,0)"
-     y="3.1602542"
-     x="-18.660254"
+     style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     id="rect4146"
+     width="1"
+     height="11"
+     x="-1.2071068"
+     y="5.8137083"
+     transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
+     ry="0.5" />
+  <rect
+     style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     id="rect4148"
+     width="11"
      height="1"
-     width="10"
-     id="rect3797"
-     style="fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1" />
+     x="-6.2071066"
+     y="10.813708"
+     transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
+     ry="0.5" />
   <rect
-     y="9.5"
-     x="5"
+     style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     id="rect4154"
+     width="11"
      height="1"
-     width="10"
-     id="rect3787"
-     style="fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1" />
+     x="2"
+     y="8"
+     ry="0.5" />
   <rect
-     transform="matrix(0.8660254,-0.5,0.5,0.8660254,0,0)"
-     y="13.160254"
-     x="-3.839746"
-     height="1"
-     width="15"
-     id="rect3789"
-     style="fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1" />
-  <rect
-     style="fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1"
-     id="rect3791"
-     width="10"
-     height="1"
-     x="-8.6602535"
-     y="13.160254"
-     transform="matrix(0.5,-0.8660254,0.8660254,0.5,0,0)" />
-  <rect
-     style="fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1"
-     id="rect3793"
-     width="15"
-     height="1"
-     x="-17.5"
-     y="9.5"
-     transform="matrix(0,-1,1,0,0,0)" />
-  <rect
-     transform="matrix(-0.8660254,-0.5,0.5,-0.8660254,0,0)"
-     y="-4.1602535"
-     x="-21.160254"
-     height="1"
-     width="15"
-     id="rect3795"
-     style="fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1" />
+     style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     id="rect4156"
+     width="0.99999952"
+     height="11.000003"
+     x="7"
+     y="3"
+     ry="0.49999976" />
   <circle
-     transform="translate(6.9999695e-3,6.3999653e-2)"
-     style="fill:#000000;stroke:none;stroke-width:0.99980002999999995"
-     sodipodi:ry="2.9990001"
-     sodipodi:rx="2.9990001"
-     sodipodi:cy="9.9350004"
-     sodipodi:cx="9.993"
-     cx="9.993"
-     cy="9.9350004"
-     r="2.9990001"
-     id="circle2969" />
-  <path
-     d="M 12,10 A 2,2 0 1 1 8,10 A 2,2 0 1 1 12,10 z"
-     sodipodi:ry="2"
-     sodipodi:rx="2"
-     sodipodi:cy="10"
-     sodipodi:cx="10"
-     id="path3777"
-     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-opacity:1"
-     sodipodi:type="arc" />
+     id="circle4170"
+     cy="8.5"
+     cx="7.5"
+     style="fill:#000000;stroke:none;stroke-width:0.99980003"
+     r="2.5" />
+  <circle
+     cy="8.5"
+     cx="7.5"
+     style="fill:#ffff00;fill-opacity:1;stroke:none;stroke-opacity:1"
+     id="circle4172"
+     r="1.5" />
 </svg>
Index: trunk/images/presets/power/power_source-waste.svg
===================================================================
--- trunk/images/presets/power/power_source-waste.svg	(revision 10917)
+++ trunk/images/presets/power/power_source-waste.svg	(revision 10918)
@@ -1,4 +1,5 @@
 <?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/"
@@ -9,11 +10,11 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="20"
+   width="16"
+   height="16"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
+   inkscape:version="0.91 r13725"
    version="1.0"
-   sodipodi:docname="2020_stBN_powergensource_burn.svg"
+   sodipodi:docname="power_source-gas.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <metadata
@@ -27,4 +28,5 @@
         <cc:license
            rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:title></dc:title>
       </cc:Work>
       <cc:License
@@ -40,6 +42,6 @@
   </metadata>
   <sodipodi:namedview
-     inkscape:window-height="804"
-     inkscape:window-width="962"
+     inkscape:window-height="1018"
+     inkscape:window-width="1920"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
@@ -52,10 +54,11 @@
      id="base"
      showgrid="true"
-     inkscape:zoom="23.1"
-     inkscape:cx="9.5682046"
-     inkscape:cy="10"
-     inkscape:window-x="95"
-     inkscape:window-y="9"
-     inkscape:current-layer="svg2">
+     inkscape:zoom="32"
+     inkscape:cx="6.9004192"
+     inkscape:cy="10.644037"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:current-layer="svg2"
+     inkscape:window-maximized="1">
     <inkscape:grid
        type="xygrid"
@@ -64,28 +67,4 @@
        enabled="true" />
   </sodipodi:namedview>
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <inkscape:perspective
-       id="perspective2461"
-       inkscape:persp3d-origin="10 : 6.6666667 : 1"
-       inkscape:vp_z="20 : 10 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 10 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective2466"
-       inkscape:persp3d-origin="400 : 200 : 1"
-       inkscape:vp_z="800 : 300 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 300 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
   <sodipodi:namedview
      id="namedview10"
@@ -142,51 +121,48 @@
     </rdf:RDF>
   </metadata>
+  <ellipse
+     style="fill:#EE82EE;fill-opacity:1;stroke:#000000;stroke-width:0.80000001;stroke-opacity:1"
+     id="background"
+     cx="8"
+     cy="8"
+     rx="7.6000004"
+     ry="7.5999999" />
+  <rect
+     style="fill:#000000"
+     x="5"
+     y="7"
+     width="2"
+     height="6"
+     id="rect2939" />
   <path
-     sodipodi:type="arc"
-     style="fill:#EE82EE;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-     id="background"
-     sodipodi:cx="10"
-     sodipodi:cy="10"
-     sodipodi:rx="9.5"
-     sodipodi:ry="9.5"
-     d="M 19.5,10 A 9.5,9.5 0 1 1 0.5,10 A 9.5,9.5 0 1 1 19.5,10 z" />
-  <g
-     id="g2391">
-    <rect
-       id="rect2939"
-       height="8"
-       width="2"
-       y="9"
-       x="7"
-       style="fill:#000000" />
-    <path
-       id="path2941"
-       d="M 8.0000001,6.0000004 C 8.0000001,6.0000004 8.0000001,4.0000004 10,4.0000004 C 12,4.0000004 12,2.0000004 12,2.0000004"
-       style="fill:none;stroke:#000000;stroke-opacity:1" />
-    <rect
-       id="rect2943"
-       height="6"
-       width="2"
-       y="11"
-       x="10"
-       style="fill:#000000" />
-    <path
-       id="path2945"
-       d="M 11,8.0000004 C 11,8.0000004 11,6.0000004 13,6.0000004 C 15,6.0000004 15,4.0000004 15,4.0000004"
-       style="fill:none;stroke:#000000;stroke-opacity:1" />
-    <rect
-       id="rect2947"
-       height="1"
-       width="2"
-       y="7.0000005"
-       x="7"
-       style="fill:#000000" />
-    <rect
-       id="rect2949"
-       height="1"
-       width="2"
-       y="9"
-       x="10"
-       style="fill:#000000" />
-  </g>
+     inkscape:connector-curvature="0"
+     style="fill:none;stroke:#000000;stroke-width:0.80864745;stroke-opacity:1"
+     d="m 5.9796932,4.5406871 c 0,0 0,-1.6020611 1.6326736,-1.6020611 1.6326736,0 1.6326736,-1.6020611 1.6326736,-1.6020611"
+     id="path2941" />
+  <rect
+     style="fill:#000000"
+     x="8"
+     y="8"
+     width="2"
+     height="5"
+     id="rect2943" />
+  <rect
+     style="fill:#000000"
+     x="5"
+     y="5"
+     width="1.9999994"
+     height="0.99999976"
+     id="rect2947" />
+  <rect
+     style="fill:#000000"
+     x="8"
+     y="6"
+     width="2.0000012"
+     height="0.99999595"
+     id="rect2949" />
+  <path
+     inkscape:connector-curvature="0"
+     style="fill:none;stroke:#000000;stroke-width:0.69512463;stroke-opacity:1"
+     d="m 9.06003,5.2659558 c 0,0 0,-1.3571756 1.424129,-1.3571756 1.424129,0 1.424129,-1.3571757 1.424129,-1.3571757"
+     id="path2941-2" />
 </svg>
Index: trunk/images/presets/power/power_source-water.svg
===================================================================
--- trunk/images/presets/power/power_source-water.svg	(revision 10917)
+++ trunk/images/presets/power/power_source-water.svg	(revision 10918)
@@ -1,4 +1,5 @@
 <?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/"
@@ -9,12 +10,14 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="20"
+   width="16"
+   height="16"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
+   inkscape:version="0.91 r13725"
    version="1.0"
-   sodipodi:docname="2020_stBN_powergensource_water.svg"
+   sodipodi:docname="power_source-geothermal2.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs14" />
   <metadata
      id="metadata10">
@@ -27,4 +30,5 @@
         <cc:license
            rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:title></dc:title>
       </cc:Work>
       <cc:License
@@ -40,6 +44,6 @@
   </metadata>
   <sodipodi:namedview
-     inkscape:window-height="480"
-     inkscape:window-width="640"
+     inkscape:window-height="988"
+     inkscape:window-width="1680"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
@@ -51,5 +55,12 @@
      pagecolor="#ffffff"
      id="base"
-     showgrid="true">
+     showgrid="true"
+     inkscape:zoom="33.37544"
+     inkscape:cx="0.88431149"
+     inkscape:cy="7.3901301"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2">
     <inkscape:grid
        type="xygrid"
@@ -58,28 +69,4 @@
        enabled="true" />
   </sodipodi:namedview>
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <inkscape:perspective
-       id="perspective2461"
-       inkscape:persp3d-origin="10 : 6.6666667 : 1"
-       inkscape:vp_z="20 : 10 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 10 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective2466"
-       inkscape:persp3d-origin="400 : 200 : 1"
-       inkscape:vp_z="800 : 300 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 300 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
   <sodipodi:namedview
      id="namedview10"
@@ -136,29 +123,30 @@
     </rdf:RDF>
   </metadata>
-  <path
-     sodipodi:type="arc"
-     style="fill:#00ffff;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+  <ellipse
+     style="fill:#00ffff;fill-opacity:1;stroke:#000000;stroke-width:0.80000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
      id="background"
-     sodipodi:cx="10"
-     sodipodi:cy="10"
-     sodipodi:rx="9.5"
-     sodipodi:ry="9.5"
-     d="M 19.5,10 A 9.5,9.5 0 1 1 0.5,10 A 9.5,9.5 0 1 1 19.5,10 z" />
+     cx="8"
+     cy="8"
+     rx="7.6000004"
+     ry="7.5999999" />
   <g
      id="g2973"
-     transform="translate(2.6475,5.6455)"
-     style="stroke:#000000;stroke-opacity:1">
+     transform="matrix(0.70956312,0,0,0.80502669,2.8413415,4.4945337)"
+     style="stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
     <path
        id="path2959"
-       d="M 0.354,3.355 C 1.354,4.355 4.353,6.354 7.352,4.355 C 10.352,2.355 13.352,4.355 14.351,5.355"
-       style="fill:none;stroke:#000000;stroke-opacity:1" />
+       d="m 0.354,3.355 c 1,1 3.999,2.999 6.998,1 3,-2 6,0 6.999,1"
+       style="fill:none;stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
     <path
        id="path2961"
-       d="M 0.354,0.355 C 1.354,1.356 4.353,3.355 7.352,1.356 C 10.352,-0.644 13.352,1.356 14.351,2.355"
-       style="fill:none;stroke:#000000;stroke-opacity:1" />
+       d="m 0.354,0.355 c 1,1.001 3.999,3 6.998,1.001 3,-2 6,0 6.999,0.999"
+       style="fill:none;stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
     <path
        id="path2963"
-       d="M 0.354,6.354 C 1.354,7.355 4.353,9.353 7.352,7.355 C 10.352,5.355 13.352,7.355 14.351,8.354"
-       style="fill:none;stroke:#000000;stroke-opacity:1" />
+       d="m 0.354,6.354 c 1,1.001 3.999,2.999 6.998,1.001 3,-2 6,0 6.999,0.999"
+       style="fill:none;stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
   </g>
 </svg>
Index: trunk/images/presets/power/power_source-wind.svg
===================================================================
--- trunk/images/presets/power/power_source-wind.svg	(revision 10917)
+++ trunk/images/presets/power/power_source-wind.svg	(revision 10918)
@@ -1,4 +1,5 @@
 <?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/"
@@ -9,12 +10,14 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="20"
+   width="16"
+   height="16"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
+   inkscape:version="0.91 r13725"
    version="1.0"
-   sodipodi:docname="2020_stBN_powergensource_wind.svg"
+   sodipodi:docname="power_source-wind3.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs15" />
   <metadata
      id="metadata10">
@@ -27,4 +30,5 @@
         <cc:license
            rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:title></dc:title>
       </cc:Work>
       <cc:License
@@ -40,6 +44,6 @@
   </metadata>
   <sodipodi:namedview
-     inkscape:window-height="480"
-     inkscape:window-width="640"
+     inkscape:window-height="988"
+     inkscape:window-width="1680"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
@@ -51,5 +55,12 @@
      pagecolor="#ffffff"
      id="base"
-     showgrid="true">
+     showgrid="true"
+     inkscape:zoom="47.2"
+     inkscape:cx="8.3885021"
+     inkscape:cy="7.9297332"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2">
     <inkscape:grid
        type="xygrid"
@@ -58,28 +69,4 @@
        enabled="true" />
   </sodipodi:namedview>
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <inkscape:perspective
-       id="perspective2461"
-       inkscape:persp3d-origin="10 : 6.6666667 : 1"
-       inkscape:vp_z="20 : 10 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 10 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective2466"
-       inkscape:persp3d-origin="400 : 200 : 1"
-       inkscape:vp_z="800 : 300 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 300 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
   <sodipodi:namedview
      id="namedview10"
@@ -136,16 +123,15 @@
     </rdf:RDF>
   </metadata>
-  <path
-     sodipodi:type="arc"
-     style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+  <ellipse
+     style="fill:#94d2ff;fill-opacity:1;stroke:#000000;stroke-width:0.80000001;stroke-opacity:1"
      id="background"
-     sodipodi:cx="10"
-     sodipodi:cy="10"
-     sodipodi:rx="9.5"
-     sodipodi:ry="9.5"
-     d="M 19.5,10 A 9.5,9.5 0 1 1 0.5,10 A 9.5,9.5 0 1 1 19.5,10 z" />
+     cx="8"
+     cy="8"
+     rx="7.6000004"
+     ry="7.5999999" />
   <g
      id="g2391"
-     style="fill:#000000">
+     style="fill:#000000"
+     transform="scale(0.8,0.80000003)">
     <rect
        y="2"
@@ -154,5 +140,6 @@
        width="2"
        id="rect3840"
-       style="fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1" />
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1"
+       ry="1" />
     <rect
        transform="matrix(-0.5,0.8660254,-0.8660254,-0.5,0,0)"
@@ -162,5 +149,6 @@
        height="7"
        x="2.2942286"
-       y="-21.026279" />
+       y="-21.026279"
+       ry="1" />
     <rect
        y="-3.7057714"
@@ -170,9 +158,11 @@
        id="rect3844"
        style="fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1"
-       transform="matrix(-0.5,-0.8660254,0.8660254,-0.5,0,0)" />
+       transform="matrix(-0.5,-0.8660254,0.8660254,-0.5,0,0)"
+       ry="1" />
     <path
        id="path3846"
-       d="M 9,18 L 11,18 L 11,12 L 10,11.5 L 9,12 L 9,18 z"
-       style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1" />
+       d="m 9,18 2,0 0,-6 -1,-0.5 -1,0.5 0,6 z"
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
   </g>
 </svg>