From 5fb452f37fe9daae91c42e2e90eab480d09afb49 Mon Sep 17 00:00:00 2001
From: Stefan Frederik <stefan.schippers@gmail.com>
Date: Thu, 27 Oct 2022 19:32:46 +0200
Subject: [PATCH] Further hardening of source_user_tcl_files against files
 containing strange characters including ".

---
 XSchemWin/XSchemWix/doc.wxs      | 129 +++++-
 XSchemWin/XSchemWix/heat_doc.wxs | 698 +++++++++++++++++--------------
 src/xschem.tcl                   |   2 +-
 3 files changed, 503 insertions(+), 326 deletions(-)

diff --git a/XSchemWin/XSchemWix/doc.wxs b/XSchemWin/XSchemWix/doc.wxs
index 7fa70591..bd24a6fe 100644
--- a/XSchemWin/XSchemWix/doc.wxs
+++ b/XSchemWin/XSchemWix/doc.wxs
@@ -69,27 +69,15 @@
           <Component Id="cmp830D9797AC395079C02810A4A8D445E4" Guid="{54F4D1F2-AE37-47FD-85F8-8D003BC6BFE5}">
               <File Id="fil1A2489071686F8984790BF5501FA50E1" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\backannotation14.png" />
           </Component>
+		  <Component Id="cmp46766002C824318846B83CDF4DBAD182" Guid="{233ECF54-D6D7-4C3F-8642-72DCEEC0C2E9}">
+			<File Id="filF1C29484942CC82FB2E9F30C7401501C" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\backannotation15.png" />
+		  </Component>
           <Component Id="cmpD6A28746EC2D28A8FBAAAACA17ED987B" Guid="{4919F206-0483-4576-87D9-85EEA3911229}">
               <File Id="fil218EB066431BDA2A9C6ACA3EE7F4C040" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\backannotation2.png" />
           </Component>
           <Component Id="cmp582FBF503439D78BC069B234036D9E89" Guid="{A4CD5600-850E-49DF-9456-515F3109288C}">
               <File Id="filBAF17814687873F7A5922B740DE8A958" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\backannotation3.png" />
           </Component>
-          <Component Id="cmp69EEA82A2C967338A67DDF35FDE45600" Guid="{A35B6147-E524-4B3D-B712-4D561823B916}">
-            <File Id="filC47335B1D7AD798519DE950DEC59AF9F" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\backannotation4.png" />
-          </Component>
-          <Component Id="cmpE3B9694CA93BB1526F76E33A642CEA1B" Guid="{3CEEDD1C-BEF2-4831-B60A-252E8F272CC4}">
-            <File Id="fil135552F3C06484C365FE65A0CDC72D18" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\backannotation5.png" />
-          </Component>
-          <Component Id="cmp20646ABB70916F03A33E968411B57A70" Guid="{1597A6D7-5B7D-43DE-B158-7B7E33A9D5CA}">
-            <File Id="fil9187407B5CBC2584D07DBEBAC24C3329" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\backannotation6.png" />
-          </Component>
-          <Component Id="cmp0A4C3E7FD6878AAA1D26FE8FD960048D" Guid="{0C9E1710-1390-4906-B0CC-E7993A91DE57}">
-            <File Id="filBB14DD87D7C7CE6AED72FA632023BEEA" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\backannotation7.png" />
-          </Component>
-          <Component Id="cmp17017531D96EA1AD3E48E88A3A9B8DBB" Guid="{E9BBDF69-BF5C-48C8-830B-65CCB2411017}">
-              <File Id="filBD8F5656F78057B5EC74DBDDD1FABBED" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\backannotation8.png" />
-          </Component>
           <Component Id="cmp00B6516520113473361C8E8DF1C8141B" Guid="{C03F7F7B-CC01-4DC7-92DB-2764BBC4C0E0}">
               <File Id="fil01686B626893AC36C53EFD17A9B0D0F0" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\backannotation9.png" />
           </Component>
@@ -141,6 +129,18 @@
           <Component Id="cmp74F21FF343DE290DFDEE33310BE585E1" Guid="{E98F6AEE-4764-4094-BE1A-8816927EF354}">
             <File Id="filFB4AD56AFFDF1F1C7FC68FA4D1DEC4F8" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\commands5.png" />
           </Component>
+		  <Component Id="cmp09E38EB19A0FE87BCEEC21CA7364F723" Guid="{3813B292-9F29-4F6D-8447-E312E996B3A8}">
+			<File Id="fil7C5F15C1D2049C00F1B8918FAFEB83B5" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\commands6.png" />
+		  </Component>
+		  <Component Id="cmp6ADE2A2D330812ABB718A3118C89B3F3" Guid="{66500BC9-C7E7-4F86-A359-A93E6D4CDEA7}">
+			<File Id="fil281339A552574A3520080EAA0ABE39EA" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\commands7.png" />
+  		  </Component>
+		  <Component Id="cmpC4CC987EDB3814BF6CDA06AD166E1AA5" Guid="{C8CCE328-73BF-4209-B3B1-C3389D173CFF}">
+			<File Id="fil0C23CA94E58AEA01129014CBB119942E" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\commands8.png" />
+		  </Component>
+  		  <Component Id="cmpF7D3EF7C7886FBF551B10FB97DAAD596" Guid="{5F7E2CFE-869B-449B-9CD0-68E29E115C6A}">
+			<File Id="fil0151E12F7C0C313E5B32262C736794A4" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\commands9.png" />
+		  </Component>
           <Component Id="cmpBE23AC11FA02835A80FA838229BC8687" Guid="{691371DA-2A6B-4572-B3F9-10F2D12BDDE2}">
             <File Id="fil1551C1BC526F6F31EE155426A2003D21" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\component_instantiation.html" />
           </Component>
@@ -318,6 +318,9 @@
           <Component Id="cmpA41BECAFCCD0A01F5DAD18A949FF2827" Guid="{271368C9-DBA8-4B72-8BEC-E1A17C41A941}">
               <File Id="fil52A4BE0CB79D0FD8C836704442CBDD88" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\graphs15.png" />
           </Component>
+		  <Component Id="cmp2122C826D84E0925566AEC470A7CFABD" Guid="{5A0BC5DF-8405-48BF-859F-B7F3DD89D866}">
+			  <File Id="fil02B785B7CCDC980D09CDB2BB23484767" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\graphs16.png" />
+		  </Component>
           <Component Id="cmp7D84114D6FDF0E09CB66A982B3C581C3" Guid="{06F4736F-88F7-459A-BF81-9F04C78C45B7}">
             <File Id="fil00E7CE2F76CC18FC1618A1670E025C42" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\gschemtoxschem.png" />
           </Component>
@@ -399,6 +402,12 @@
           <Component Id="cmp4FDAD50274CE6105999BB73BF884DD1D" Guid="{C0221391-25F9-4B31-9BCE-63E7B562680F}">
             <File Id="fil324E6B620A90FA83D90F966DBBDA2AB8" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\parameters6.png" />
           </Component>
+		  <Component Id="cmp9C9646BA969959CDB04692029FCBCFB1" Guid="{68A08CFA-C155-4223-A1B1-1BD00FC49634}">
+			<File Id="filEE7774C6FBEC9BEBE6D13D916B101DE1" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\pinnumber1.png" />
+	  	  </Component>
+		  <Component Id="cmp7D05C60DDE4C4E276B03CA0BFA79AA8E" Guid="{2B4BC668-AEA9-4D62-9B5C-5A357615AC46}">
+			<File Id="filD67E8930C63B1E2CEA3EE6AB431A5A86" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\pinnumber2.png" />
+		  </Component>
           <Component Id="cmp80E23E69F6BFD335D5BE2C38F9C1FE2C" Guid="{3B7323F6-F178-4460-BCCC-AD493FF471A6}">
             <File Id="filC0DB531BC8215434E171272739A2B064" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\pin_order.png" />
           </Component>
@@ -657,9 +666,67 @@
           <Component Id="cmp89BE8EF1B2B36CB950714E6DDEC886BB" Guid="{EB7B83EE-2B24-44EF-A68A-918F3471F729}">
             <File Id="fil5CD1E212B7B582D79F8D04184CDA2D88" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_symgen_02.png" />
           </Component>
+
+		  <Component Id="cmp24AB399EEF91852024CB83CD0A4EF749" Guid="{E000E459-BE67-4469-9311-5B7E2A00F495}">
+			<File Id="fil45DCB5B9DF486CFA015F93E38A972E15" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_use_existing_subckt.html" />
+		  </Component>
+		  <Component Id="cmp97B7734742CE69199C349409D98FEB6F" Guid="{8C2FE41D-0A4F-4906-A548-D2033C1E27EA}">
+			<File Id="fil45DE57728139B6FFAE1A58E39547F347" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_use_existing_subckt00.png" />
+		  </Component>
+		  <Component Id="cmpC3D4EC73230C6AC07E8194BC3757FC41" Guid="{63FCDA17-3B85-44E0-83FF-C514625B884E}">
+			<File Id="fil9A15A60CC26B8F1BE0ADC27329C27098" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_use_existing_subckt01.png" />
+  		  </Component>
+		  <Component Id="cmp376282B9962A9D56861EE6DEC1861CAC" Guid="{BE668F82-B49B-4C58-AB92-A63A570D03CA}">
+			<File Id="filF2C79781DFCBE52069500BB38580C0B6" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_use_existing_subckt02.png" />
+		  </Component>
+		  <Component Id="cmp64749469DE632D7DA54D2EBB7A3AE60B" Guid="{C78C108F-7FD3-4A21-841E-308B01F5F075}">
+			<File Id="filCA6F2997FBE46DBDC9D674FE109F2E1F" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_use_existing_subckt03.png" />
+		  </Component>
+		  <Component Id="cmpF18143BE546D526859F1C5471E11F2FB" Guid="{5561B848-0CC1-4476-A537-8FAF66D44244}">
+			<File Id="fil59D02C4764779462F9998AC4C9EAB3DA" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_use_existing_subckt04.png" />
+		  </Component>
+		  <Component Id="cmp8CB8AE85C605D9520D284D02A40D7A0E" Guid="{EA56CBA5-7208-4160-99B9-718AAC62A7CE}">
+			<File Id="filD8B7762B2F764BE530254430D5E292C2" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_use_existing_subckt05.png" />
+		  </Component>
+		  <Component Id="cmp641101E8D1E9AEADC4198F95BA7BD96F" Guid="{3BEBE3B7-9679-44F0-AF38-41435F3ADFDA}">
+			<File Id="fil54F283D0C324204B7C99E097B8BEC07E" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_use_existing_subckt06.png" />
+		  </Component>
+		  <Component Id="cmp0A38E2FC1C828C9008B61E8F3719ECCC" Guid="{02F8FAE5-B646-4FA1-9D0F-87FB3B1D2B71}">
+			<File Id="fil613E0E9D05EBA27B050044509EAA87EE" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_use_existing_subckt07.png" />
+		  </Component>
           <Component Id="cmp1887EC93042A8F0C854E00EEC32380FD" Guid="{5E9AABDE-119F-42B5-A70C-6CE4DF95383F}">
             <File Id="filD8D64C42C0EC471FA21B778DAE92DF5D" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_libraries.html" />
           </Component>
+		  <Component Id="cmpF79E68A44B6D276CD4FD94243C7638EB" Guid="{0FF7F03D-7B90-4D59-B58B-1002A7C06005}">
+			<File Id="fil85D5D71C171C7E75B40D36EF9393ACCB" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_sky130.html" />
+		  </Component>
+		  <Component Id="cmp789D1388A55CE9AADEAAE762DC494821" Guid="{02A053D4-A647-458B-A6FB-B248E2DAA0B9}">
+			<File Id="fil64801DDEA7EE347873B81CE68A4D318E" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_sky130_01.png" />
+  		  </Component>
+		  <Component Id="cmp27CCFCA8735FEA1F70696E4CC11B2245" Guid="{513297B2-1D45-4793-B07A-5E12CD6D883A}">
+			<File Id="fil12D725EFF278F1C79AA2ED8ED8BDC286" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_sky130_02.png" />
+		  </Component>
+		  <Component Id="cmp3CF52F67544072F25918CEA2F1A53102" Guid="{D67EA447-08EA-4DB0-839A-4BA977EFE886}">
+			<File Id="fil2461CD8E802030397F78C8330D680FCE" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_sky130_03.png" />
+		  </Component>
+		  <Component Id="cmpC0909817135C078311BA958292379CC4" Guid="{73B1C6DB-746B-4F9C-AAC4-DB80AA6D11CC}">
+			<File Id="filE63659CA430413BC74267CACBD3AB1E2" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_sky130_04.png" />
+		  </Component>
+		  <Component Id="cmpA3B864C71585ACAC196B4E961B5DB437" Guid="{0BDBBD00-9B75-44F0-BD05-4C6DC6E0A8C4}">
+			<File Id="filD31AA7BD32998C1DFD4B996137A429AF" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_sky130_05.png" />
+		  </Component>
+		  <Component Id="cmp01895B909BF869B3E0579B007FF33C51" Guid="{A28AD9CD-A229-450B-9BF0-921B2743FEDA}">
+			<File Id="filD18805ABBFB42E91E4539E3F9DEFDA4A" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_sky130_06.png" />
+		  </Component>
+		  <Component Id="cmpACC84A8CADF454A45B82E0DB194474A7" Guid="{B0DE1428-1463-4A69-B2DC-9B734B501C18}">
+			<File Id="fil5485CFB92C9706326101E81D7162781C" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_sky130_07.png" />
+		  </Component>
+		  <Component Id="cmpB18E1C5C0C0279347B011EC72ACB36CB" Guid="{96B9E430-CECE-4BBD-97AB-12A6816BBB0E}">
+			<File Id="fil15D2FBC0F996F9B0115BD73DF5D5A235" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_sky130_08.png" />
+  		  </Component>
+		  <Component Id="cmp03435CD38825723564A3160E6C0420A9" Guid="{C803A939-06CC-454B-8FC6-275941D927F0}">
+			<File Id="fil31E1B8BCF830FDC0762F19C2CEFFFDAF" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_sky130_09.png" />
+		  </Component>
           <Component Id="cmp02F36C6BCDFD4EAC97D7A1D83514BB74" Guid="{71A60AE7-32B2-421D-9CB1-2103819E8622}">
             <File Id="fil9BF9BD4FC2F1EF71EE446FB4AEAB90EB" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides.html" />
           </Component>
@@ -903,13 +970,9 @@
       <ComponentRef Id="cmp899AB8B9ABE11F20A0C7BC767419FC1B" />
       <ComponentRef Id="cmp5C7893CE9CAC7172186A19D4F7C9B3F6" />
       <ComponentRef Id="cmp830D9797AC395079C02810A4A8D445E4" />
+	  <ComponentRef Id="cmp46766002C824318846B83CDF4DBAD182" />
       <ComponentRef Id="cmpD6A28746EC2D28A8FBAAAACA17ED987B" />
       <ComponentRef Id="cmp582FBF503439D78BC069B234036D9E89" />
-      <ComponentRef Id="cmp69EEA82A2C967338A67DDF35FDE45600" />
-      <ComponentRef Id="cmpE3B9694CA93BB1526F76E33A642CEA1B" />
-      <ComponentRef Id="cmp20646ABB70916F03A33E968411B57A70" />
-      <ComponentRef Id="cmp0A4C3E7FD6878AAA1D26FE8FD960048D" />
-      <ComponentRef Id="cmp17017531D96EA1AD3E48E88A3A9B8DBB" />
       <ComponentRef Id="cmp00B6516520113473361C8E8DF1C8141B" />
       <ComponentRef Id="cmp2211334633C86C7FD8FB44CD2B513095" />
       <ComponentRef Id="cmp57CBA7F2D8CABC805E262E532C0D3F90" />
@@ -927,6 +990,10 @@
       <ComponentRef Id="cmp2EA5ABF0232607FE2B60946F461AB4C8" />
       <ComponentRef Id="cmpEF190926FE94250EAD5B7813D4CB078D" />
       <ComponentRef Id="cmp74F21FF343DE290DFDEE33310BE585E1" />
+	  <ComponentRef Id="cmp09E38EB19A0FE87BCEEC21CA7364F723" />
+	  <ComponentRef Id="cmp6ADE2A2D330812ABB718A3118C89B3F3" />
+	  <ComponentRef Id="cmpC4CC987EDB3814BF6CDA06AD166E1AA5" />
+	  <ComponentRef Id="cmpF7D3EF7C7886FBF551B10FB97DAAD596" />
       <ComponentRef Id="cmpBE23AC11FA02835A80FA838229BC8687" />
       <ComponentRef Id="cmp6554BF7593A105E9B2BA2EE07C4D931C" />
       <ComponentRef Id="cmp327F0BACA71CBC62C20CA0DE456D4ECD" />
@@ -986,6 +1053,7 @@
       <ComponentRef Id="cmp5D66F2AD13E998B64847AB8B0624EE21" />
       <ComponentRef Id="cmp99C532DCC5EF9E1CD1D26BED58B2934E" />
       <ComponentRef Id="cmpA41BECAFCCD0A01F5DAD18A949FF2827" />
+	  <ComponentRef Id="cmp2122C826D84E0925566AEC470A7CFABD" />
       <ComponentRef Id="cmp7D84114D6FDF0E09CB66A982B3C581C3" />
       <ComponentRef Id="cmpDB80566B13B66B2A92E91DA0585404A9" />
       <ComponentRef Id="cmp8C7AB373FA963AF5F88C8B394FB28B19" />
@@ -1013,6 +1081,8 @@
       <ComponentRef Id="cmpF9280278155042E1B4DC007B03E1CCE6" />
       <ComponentRef Id="cmp8737C923A2CD6802ED6E13112BBB6599" />
       <ComponentRef Id="cmp4FDAD50274CE6105999BB73BF884DD1D" />
+	  <ComponentRef Id="cmp9C9646BA969959CDB04692029FCBCFB1" />
+	  <ComponentRef Id="cmp7D05C60DDE4C4E276B03CA0BFA79AA8E" />
       <ComponentRef Id="cmp80E23E69F6BFD335D5BE2C38F9C1FE2C" />
       <ComponentRef Id="cmpAF74F1FEB750C2B9BFD37D44390B6691" />
       <ComponentRef Id="cmpFB983E1BFC83DD89C4A99D9057D8C389" />
@@ -1099,7 +1169,26 @@
       <ComponentRef Id="cmpF6C3D9737087F3D9B2228B21C6734980" />
       <ComponentRef Id="cmpA1AF34A5AB0E46E83E2489246BC02E35" />
       <ComponentRef Id="cmp89BE8EF1B2B36CB950714E6DDEC886BB" />
+	  <ComponentRef Id="cmp24AB399EEF91852024CB83CD0A4EF749" />
+	  <ComponentRef Id="cmp97B7734742CE69199C349409D98FEB6F" />
+	  <ComponentRef Id="cmpC3D4EC73230C6AC07E8194BC3757FC41" />
+	  <ComponentRef Id="cmp376282B9962A9D56861EE6DEC1861CAC" />
+	  <ComponentRef Id="cmp64749469DE632D7DA54D2EBB7A3AE60B" />
+	  <ComponentRef Id="cmpF18143BE546D526859F1C5471E11F2FB" />
+	  <ComponentRef Id="cmp8CB8AE85C605D9520D284D02A40D7A0E" />
+	  <ComponentRef Id="cmp641101E8D1E9AEADC4198F95BA7BD96F" />
+	  <ComponentRef Id="cmp0A38E2FC1C828C9008B61E8F3719ECCC" />
       <ComponentRef Id="cmp1887EC93042A8F0C854E00EEC32380FD" />
+	  <ComponentRef Id="cmpF79E68A44B6D276CD4FD94243C7638EB" />
+	  <ComponentRef Id="cmp789D1388A55CE9AADEAAE762DC494821" />
+	  <ComponentRef Id="cmp27CCFCA8735FEA1F70696E4CC11B2245" />
+	  <ComponentRef Id="cmp3CF52F67544072F25918CEA2F1A53102" />
+	  <ComponentRef Id="cmpC0909817135C078311BA958292379CC4" />
+	  <ComponentRef Id="cmpA3B864C71585ACAC196B4E961B5DB437" />
+	  <ComponentRef Id="cmp01895B909BF869B3E0579B007FF33C51" />
+	  <ComponentRef Id="cmpACC84A8CADF454A45B82E0DB194474A7" />
+	  <ComponentRef Id="cmpB18E1C5C0C0279347B011EC72ACB36CB" />
+	  <ComponentRef Id="cmp03435CD38825723564A3160E6C0420A9" />
       <ComponentRef Id="cmp02F36C6BCDFD4EAC97D7A1D83514BB74" />
       <ComponentRef Id="cmp5353727D96EF1D42BC670B9B5B643C85" />
       <ComponentRef Id="cmp08FFB226D6198AABF0A1D621D72E893B" />
diff --git a/XSchemWin/XSchemWix/heat_doc.wxs b/XSchemWin/XSchemWix/heat_doc.wxs
index 76904e05..90042189 100644
--- a/XSchemWin/XSchemWix/heat_doc.wxs
+++ b/XSchemWin/XSchemWix/heat_doc.wxs
@@ -3,877 +3,943 @@
     <Fragment>
         <DirectoryRef Id="INSTALLFOLDER">
             <Directory Id="dir6311FA1F463296CEB32195C7A4F214DF" Name="doc">
-                <Component Id="cmpC12E745643934EE6CA5BC04C80E8C88A" Guid="{57824D03-67A9-4413-9930-E182FA7289E4}">
+                <Component Id="cmpC12E745643934EE6CA5BC04C80E8C88A" Guid="{3033B8AA-1C71-4826-A10B-8E5D455F975B}">
                     <File Id="fil085001B7F30A31864CEC9088D61CE569" KeyPath="yes" Source="$(var.docSrcDir)\bg4.svg" />
                 </Component>
-                <Component Id="cmp8D9434F0D2AB1D96460E63AC7DC06FF9" Guid="{A4A94FEE-6F32-4B91-9556-BF9816514AB6}">
+                <Component Id="cmp8D9434F0D2AB1D96460E63AC7DC06FF9" Guid="{9F9F7CD4-0FDA-4563-8A19-A9359DA30A28}">
                     <File Id="fil136E78BFA6223DF4AAA61CFA24E593AD" KeyPath="yes" Source="$(var.docSrcDir)\bg5.svg" />
                 </Component>
-                <Component Id="cmp867691F3B10C018A781A21B717E125CC" Guid="{6DD92CF4-D395-4422-AC6F-17D6E54E4E41}">
+                <Component Id="cmp867691F3B10C018A781A21B717E125CC" Guid="{BFD80756-99F7-495E-9DBB-F83F15551B7B}">
                     <File Id="filAEF3D766B869F4BF25C246868209BAC0" KeyPath="yes" Source="$(var.docSrcDir)\debian-swirl.svg" />
                 </Component>
-                <Component Id="cmp7EE651E0BECF6D82D2A9A97C692DC829" Guid="{5BB021ED-B161-4285-9BA0-BDDD71DE96F1}">
+                <Component Id="cmp7EE651E0BECF6D82D2A9A97C692DC829" Guid="{BD4616EC-309C-4AEB-B176-C807854C874C}">
                     <File Id="fil80522C9DC7E67024EC749AF5972EEA0C" KeyPath="yes" Source="$(var.docSrcDir)\index.html" />
                 </Component>
-                <Component Id="cmpB859306DD95239C4C3436B74D01EBD5D" Guid="{67AEDBE4-A6CB-40B6-AB5B-2A525159AF11}">
+                <Component Id="cmpB859306DD95239C4C3436B74D01EBD5D" Guid="{E7556BB2-71CC-4DF4-AF29-2FFC12FC0E54}">
                     <File Id="filA9E7E9707CD31F2BD4320A62FC0BF363" KeyPath="yes" Source="$(var.docSrcDir)\Makefile" />
                 </Component>
-                <Component Id="cmp8C61DC5591CC602FCD6377240984E2E6" Guid="{EFEB1075-D192-4E0D-973F-557ED0564CC2}">
+                <Component Id="cmp8C61DC5591CC602FCD6377240984E2E6" Guid="{4F95868C-EBA7-4C4B-A87D-65FFB0C46D35}">
                     <File Id="fil858485ECD5550EC7EF4CA77D7D7B1C09" KeyPath="yes" Source="$(var.docSrcDir)\menu_xschem.html" />
                 </Component>
-                <Component Id="cmpACD502025F21AD04E50DF1AF3BE7B5EF" Guid="{73235A12-B234-4614-BCD8-A39D4CFEDD4C}">
+                <Component Id="cmpACD502025F21AD04E50DF1AF3BE7B5EF" Guid="{D5F02A22-C8E1-4705-8AB1-5A734C2195BC}">
                     <File Id="fil1F47713E48E0593C4B37B0F13576DC2E" KeyPath="yes" Source="$(var.docSrcDir)\style.css" />
                 </Component>
-                <Component Id="cmp25A043AB41EF230E1E934445514477D5" Guid="{CEE362CB-F8AF-4B24-A164-A108BB7D52B4}">
+                <Component Id="cmp25A043AB41EF230E1E934445514477D5" Guid="{4E0CF8C0-99F6-46BA-B367-E7E7884F6E5A}">
                     <File Id="filBAC54F00DD92FBD5CCADF835F3677E8D" KeyPath="yes" Source="$(var.docSrcDir)\xschem.png" />
                 </Component>
-                <Component Id="cmp3EE12729C368AAE386D9F87D123AF8B1" Guid="{3CBDFB95-F523-4BD6-AABB-43426A838825}">
+                <Component Id="cmp3EE12729C368AAE386D9F87D123AF8B1" Guid="{2387F43D-C3CE-4EC3-A6FB-8ED06046212F}">
                     <File Id="filFD5D3066FDC5AB311163BF92D3238BC7" KeyPath="yes" Source="$(var.docSrcDir)\xschem1.png" />
                 </Component>
-                <Component Id="cmpDB2679E4A9AD23987A0D7CA88533A656" Guid="{B73E465D-A9C1-42B4-A363-4E56AD5A94C2}">
+                <Component Id="cmpDB2679E4A9AD23987A0D7CA88533A656" Guid="{66125C22-B55D-4F13-B66F-B9D3D739DFBD}">
                     <File Id="filB5BAB18CD952C15145D612E191ECB3D5" KeyPath="yes" Source="$(var.docSrcDir)\xschem2.png" />
                 </Component>
                 <Directory Id="dir56824767C511B5A8BDE9AD99F23EBEB0" Name="manpages">
-                    <Component Id="cmp9825A377AC374CFEE6EB63CFA6BE0BF6" Guid="{CADFE5F7-A07B-485A-A084-F7898FF0CDE5}">
+                    <Component Id="cmp9825A377AC374CFEE6EB63CFA6BE0BF6" Guid="{F4E3621A-7B29-40FE-865A-B41F94DC1951}">
                         <File Id="filBD354E9C342F6AB2EBF466996BFA6597" KeyPath="yes" Source="$(var.docSrcDir)\manpages\xschem.1.in" />
                     </Component>
                 </Directory>
                 <Directory Id="dir1A6EF3F3B7E2263922A60443E341E4CD" Name="xschem_man">
-                    <Component Id="cmpC4B67FB1F80BFA9664189B56CE8DAEC6" Guid="{AE738858-1820-488D-AFCC-BF14734B2DFF}">
+                    <Component Id="cmpC4B67FB1F80BFA9664189B56CE8DAEC6" Guid="{1ED74308-C921-4AE7-AED8-D094EC2A29D5}">
                         <File Id="filF259594CF3E31DB955EB1E42D27DE13F" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\attribute_substitution.obj.gz" />
                     </Component>
-                    <Component Id="cmp9DD9B6DEAB0CD49429098E1026944E4F" Guid="{6F906E27-B494-4B58-8CE7-F45278812ED8}">
+                    <Component Id="cmp9DD9B6DEAB0CD49429098E1026944E4F" Guid="{013F9EA8-6D34-4B0A-8CFC-802741CDD3C5}">
                         <File Id="fil85685915453B1F3769CA0C90B080AF26" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\attribute_substitution.png" />
                     </Component>
-                    <Component Id="cmpAF690A4E0D904C1CEF0448A03FFFF50F" Guid="{0BABAC14-CEAF-4C8E-8011-22356DE5023B}">
+                    <Component Id="cmpAF690A4E0D904C1CEF0448A03FFFF50F" Guid="{29131A55-F312-46DD-820B-15EA7B9EFE88}">
                         <File Id="fil08580CCFA2BB78C95FC7B5C8FEF2F52B" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\auto_wiring1.png" />
                     </Component>
-                    <Component Id="cmpFC6D3A6A746A5CF17C26E4C8A40868A6" Guid="{D2F5DCA6-50A5-4AAC-BF1C-9D4CBAC8A22F}">
+                    <Component Id="cmpFC6D3A6A746A5CF17C26E4C8A40868A6" Guid="{2C6F2F70-B574-4182-A916-8B3275579F90}">
                         <File Id="fil549D495BCE6511A9E52796063F1DF3F0" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\auto_wiring2.png" />
                     </Component>
-                    <Component Id="cmp7BA9FF5B93AA3B794F8CDBC55C4D96E9" Guid="{A9642D80-9067-4291-A1F0-05DCB90BBBF0}">
+                    <Component Id="cmp7BA9FF5B93AA3B794F8CDBC55C4D96E9" Guid="{82675F7A-6E55-4FA4-B80C-4B63E09DCCD0}">
                         <File Id="fil339DAADDCEB66D3163EDFEF4A1F3C020" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\backannotation1.png" />
                     </Component>
-                    <Component Id="cmp92FCD98D3EE579C25785A73D0D7ED11A" Guid="{554FBFD9-DEB2-4C57-8186-A83AF07D212E}">
+                    <Component Id="cmp92FCD98D3EE579C25785A73D0D7ED11A" Guid="{FEFC18DF-5C85-4EC1-9E92-0A6BD6C2E953}">
                         <File Id="fil4ACD15E227786476642CB8F88E28F762" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\backannotation10.png" />
                     </Component>
-                    <Component Id="cmp864BDE830197C5FE482638E18A9C3652" Guid="{5CE0A522-6139-4E50-8822-A85DB45250F5}">
+                    <Component Id="cmp864BDE830197C5FE482638E18A9C3652" Guid="{634EC479-C9EC-4BA5-83DA-9811C4B70620}">
                         <File Id="fil1D86F595CEE0DD02275989F9D27E9C8E" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\backannotation11.png" />
                     </Component>
-                    <Component Id="cmp899AB8B9ABE11F20A0C7BC767419FC1B" Guid="{170A8546-728B-42AC-9752-AC8109FDBA0B}">
+                    <Component Id="cmp899AB8B9ABE11F20A0C7BC767419FC1B" Guid="{3E72B6BB-08EA-4568-89EA-22F91B331BC2}">
                         <File Id="fil4399695F0D271808F2146E9C078FE782" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\backannotation12.png" />
                     </Component>
-                    <Component Id="cmp5C7893CE9CAC7172186A19D4F7C9B3F6" Guid="{5E6B750C-ACA3-435B-89DC-6AE457C32842}">
+                    <Component Id="cmp5C7893CE9CAC7172186A19D4F7C9B3F6" Guid="{3E96A2D1-5569-4082-9293-C7A711A803E2}">
                         <File Id="filB1D1B653FBB05BC5BD212DBD02C5A11C" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\backannotation13.png" />
                     </Component>
-                    <Component Id="cmp830D9797AC395079C02810A4A8D445E4" Guid="{A419074C-5A2E-41AB-B576-85D86A353434}">
+                    <Component Id="cmp830D9797AC395079C02810A4A8D445E4" Guid="{735D0391-1401-4F99-8C4F-C8B644A617F3}">
                         <File Id="fil1A2489071686F8984790BF5501FA50E1" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\backannotation14.png" />
                     </Component>
-                    <Component Id="cmpD6A28746EC2D28A8FBAAAACA17ED987B" Guid="{4AADDD33-AD42-4EC1-8F20-ECE321C1260F}">
+                    <Component Id="cmp46766002C824318846B83CDF4DBAD182" Guid="{CF2A7DC4-E0AC-4B77-8087-AD054B89A28B}">
+                        <File Id="filF1C29484942CC82FB2E9F30C7401501C" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\backannotation15.png" />
+                    </Component>
+                    <Component Id="cmpD6A28746EC2D28A8FBAAAACA17ED987B" Guid="{4A527258-2912-43FE-A773-37A480D368DF}">
                         <File Id="fil218EB066431BDA2A9C6ACA3EE7F4C040" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\backannotation2.png" />
                     </Component>
-                    <Component Id="cmp582FBF503439D78BC069B234036D9E89" Guid="{4B21D0C4-ACF2-423B-BF17-176BB7CF4E95}">
+                    <Component Id="cmp582FBF503439D78BC069B234036D9E89" Guid="{A981A695-D113-422D-BB83-82D4B7168857}">
                         <File Id="filBAF17814687873F7A5922B740DE8A958" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\backannotation3.png" />
                     </Component>
-                    <Component Id="cmp69EEA82A2C967338A67DDF35FDE45600" Guid="{F4365D99-BB9B-44D8-98FC-4A242ADE83BE}">
-                        <File Id="filC47335B1D7AD798519DE950DEC59AF9F" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\backannotation4.png" />
-                    </Component>
-                    <Component Id="cmpE3B9694CA93BB1526F76E33A642CEA1B" Guid="{E6146561-9E0F-4BDA-A337-349F74E24B84}">
-                        <File Id="fil135552F3C06484C365FE65A0CDC72D18" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\backannotation5.png" />
-                    </Component>
-                    <Component Id="cmp20646ABB70916F03A33E968411B57A70" Guid="{4535BE6C-F825-4273-9C24-099CD831E54E}">
-                        <File Id="fil9187407B5CBC2584D07DBEBAC24C3329" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\backannotation6.png" />
-                    </Component>
-                    <Component Id="cmp0A4C3E7FD6878AAA1D26FE8FD960048D" Guid="{5CC9BABD-51A5-4E86-ADEF-D286B106E158}">
-                        <File Id="filBB14DD87D7C7CE6AED72FA632023BEEA" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\backannotation7.png" />
-                    </Component>
-                    <Component Id="cmp17017531D96EA1AD3E48E88A3A9B8DBB" Guid="{67DC2B8D-F06D-47AD-8B7B-3D5DD7405593}">
-                        <File Id="filBD8F5656F78057B5EC74DBDDD1FABBED" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\backannotation8.png" />
-                    </Component>
-                    <Component Id="cmp00B6516520113473361C8E8DF1C8141B" Guid="{C68B2C6D-153E-4232-9AEA-BD3AFDDFD897}">
+                    <Component Id="cmp00B6516520113473361C8E8DF1C8141B" Guid="{AD55CC73-CBF9-4464-A13D-CA0F4EFD53D3}">
                         <File Id="fil01686B626893AC36C53EFD17A9B0D0F0" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\backannotation9.png" />
                     </Component>
-                    <Component Id="cmp2211334633C86C7FD8FB44CD2B513095" Guid="{FABF17EC-DB65-4D45-8042-98CB992EEF4F}">
+                    <Component Id="cmp2211334633C86C7FD8FB44CD2B513095" Guid="{20F6E260-1334-407A-A691-EC3F7F4330EC}">
                         <File Id="fil079574D0AFA4272A01756ABADA72DED1" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\big_design.obj.gz" />
                     </Component>
-                    <Component Id="cmp57CBA7F2D8CABC805E262E532C0D3F90" Guid="{3F7D2916-EC9A-41D9-8E6D-595E15ECF892}">
+                    <Component Id="cmp57CBA7F2D8CABC805E262E532C0D3F90" Guid="{615CEF2B-876B-48A0-B019-1E5FA9EADD36}">
                         <File Id="filC4741ED64D4B3A44DE261E9DFE4032DF" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\big_design.png" />
                     </Component>
-                    <Component Id="cmpB4C70B1DD39DCFC45E1E8D114A155238" Guid="{B9440681-B79C-4B61-B23B-605D92A6354A}">
+                    <Component Id="cmpB4C70B1DD39DCFC45E1E8D114A155238" Guid="{1DBFC35F-390E-4A7A-8761-DECCB7B85CEF}">
                         <File Id="filE08922FF1BF0FDAB10BE18DA02B671E2" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\building_symbol_01.png" />
                     </Component>
-                    <Component Id="cmp243AC4102A219CF9B1E625B24306206A" Guid="{8F018050-25A0-4537-BFB2-D49FFA7E5304}">
+                    <Component Id="cmp243AC4102A219CF9B1E625B24306206A" Guid="{0FD575BD-C443-4F90-BB3A-D3DEE694482F}">
                         <File Id="fil0E552BD028384FC73390EF32ACC2E898" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\building_symbol_02.png" />
                     </Component>
-                    <Component Id="cmp47D4CB5C48B2591C2C696A65E79F9DBB" Guid="{ABF4237E-8929-4E05-8362-5F4BD167B72C}">
+                    <Component Id="cmp47D4CB5C48B2591C2C696A65E79F9DBB" Guid="{6B4C1B4C-7A4D-461B-B9FD-7CEC84F7076A}">
                         <File Id="fil45C9F79C258AEAF9C90381F4ECD14FAE" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\building_symbol_03.png" />
                     </Component>
-                    <Component Id="cmp362D4FB6E8386F724E4855A3660C5DC5" Guid="{13EBB95E-D84E-4BC3-BF80-58F2D61BCADA}">
+                    <Component Id="cmp362D4FB6E8386F724E4855A3660C5DC5" Guid="{729F9DD7-C92C-4865-A775-B2E04347BECE}">
                         <File Id="fil65260F64C5547B7C1924AE24436B0D2B" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\building_xschem_symbol.html" />
                     </Component>
-                    <Component Id="cmpE58F27D6BBB3BAA26F452B319D57AFD6" Guid="{D70DC1F2-74E1-4DDE-9C49-5D4697CFB134}">
+                    <Component Id="cmpE58F27D6BBB3BAA26F452B319D57AFD6" Guid="{BC7AB45D-E907-43B7-83EC-4383D156079B}">
                         <File Id="filD3B687CD8D3E152EDA69BC0F073E55D0" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\busses0.png" />
                     </Component>
-                    <Component Id="cmp5EBD402900C682E1450A66E4E517B871" Guid="{1FD07A5A-C03B-4EC0-B60F-81C1E5E4C18F}">
+                    <Component Id="cmp5EBD402900C682E1450A66E4E517B871" Guid="{2A28157B-7037-4DE7-A73D-7A16E343A7AD}">
                         <File Id="filCFA86197F77D576731B4A8C28A295A38" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\busses1.png" />
                     </Component>
-                    <Component Id="cmpA8F006A1010B7C3BA88B9E4849C82340" Guid="{BB5F4743-9333-4065-A19D-1CEB7015578B}">
+                    <Component Id="cmpA8F006A1010B7C3BA88B9E4849C82340" Guid="{8E82C94C-8C49-47BC-8172-2EB6DCAAF480}">
                         <File Id="filCA5FB0D9C4E33E127B58684C9EAD32DF" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\busses2.png" />
                     </Component>
-                    <Component Id="cmp6D354145B37A6C2A69DE69A16C8651A8" Guid="{8D537561-2569-4747-96E8-3B5D0ECAC0B9}">
+                    <Component Id="cmp6D354145B37A6C2A69DE69A16C8651A8" Guid="{E115510C-A2E5-44D0-83B0-23342202E2B7}">
                         <File Id="fil68C4E6BD7190A06AEBA8E05EA1E02BDA" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\busses3.png" />
                     </Component>
-                    <Component Id="cmpA6AB78B04BBC707FE694C5FD48F835BB" Guid="{2505CEB0-13AA-4BC2-AFDA-0B3EB606352E}">
+                    <Component Id="cmpA6AB78B04BBC707FE694C5FD48F835BB" Guid="{AE0480E5-4F25-4AC0-A8A7-A6D57DB11F77}">
                         <File Id="filCC1A2B64517E9CA43452D1BA34093ACC" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\commands.html" />
                     </Component>
-                    <Component Id="cmp5F2A45E78EBD02CB7779C16BF4C03932" Guid="{80CC3CAF-FA21-49C8-96CD-4A17784CE72C}">
+                    <Component Id="cmp5F2A45E78EBD02CB7779C16BF4C03932" Guid="{C75C1DD6-4A38-49CB-986E-66FF92F95AD6}">
                         <File Id="fil8EF2CE33BBBC466A43CBD7B77B17F725" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\commands1.png" />
                     </Component>
-                    <Component Id="cmp35239CC60E8A28DF0814C1E2C8AED814" Guid="{F10EFAAB-8321-4617-804E-987E5C2DAE73}">
+                    <Component Id="cmp35239CC60E8A28DF0814C1E2C8AED814" Guid="{703B9193-CCA3-45B7-86E4-F8665909F602}">
                         <File Id="filE3F956C2E2CC4DF4A6D6798066F75F89" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\commands2.png" />
                     </Component>
-                    <Component Id="cmp2EA5ABF0232607FE2B60946F461AB4C8" Guid="{96A453D5-F0B0-434E-BB64-0862CA741F4E}">
+                    <Component Id="cmp2EA5ABF0232607FE2B60946F461AB4C8" Guid="{1FAB0291-AEEE-41D9-BD29-99DC22FDC883}">
                         <File Id="filE8B171B419E138F9E305831947A0C5F3" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\commands3.png" />
                     </Component>
-                    <Component Id="cmpEF190926FE94250EAD5B7813D4CB078D" Guid="{57A810A2-9A22-43DF-9F9C-0BBFFE4C1E3E}">
+                    <Component Id="cmpEF190926FE94250EAD5B7813D4CB078D" Guid="{85F9807C-0672-40EE-86A3-6CD2B5703582}">
                         <File Id="fil327258B4B717F6FB329EE15A186BD88B" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\commands4.png" />
                     </Component>
-                    <Component Id="cmp74F21FF343DE290DFDEE33310BE585E1" Guid="{D3E70202-AA2B-4448-A740-AC4A235F48A7}">
+                    <Component Id="cmp74F21FF343DE290DFDEE33310BE585E1" Guid="{28080F76-FF8D-4515-BC3B-46717ABE1D66}">
                         <File Id="filFB4AD56AFFDF1F1C7FC68FA4D1DEC4F8" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\commands5.png" />
                     </Component>
-                    <Component Id="cmpBE23AC11FA02835A80FA838229BC8687" Guid="{9D9DD086-83BC-47E3-BA18-0586AD4F716D}">
+                    <Component Id="cmp09E38EB19A0FE87BCEEC21CA7364F723" Guid="{AEC9E93D-2E21-4764-8045-53A20C763AC4}">
+                        <File Id="fil7C5F15C1D2049C00F1B8918FAFEB83B5" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\commands6.png" />
+                    </Component>
+                    <Component Id="cmp6ADE2A2D330812ABB718A3118C89B3F3" Guid="{BF4B181A-B330-43D9-AA62-5781B4EE88A4}">
+                        <File Id="fil281339A552574A3520080EAA0ABE39EA" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\commands7.png" />
+                    </Component>
+                    <Component Id="cmpC4CC987EDB3814BF6CDA06AD166E1AA5" Guid="{AF596404-CC53-40FA-939F-1F1102D93481}">
+                        <File Id="fil0C23CA94E58AEA01129014CBB119942E" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\commands8.png" />
+                    </Component>
+                    <Component Id="cmpF7D3EF7C7886FBF551B10FB97DAAD596" Guid="{3D8D3359-9167-44F9-8100-7272664508A8}">
+                        <File Id="fil0151E12F7C0C313E5B32262C736794A4" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\commands9.png" />
+                    </Component>
+                    <Component Id="cmpBE23AC11FA02835A80FA838229BC8687" Guid="{D1FD48B7-BDA7-4744-98CD-17908746C46D}">
                         <File Id="fil1551C1BC526F6F31EE155426A2003D21" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\component_instantiation.html" />
                     </Component>
-                    <Component Id="cmp6554BF7593A105E9B2BA2EE07C4D931C" Guid="{BB35E1A5-3774-4574-9AC5-24DD5796B629}">
+                    <Component Id="cmp6554BF7593A105E9B2BA2EE07C4D931C" Guid="{6FDC2F48-DC73-41FE-A6FD-563B93640217}">
                         <File Id="fil48DD6DE364010D21A9D248652CBC8A8D" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\component_properties.png" />
                     </Component>
-                    <Component Id="cmp327F0BACA71CBC62C20CA0DE456D4ECD" Guid="{DB736326-6072-47AE-A70D-44BB9D45E381}">
+                    <Component Id="cmp327F0BACA71CBC62C20CA0DE456D4ECD" Guid="{08EC08F6-77B2-42AB-A2E7-B7047047ADF8}">
                         <File Id="fil1A38721BC0EA7324783FB395B16E06FC" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\component_properties0.png" />
                     </Component>
-                    <Component Id="cmpC2BA7471EAC342F862EC10E60571EEA0" Guid="{6CFA04D1-993E-44F7-A7DD-072D26998B4D}">
+                    <Component Id="cmpC2BA7471EAC342F862EC10E60571EEA0" Guid="{0A6B41D7-3A02-4E93-A8A2-7F0F2757FD00}">
                         <File Id="fil052D386A389DB02142B23787677FCA21" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\component_properties1.png" />
                     </Component>
-                    <Component Id="cmpB7D5287722959EC8990DBDF38AA1ABA3" Guid="{DD82F91B-63E2-4AC5-B133-CE7F4151A45B}">
+                    <Component Id="cmpB7D5287722959EC8990DBDF38AA1ABA3" Guid="{8CC72503-303E-4331-8A64-D2C581FCCA72}">
                         <File Id="fil15B7AD6F3A6E6424B4123BD6B3B4CE55" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\component_properties2.png" />
                     </Component>
-                    <Component Id="cmpACAE24F8830429FF208A400371B5F728" Guid="{629C0C4F-C65A-4F78-B85F-49F3128AB97C}">
+                    <Component Id="cmpACAE24F8830429FF208A400371B5F728" Guid="{73C88FCE-16E9-4438-B4B5-EC88DABF1B84}">
                         <File Id="fil64B5E0E387234882D00CF308631875E1" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\component_properties3.png" />
                     </Component>
-                    <Component Id="cmpCA9A73716F7708C2A678DC897F965278" Guid="{51A7D024-731F-404C-B5B1-61A9EDA15BB7}">
+                    <Component Id="cmpCA9A73716F7708C2A678DC897F965278" Guid="{A1375694-E824-4BBE-ADA4-99C68DB5A4AA}">
                         <File Id="filD3891317904BED9707EE559D42CD3C67" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\component_property_syntax.html" />
                     </Component>
-                    <Component Id="cmp2C7952A1BE2DA799AEE6789B6562DC0C" Guid="{50D6A85B-EFB3-468B-9D67-0F9FEBD6CEFE}">
+                    <Component Id="cmp2C7952A1BE2DA799AEE6789B6562DC0C" Guid="{95E69524-3288-4DBB-A14F-AF77396A3C64}">
                         <File Id="fil4ABA99A981E89316203A456383D4091F" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\create_pdf_man" />
                     </Component>
-                    <Component Id="cmp5E7A8606369FC2174BCDFB9DB702A480" Guid="{782A6FEA-4556-4E07-BC78-B98261C98B4D}">
+                    <Component Id="cmp5E7A8606369FC2174BCDFB9DB702A480" Guid="{9502E92F-9125-4549-80C7-6699A5D47127}">
                         <File Id="filFCEA86D390B4F12CBE9033A494627FB6" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\creating_schematic.html" />
                     </Component>
-                    <Component Id="cmp49AEABD580BB96AD02273EC655160B3A" Guid="{CD5097D4-50E8-466D-964C-EBD29991BB5A}">
+                    <Component Id="cmp49AEABD580BB96AD02273EC655160B3A" Guid="{6CE338FE-CDC5-4000-BFD4-93D550A32D9C}">
                         <File Id="fil763AFBA311015B689B8362650F54638D" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\creating_schematic1.png" />
                     </Component>
-                    <Component Id="cmpD1F33DFE7BEE84728568BBE55FC588ED" Guid="{E2DBD771-74CF-4EAC-A420-6C7B16281DEE}">
+                    <Component Id="cmpD1F33DFE7BEE84728568BBE55FC588ED" Guid="{36327393-E9DF-4EBA-83B0-6587D593D1C0}">
                         <File Id="fil44D41C7258C8666C314A1F22A54576A0" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\creating_schematic10.png" />
                     </Component>
-                    <Component Id="cmpE6DC2F353FF9A5BF1C29EBF5684AE313" Guid="{8FB812DA-AFFB-43FA-BA9E-176F3B72E0F2}">
+                    <Component Id="cmpE6DC2F353FF9A5BF1C29EBF5684AE313" Guid="{711E35E2-9FDB-465D-942D-0C80DD261BDD}">
                         <File Id="fil716937DD6BCD8B9B9D4ADAFE82638DED" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\creating_schematic11.png" />
                     </Component>
-                    <Component Id="cmp5234B37F1FF0D73FC203FC02F02957A7" Guid="{164C20C4-C5DE-487F-B717-F0DD5E02D17B}">
+                    <Component Id="cmp5234B37F1FF0D73FC203FC02F02957A7" Guid="{B6BAB3B2-F4B5-434A-8180-8B767948898C}">
                         <File Id="filCCCD7077064B197CA502E05E1B813B96" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\creating_schematic12.png" />
                     </Component>
-                    <Component Id="cmp42596AEDDD9560C22B8816F507DF172C" Guid="{8B005BDB-A4AE-4A53-A114-0F944008392D}">
+                    <Component Id="cmp42596AEDDD9560C22B8816F507DF172C" Guid="{4B56B1B0-5DE0-48A1-8B8E-D33780025884}">
                         <File Id="filA844C0FB09D782092E15820E87E3434B" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\creating_schematic13.png" />
                     </Component>
-                    <Component Id="cmp6808EBE4B562AF9A632011D078EFC27F" Guid="{26C1DA8B-91C0-430F-A742-011B305EBC08}">
+                    <Component Id="cmp6808EBE4B562AF9A632011D078EFC27F" Guid="{BFB2A185-B7A0-4E72-89AE-5C82A40052E8}">
                         <File Id="fil8FD5E18805E0022E7D644B01452DF8D4" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\creating_schematic14.obj.gz" />
                     </Component>
-                    <Component Id="cmp3493EB779FE7989F873A2194CAC70FF2" Guid="{F9563746-844C-4ECB-BDAF-77DC567A0178}">
+                    <Component Id="cmp3493EB779FE7989F873A2194CAC70FF2" Guid="{EF4DAF55-77C1-4473-BC6D-51ED37F08A6A}">
                         <File Id="fil1BCFE7A191FCC40D4A1AE208F765DD42" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\creating_schematic14.png" />
                     </Component>
-                    <Component Id="cmpEE6B5FEBFFF2D01BE06B308A98952489" Guid="{3FA39652-3966-4FBC-911E-9824BD2803C4}">
+                    <Component Id="cmpEE6B5FEBFFF2D01BE06B308A98952489" Guid="{26EB3EA5-0A6E-4C19-A56C-08B412479F92}">
                         <File Id="fil04D9647CE477544F7A373D217909C1B6" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\creating_schematic2.png" />
                     </Component>
-                    <Component Id="cmp6210FC61110F7B67D9A61BFEE43425EE" Guid="{535439B1-79D7-4FF4-A837-4DE7BED764AC}">
+                    <Component Id="cmp6210FC61110F7B67D9A61BFEE43425EE" Guid="{5EE3B2A5-B4D0-46D5-8F75-483D91EF5BCC}">
                         <File Id="filF6638F795307DBF6070A3325D7B23027" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\creating_schematic3.png" />
                     </Component>
-                    <Component Id="cmp212DA14344FE349F38DD179984E9B754" Guid="{ABEB360D-A289-481A-AFD5-45332C327359}">
+                    <Component Id="cmp212DA14344FE349F38DD179984E9B754" Guid="{20993404-6001-4AFA-AE8B-4918BA4D1CB7}">
                         <File Id="filC44E9AF87B4EB4D7EDA1A50BF9C30B45" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\creating_schematic4.png" />
                     </Component>
-                    <Component Id="cmp4D302C87A7273D33DE8813F48D66862A" Guid="{216480D6-F43F-4AF2-9CBC-2EF877980336}">
+                    <Component Id="cmp4D302C87A7273D33DE8813F48D66862A" Guid="{CD7022C4-CED2-46C0-A467-E5E0452A02DC}">
                         <File Id="fil01466DFF53B454D6290D5F5949F6C775" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\creating_schematic5.png" />
                     </Component>
-                    <Component Id="cmpD8D4F751C3267945B148303DD8DF812B" Guid="{B266109B-8101-41A6-B0F7-15957C52D87D}">
+                    <Component Id="cmpD8D4F751C3267945B148303DD8DF812B" Guid="{CF2CC436-C9D2-45D2-B186-3E2BA2A9088B}">
                         <File Id="filDA0E70C698FC95AA8D5554B15C121D58" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\creating_schematic6.png" />
                     </Component>
-                    <Component Id="cmp7EE34B8453493B719A72BEBCBEBA3C0E" Guid="{D03F02E9-3FE2-4A61-9403-44F231CBC82B}">
+                    <Component Id="cmp7EE34B8453493B719A72BEBCBEBA3C0E" Guid="{D0D1E64C-6959-4F30-8BFA-246E88E9B051}">
                         <File Id="fil76DBE14F81591FBF2F46496D260F6482" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\creating_schematic7.png" />
                     </Component>
-                    <Component Id="cmpABDCC985D1FD673CB13D433818935B79" Guid="{58A243E5-D8CB-4A7C-B885-699BD470DE78}">
+                    <Component Id="cmpABDCC985D1FD673CB13D433818935B79" Guid="{DF1F97DD-0C1A-49A9-AEF5-FC5231E1D8E6}">
                         <File Id="fil6EF08578D798231CDEA848FCE81A3E38" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\creating_schematic8.png" />
                     </Component>
-                    <Component Id="cmp7482C0543A4B66DCE8740B75329D9679" Guid="{9850133A-4352-4029-9775-7BBBD20BD97D}">
+                    <Component Id="cmp7482C0543A4B66DCE8740B75329D9679" Guid="{EAC2B26F-604F-4CBF-807E-98B785B772A0}">
                         <File Id="fil3BE8C299848DF20FEE544DCB770D3DAC" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\creating_schematic9.png" />
                     </Component>
-                    <Component Id="cmp832CF685C20985ADAF93B6E50EF43634" Guid="{2369BF45-232C-4C6A-BF86-0530A02A49CD}">
+                    <Component Id="cmp832CF685C20985ADAF93B6E50EF43634" Guid="{42A386CF-5854-4E2C-847A-CFE39B751665}">
                         <File Id="fil6BB01A9C2DE73CAC7B96190DB7B4AE2E" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\creating_symbols.html" />
                     </Component>
-                    <Component Id="cmp6C9DE118A056AEF1555AE64C4419DAF9" Guid="{03F657AF-864B-4473-BEEB-A469831CE555}">
+                    <Component Id="cmp6C9DE118A056AEF1555AE64C4419DAF9" Guid="{6D265A5A-2A5A-4B66-9625-4200AA48D0D6}">
                         <File Id="fil9F26F3EA05B72C37C0FBE78BB5953155" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\dashes.png" />
                     </Component>
-                    <Component Id="cmp5F0C3B27B45BC1CB74EC4116EA919F92" Guid="{D928F4CE-C709-4830-BF4C-979915DC6DF6}">
+                    <Component Id="cmp5F0C3B27B45BC1CB74EC4116EA919F92" Guid="{A00B4325-3773-4F73-9E04-7641C300A30F}">
                         <File Id="filA42D791AEB77D16C2575440362FC405C" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\developer_info.html" />
                     </Component>
-                    <Component Id="cmp31B6696E8003859D1FEC28F081B05A27" Guid="{297E49A8-B5E9-4715-BB17-7FED077CDB9F}">
+                    <Component Id="cmp31B6696E8003859D1FEC28F081B05A27" Guid="{AA5E2265-BABE-4144-8C7F-4A1EB4B57C81}">
                         <File Id="filBB288F87D69E0F812288808A05C8921B" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\developer_info_01.png" />
                     </Component>
-                    <Component Id="cmpC57D5897B56DF5CBEDC980E10433AF81" Guid="{40EDBE7F-4244-481A-AA03-DF2F48F1CF6D}">
+                    <Component Id="cmpC57D5897B56DF5CBEDC980E10433AF81" Guid="{BC04DA54-79CC-4C1B-B2E9-7BB9B1AE89DB}">
                         <File Id="fil0662BA7503748D583A74C0360D40D221" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\developer_info_02.png" />
                     </Component>
-                    <Component Id="cmp7DAA78F03CF1FD3C453534BF4ECBE220" Guid="{2BD56A3B-3A9F-40F4-902F-55F778757137}">
+                    <Component Id="cmp7DAA78F03CF1FD3C453534BF4ECBE220" Guid="{3766832F-E9C5-487E-9FD3-C92F741987A8}">
                         <File Id="fil24D0A34F7BBA3483B0D8F55F82E2B5D0" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\developer_info_03.png" />
                     </Component>
-                    <Component Id="cmp4D23B9F9CB96C3A4AFB4B5F92AC96FD9" Guid="{3F31CBF5-1E41-4292-A2E0-E878692ECAB6}">
+                    <Component Id="cmp4D23B9F9CB96C3A4AFB4B5F92AC96FD9" Guid="{563A2983-4AE0-4294-8E64-243B81D15B51}">
                         <File Id="fil04AD84996D63D52927852C87E34ACF43" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\developer_info_04.png" />
                     </Component>
-                    <Component Id="cmp72A7DFD2AB2DC4734E2CE4F5F2C0710D" Guid="{B0DD8EFF-3EEE-4E81-80BE-0492072AD542}">
+                    <Component Id="cmp72A7DFD2AB2DC4734E2CE4F5F2C0710D" Guid="{9EDBCD5E-52EA-402F-8958-3372A88BC12B}">
                         <File Id="fil1852026C651993B5C9D90143E31FCD6F" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\developer_info_05.png" />
                     </Component>
-                    <Component Id="cmp022AA6C97DC6CEB9BE6BF0758392CECF" Guid="{4263117B-A41F-4C96-868E-A1B914F0854A}">
+                    <Component Id="cmp022AA6C97DC6CEB9BE6BF0758392CECF" Guid="{348F39C8-EF94-42E8-BF66-74652210881B}">
                         <File Id="fil370137B870ABABBC9B9B127999CD4CA0" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\developer_info_06.png" />
                     </Component>
-                    <Component Id="cmp60AF36208CBD15BA02F3C0D627A5257E" Guid="{D54421A5-D102-473A-B7F1-BD750767EA84}">
+                    <Component Id="cmp60AF36208CBD15BA02F3C0D627A5257E" Guid="{9D7868CC-3A70-45D9-A077-FD25C01F5E4C}">
                         <File Id="fil63388A5AD4430AA19F242BCF0992C6E8" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\developer_info_07.png" />
                     </Component>
-                    <Component Id="cmp2C66755C98411F1273A4C9DE7215BEDC" Guid="{06842E02-1D7F-406F-9D63-E565E4BC6EF5}">
+                    <Component Id="cmp2C66755C98411F1273A4C9DE7215BEDC" Guid="{7A8FD051-54C2-4787-ACE5-2485B55FBC33}">
                         <File Id="fil10B07CB7CD456A24ACE1A248B3A3523E" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\edit_property.png" />
                     </Component>
-                    <Component Id="cmp7C169D8B7D8E4FF9954B9D9CDDD570CC" Guid="{B871F9DF-144A-43EA-8542-486BC60EAB34}">
+                    <Component Id="cmp7C169D8B7D8E4FF9954B9D9CDDD570CC" Guid="{FD2ED9A2-AEDE-400D-8DB7-017C0527683C}">
                         <File Id="fil5C3B7EF3CB7E52EC2666DA64C3475CF4" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\edit_property2.png" />
                     </Component>
-                    <Component Id="cmp49DDB67C54D11E163D7D7DFC0FB7DF30" Guid="{1F3136E5-6B99-42E5-9817-1D3F933D89B5}">
+                    <Component Id="cmp49DDB67C54D11E163D7D7DFC0FB7DF30" Guid="{868A2D17-85C1-43DA-BC5A-B310A92D5F26}">
                         <File Id="filAC7DEBF82AD7D0D62E1ECB69286A7B6C" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\esotheric_xschem_01.png" />
                     </Component>
-                    <Component Id="cmp5200FA445D9B11D07541D616D8542B9C" Guid="{037E39A7-8553-4931-BFFD-C70FF2540B7C}">
+                    <Component Id="cmp5200FA445D9B11D07541D616D8542B9C" Guid="{DD49F5A0-E8AA-4E74-9B09-775B7F3F0219}">
                         <File Id="fil10E9BD63A5810B35AA5CAC581D7D72D7" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\esotheric_xschem_02.png" />
                     </Component>
-                    <Component Id="cmp27780F5B1FFEDC319E889A22E584681F" Guid="{30FB4F08-12FF-4B51-85B5-78B531FEABE1}">
+                    <Component Id="cmp27780F5B1FFEDC319E889A22E584681F" Guid="{776441D8-5B4A-45AA-9EBC-05213947DA9B}">
                         <File Id="filCA5915DEF58E3B0AB024A7CA0316A603" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\faq.html" />
                     </Component>
-                    <Component Id="cmpA3E75755A8AAFBE672AE99E92C4BBF8E" Guid="{AF3A782E-A614-46E3-BA36-1231C6D6F4B3}">
+                    <Component Id="cmpA3E75755A8AAFBE672AE99E92C4BBF8E" Guid="{6486974B-E115-4A10-AD04-E8F15F7ABDB6}">
                         <File Id="filF6D184D623850576FA8753930106E3F1" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\faq00.png" />
                     </Component>
-                    <Component Id="cmpFDD3D37AEDD41E4A735CC0D0B06FF0E7" Guid="{4DB51F87-4637-4952-9155-A75D1637FFAF}">
+                    <Component Id="cmpFDD3D37AEDD41E4A735CC0D0B06FF0E7" Guid="{1A218E17-9E9E-43EC-BABA-26B754C1AFBE}">
                         <File Id="fil9DE38DEAA969CAFF256B22DF913B21DA" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\faq01.png" />
                     </Component>
-                    <Component Id="cmpE04977F0950425CA6A35D7443890FEDA" Guid="{42D59A66-9CDE-43BC-9873-E9674F276A84}">
+                    <Component Id="cmpE04977F0950425CA6A35D7443890FEDA" Guid="{ED2DCED4-82B9-48A8-924F-5D57C3BA51DF}">
                         <File Id="fil8B7F6EAACBB8C4F0B6E99A7214B5E024" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\general_rules.png" />
                     </Component>
-                    <Component Id="cmp9C61E6C73B92F631D2F4921DBC7E27AA" Guid="{60F5BF8D-77EF-4CE1-90B0-4031CEFB0A98}">
+                    <Component Id="cmp9C61E6C73B92F631D2F4921DBC7E27AA" Guid="{912FE5F9-7A41-4732-B765-C98BCB677454}">
                         <File Id="fil8D7933E7D123C25695CC78C1148017A9" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\global_property.png" />
                     </Component>
-                    <Component Id="cmp740874B224A56CFE2CCF34DF58E60FD0" Guid="{55D9A87F-90F1-4217-8563-C3117F29A1F5}">
+                    <Component Id="cmp740874B224A56CFE2CCF34DF58E60FD0" Guid="{EBB998E6-29D7-4F9F-A0DD-86964D331362}">
                         <File Id="filFABFA28AE6A48C24358CBBA3588306CB" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\graphs.html" />
                     </Component>
-                    <Component Id="cmpC813583375804396B97AED14720B5626" Guid="{EE454F25-F9F0-4953-819A-A7E9E2440D48}">
+                    <Component Id="cmpC813583375804396B97AED14720B5626" Guid="{B69B40BF-502B-4FD2-AD99-FB4E68F7C2B7}">
                         <File Id="filD674B9C36FC8FC7540A8F39A53224E43" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\graphs01.png" />
                     </Component>
-                    <Component Id="cmp230FF209E9F582A4F1E7648DE73456CB" Guid="{71F84804-FDF6-4ECB-9AE4-1779D6909047}">
+                    <Component Id="cmp230FF209E9F582A4F1E7648DE73456CB" Guid="{9C7C7669-E258-4125-93E6-BB82731DCCCA}">
                         <File Id="fil7773B42F33BFE9332820D40733863C14" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\graphs02.png" />
                     </Component>
-                    <Component Id="cmp5A9CD2054A04C919AE72DE3D1F353CFE" Guid="{C42FEDC7-078B-4DB5-B819-3787197E29E4}">
+                    <Component Id="cmp5A9CD2054A04C919AE72DE3D1F353CFE" Guid="{A6472906-A4AB-4A62-993F-2FADA1F8E42C}">
                         <File Id="filB457E827354F127DA98F8DCD47733AA2" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\graphs03.png" />
                     </Component>
-                    <Component Id="cmpB7FFDE35B0ABD817CB7911FF1EA95EBF" Guid="{B1FAA652-B63C-4D7C-B82E-CF77CBC134C6}">
+                    <Component Id="cmpB7FFDE35B0ABD817CB7911FF1EA95EBF" Guid="{8027D5C4-FF49-4925-8AD0-8E8AAFC61FA8}">
                         <File Id="filD9D670302F61B3C48E80E43A46E114B0" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\graphs04.png" />
                     </Component>
-                    <Component Id="cmp5BD82B4625C5DDDFD12CA154246CEEBD" Guid="{12FB760A-36B4-4825-AA30-F38845D770BB}">
+                    <Component Id="cmp5BD82B4625C5DDDFD12CA154246CEEBD" Guid="{96A52789-50BE-4CB0-B88B-FDF756BFB640}">
                         <File Id="fil5A95EA74DE26FD2DBCEEB19E406EBF8B" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\graphs05.png" />
                     </Component>
-                    <Component Id="cmpE93F45A345CBCE6CE0BFB45A0B8A1CFE" Guid="{A4437E34-20CA-428D-9115-7AD5FE2494D7}">
+                    <Component Id="cmpE93F45A345CBCE6CE0BFB45A0B8A1CFE" Guid="{B3FEF3A1-3E2D-4F62-9981-A047F5A4F48B}">
                         <File Id="filF9EACF3BBD6AFC5E2B516EDE4CFD19CD" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\graphs06.png" />
                     </Component>
-                    <Component Id="cmp51DB9959998196E893263640FEB98E34" Guid="{8114DED7-636C-41D9-BD81-42F6DD4369F1}">
+                    <Component Id="cmp51DB9959998196E893263640FEB98E34" Guid="{EF8EAE15-4102-49AD-9274-51DE652C8DB2}">
                         <File Id="fil8DBF11E3DB65C1FBB2C28F8467D9A91D" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\graphs07.png" />
                     </Component>
-                    <Component Id="cmpDF1717CE9FBAD9506F3230EBCF486304" Guid="{C03E4642-73B2-4967-B01F-828A0E865142}">
+                    <Component Id="cmpDF1717CE9FBAD9506F3230EBCF486304" Guid="{5E37640F-4716-42D6-9556-173CC97F25C2}">
                         <File Id="fil70A651707CB61D244A0E2AEBF8BB18B3" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\graphs08.png" />
                     </Component>
-                    <Component Id="cmp85DFC1BFDBD576871E2F52C6F43B78E6" Guid="{E3FD74D1-3004-490E-9631-2E8B308AE7BA}">
+                    <Component Id="cmp85DFC1BFDBD576871E2F52C6F43B78E6" Guid="{0C026C74-D0DC-48B8-B7D0-7153004B4B58}">
                         <File Id="fil1C6DD758E0BE985AF7F2C3CD7FCFA125" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\graphs09.png" />
                     </Component>
-                    <Component Id="cmp14AEDEF10B42CBCD0FCDB294E7D40813" Guid="{C21902C7-8253-44F3-A2D7-742DB2B8CFFB}">
+                    <Component Id="cmp14AEDEF10B42CBCD0FCDB294E7D40813" Guid="{38F09E06-8847-4DFE-BFFE-4D21DCE5C11E}">
                         <File Id="filA8DD27097EEA145C9FD6912B91142EC8" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\graphs10.png" />
                     </Component>
-                    <Component Id="cmpD3F50248B5661D0762D1937C118E395E" Guid="{07A421E9-B4EC-4CF2-B006-CEE202BD9FC4}">
+                    <Component Id="cmpD3F50248B5661D0762D1937C118E395E" Guid="{FF6E7A2D-95FD-40CD-A5BB-4C5851CF7860}">
                         <File Id="fil3C2EE361B66A1E6337E4223BE26200DB" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\graphs11.png" />
                     </Component>
-                    <Component Id="cmpE98EB455E6D39076B1A40C1CAB3D835E" Guid="{139607AB-6972-469C-AC43-C6E7F3A64EF9}">
+                    <Component Id="cmpE98EB455E6D39076B1A40C1CAB3D835E" Guid="{4892D0E8-F74C-4205-9AC9-04F3EBDA4C3B}">
                         <File Id="fil23F611BD2A702D7E3820AD7C74811351" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\graphs12.png" />
                     </Component>
-                    <Component Id="cmp5D66F2AD13E998B64847AB8B0624EE21" Guid="{FEB9FB72-CF80-47E0-BF40-BBE49FD24DBF}">
+                    <Component Id="cmp5D66F2AD13E998B64847AB8B0624EE21" Guid="{C4F0788F-547C-4A9D-9B33-F709289C1A89}">
                         <File Id="fil94720C4E20330274DB4C89C8EBE7B2FC" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\graphs13.png" />
                     </Component>
-                    <Component Id="cmp99C532DCC5EF9E1CD1D26BED58B2934E" Guid="{6A428B67-06AD-4114-9968-39C83A4FEA93}">
+                    <Component Id="cmp99C532DCC5EF9E1CD1D26BED58B2934E" Guid="{F51EF9D8-AC16-41A9-B0BF-886DFF6E50E1}">
                         <File Id="fil04166376BFA25115160171891B16FB23" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\graphs14.png" />
                     </Component>
-                    <Component Id="cmpA41BECAFCCD0A01F5DAD18A949FF2827" Guid="{4A42F169-7DC7-4B38-A535-88DEFE3FE240}">
+                    <Component Id="cmpA41BECAFCCD0A01F5DAD18A949FF2827" Guid="{DF2E80E4-D58E-40C9-8885-4CDD5DED12ED}">
                         <File Id="fil52A4BE0CB79D0FD8C836704442CBDD88" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\graphs15.png" />
                     </Component>
-                    <Component Id="cmp7D84114D6FDF0E09CB66A982B3C581C3" Guid="{1CECA8FE-173B-4273-B0A6-C1F0769FE5A9}">
+                    <Component Id="cmp2122C826D84E0925566AEC470A7CFABD" Guid="{AEF02D77-D7AB-42BC-BB10-1E37C997A84D}">
+                        <File Id="fil02B785B7CCDC980D09CDB2BB23484767" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\graphs16.png" />
+                    </Component>
+                    <Component Id="cmp7D84114D6FDF0E09CB66A982B3C581C3" Guid="{4BE8C136-DAFE-418C-9F7C-1CAE733F85CD}">
                         <File Id="fil00E7CE2F76CC18FC1618A1670E025C42" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\gschemtoxschem.png" />
                     </Component>
-                    <Component Id="cmpDB80566B13B66B2A92E91DA0585404A9" Guid="{971B2775-AE8E-48B5-8810-F34E11D926FA}">
+                    <Component Id="cmpDB80566B13B66B2A92E91DA0585404A9" Guid="{50167EB6-DC33-472D-8AF6-A4AC0671EF60}">
                         <File Id="fil85DFE16AE9319CA971C2DAD1CDE6ED4B" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\icon.xpm" />
                     </Component>
-                    <Component Id="cmp8C7AB373FA963AF5F88C8B394FB28B19" Guid="{07AFE9AA-CD3B-4E36-96DB-A8A0A25C3182}">
+                    <Component Id="cmp8C7AB373FA963AF5F88C8B394FB28B19" Guid="{C2B0BF05-C1EC-4853-9684-B7EECED44274}">
                         <File Id="fil4477B2695680604C6F6AA9F5E0E2FFB1" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\install_xschem.html" />
                     </Component>
-                    <Component Id="cmp2DB8618704C7034B543BD78F8410CB70" Guid="{26BAAB86-884C-4A6D-BE82-760582B15286}">
+                    <Component Id="cmp2DB8618704C7034B543BD78F8410CB70" Guid="{F1F2AA60-9C95-4413-8FD2-E2648496CD73}">
                         <File Id="filABBDDFFF90735804749ED6C5727372C5" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\load_schematic.png" />
                     </Component>
-                    <Component Id="cmp8A2095B0FF09EA0F68B73AAAC60EA69B" Guid="{C1846A2F-3EFE-42A4-BDC4-617C15D6B6A6}">
+                    <Component Id="cmp8A2095B0FF09EA0F68B73AAAC60EA69B" Guid="{A22D149C-70FE-48CA-899A-6A8F66085415}">
                         <File Id="filE32C94FFB215B5FED1A82D784DE1690B" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\netlisting.html" />
                     </Component>
-                    <Component Id="cmp97047CA23E73FCF9A2A774BE2B268856" Guid="{E7D24C6B-A05C-41FE-881F-084B65C3C3DB}">
+                    <Component Id="cmp97047CA23E73FCF9A2A774BE2B268856" Guid="{36892B86-9A1C-46E1-AC96-7EB65EE83453}">
                         <File Id="fil2D7E016DFAA7BA65F8B39676F86468BE" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\netlisting1.png" />
                     </Component>
-                    <Component Id="cmpFA35BC7AF9A1F28B80C988CDD4DF98D2" Guid="{907B8F84-506C-46CB-B797-A1163DF86A16}">
+                    <Component Id="cmpFA35BC7AF9A1F28B80C988CDD4DF98D2" Guid="{CC939A47-9EE0-4713-9354-905E3A15FD38}">
                         <File Id="filE7EEF6BFEA357CBA60951710999C6FF5" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\netlist_commands.obj.gz" />
                     </Component>
-                    <Component Id="cmp1036EBB0532070976C4FDF5B6B6B2144" Guid="{4ABB9173-D499-4B8B-843E-287D89F7EC10}">
+                    <Component Id="cmp1036EBB0532070976C4FDF5B6B6B2144" Guid="{F6942539-15CA-41FE-AC6F-85D4D777C53C}">
                         <File Id="fil6B062352CDABA0002966199F7771D227" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\netlist_commands.png" />
                     </Component>
-                    <Component Id="cmp0EDAD19E92D7265080FBF350BD3CB6B9" Guid="{82737A51-31F2-4634-BA75-ADD1AE1444D2}">
+                    <Component Id="cmp0EDAD19E92D7265080FBF350BD3CB6B9" Guid="{45AC2051-ACD9-45FE-81AF-72D4039973A4}">
                         <File Id="fil7C78140E3C11AB2BBCC514FBDA6423AD" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\nets_pins.png" />
                     </Component>
-                    <Component Id="cmp29B637F3610EC35C09AB885BC63F49BA" Guid="{96738019-0258-46CD-B4EB-CB330B8F2484}">
+                    <Component Id="cmp29B637F3610EC35C09AB885BC63F49BA" Guid="{907715BA-4907-443E-BE36-3BB55251F5A5}">
                         <File Id="fil1B03F5C95889966585AEA25E030A488C" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\net_probes.html" />
                     </Component>
-                    <Component Id="cmpC8145C8950A9D458F7C1B5997BDD121F" Guid="{646AD803-8E07-4EB5-BB52-3FCEB7A4A784}">
+                    <Component Id="cmpC8145C8950A9D458F7C1B5997BDD121F" Guid="{07EF1A31-E2A1-4806-8DD7-75AF2DA7C24D}">
                         <File Id="filEACC6FA44B98EBD99ABEBED5B00F87AF" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\nmos4_editprop.png" />
                     </Component>
-                    <Component Id="cmp5B21FE1C933166701740347617BCA747" Guid="{F3CA4F99-5135-4AA2-996E-28BAF7215FBB}">
+                    <Component Id="cmp5B21FE1C933166701740347617BCA747" Guid="{E941A66D-3EDF-42D6-8DD7-B453086C8AC7}">
                         <File Id="filC04B942F5E70934BE196CCD1E5F11B82" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\nmos4_editprop2.png" />
                     </Component>
-                    <Component Id="cmpFA279093489CB06BB7FB240299D3929F" Guid="{CF9BD5AE-EA0E-425F-A08C-DF6774486E35}">
+                    <Component Id="cmpFA279093489CB06BB7FB240299D3929F" Guid="{3B27AB66-95CA-46C2-9886-900A88B25BED}">
                         <File Id="filD909FDCEC7250485C03AA5700110858C" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\nmos4_editprop3.png" />
                     </Component>
-                    <Component Id="cmpF840B9FB44A98472C35B4E0FF008F9F4" Guid="{CD3E247E-FC8A-42D0-8120-B2436460A683}">
+                    <Component Id="cmpF840B9FB44A98472C35B4E0FF008F9F4" Guid="{841EAA60-04D1-4FF2-94FE-E432954E6C3A}">
                         <File Id="fil11C603F76D98470EABBF55BC964CD57F" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\nmos4_labels.png" />
                     </Component>
-                    <Component Id="cmp9897A40EE403F9CF61A88D47B0E71B85" Guid="{FA1ABEA4-9AC9-4D9C-833E-84A4722D0F49}">
+                    <Component Id="cmp9897A40EE403F9CF61A88D47B0E71B85" Guid="{48597D95-B6D7-47C9-9189-96A9630FA184}">
                         <File Id="filB4D2852FDB881C90150E36C9AFF64DDD" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\nmos4_labels2.png" />
                     </Component>
-                    <Component Id="cmp937F4814C3DA19218496F4F48D2A5A4A" Guid="{49CB16A1-87B7-4F7D-BE9D-D020561C0BD1}">
+                    <Component Id="cmp937F4814C3DA19218496F4F48D2A5A4A" Guid="{3AC27EAD-77DE-41E8-ADE1-960D7674E469}">
                         <File Id="filD7D28F1A0C996BAB4559E249B7784933" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\nmos4_symbol.png" />
                     </Component>
-                    <Component Id="cmpF6DBE7406349A81C1488ACA8CF1C82A3" Guid="{404B20CF-048F-4983-8898-3238DC3C76FC}">
+                    <Component Id="cmpF6DBE7406349A81C1488ACA8CF1C82A3" Guid="{C22512B5-2DBD-495C-BD05-86A654B08C36}">
                         <File Id="fil6C23B3C1C88E2F6CF80BF529837E02A7" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\nmos4_wires.png" />
                     </Component>
-                    <Component Id="cmpC398F4A1D718E9B56EC6D199D60C5DF6" Guid="{7F095434-AAE9-4D04-BECE-E344C14F60E8}">
+                    <Component Id="cmpC398F4A1D718E9B56EC6D199D60C5DF6" Guid="{EEA4FF30-3AB5-4CBD-AF6B-74B306C4A933}">
                         <File Id="fil7A096435EA4A6858CB6D82E4AEE22FA0" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\nmos_properties.png" />
                     </Component>
-                    <Component Id="cmp6E5A32BFA18F62931036DCBA384F1050" Guid="{43BB0848-C562-4D30-96DB-99965859FE22}">
+                    <Component Id="cmp6E5A32BFA18F62931036DCBA384F1050" Guid="{C2666641-A653-4B96-BCBB-B2357A0FE396}">
                         <File Id="fil9D786F1EC430FCC7D156C56D7C56AC7A" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\nmos_properties2.png" />
                     </Component>
-                    <Component Id="cmpA5FDD4433F3CCA1331A8EAF6ED2EC5D8" Guid="{06C62E84-A6D5-4266-A75B-2979BE332DAB}">
+                    <Component Id="cmpA5FDD4433F3CCA1331A8EAF6ED2EC5D8" Guid="{2521826B-72F7-4DF0-9B62-6F31C35649AC}">
                         <File Id="fil3C5460E61ABE8A8635E116724DDC79B0" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\nmos_properties3.png" />
                     </Component>
-                    <Component Id="cmp8DEFD1096D40F72D6F26423D5BD18333" Guid="{77A7FE9D-4BB7-4EEF-812A-7B9AE016619B}">
+                    <Component Id="cmp8DEFD1096D40F72D6F26423D5BD18333" Guid="{9260B4BE-865C-4209-85C5-D1F0A5B2C5E4}">
                         <File Id="filEDE31BD8828A6FEB8B18F527BE510698" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\parameters.html" />
                     </Component>
-                    <Component Id="cmp9D0911B1564E7A5F997BA80D0386ECDB" Guid="{256C40A1-DC6B-4566-816E-920426B88FB0}">
+                    <Component Id="cmp9D0911B1564E7A5F997BA80D0386ECDB" Guid="{D7A73C6E-027D-4031-9C88-BDBBA5EC3C2E}">
                         <File Id="filE489B6695191181E907DA7268755B98A" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\parameters1.png" />
                     </Component>
-                    <Component Id="cmp7D9DD96B845CB9CDF8BCBA651A29AD94" Guid="{699D8A0C-3337-4044-9B5A-45E47D0BE725}">
+                    <Component Id="cmp7D9DD96B845CB9CDF8BCBA651A29AD94" Guid="{05DAEC7C-7D87-4806-83EC-D8F1C8E45DE9}">
                         <File Id="fil4A691730241C653E9E5A11481771588B" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\parameters2.png" />
                     </Component>
-                    <Component Id="cmpAECDF107C3FE6FD35BC09EEC6AE27ACE" Guid="{A626E941-1DE1-487C-A9F7-6793CAE93389}">
+                    <Component Id="cmpAECDF107C3FE6FD35BC09EEC6AE27ACE" Guid="{E226E7B6-D9A7-4B3B-8D24-8B7ECE8997CB}">
                         <File Id="fil36F4C95F7017AE0A3EA24A976392EAD5" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\parameters3.png" />
                     </Component>
-                    <Component Id="cmpF9280278155042E1B4DC007B03E1CCE6" Guid="{2F228595-CD24-4A06-B95C-F74C87F00138}">
+                    <Component Id="cmpF9280278155042E1B4DC007B03E1CCE6" Guid="{4DACFC20-1346-4590-99CB-8957B32DD190}">
                         <File Id="filD40B491201C3B1EA1477850EBB923E18" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\parameters4.png" />
                     </Component>
-                    <Component Id="cmp8737C923A2CD6802ED6E13112BBB6599" Guid="{7F90864B-FE7A-4DF7-82ED-B7B937469FB0}">
+                    <Component Id="cmp8737C923A2CD6802ED6E13112BBB6599" Guid="{E3A31659-C40C-48DF-8B51-154FAB882698}">
                         <File Id="fil83A14303B262D912AD5C9C01585CD7E3" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\parameters5.png" />
                     </Component>
-                    <Component Id="cmp4FDAD50274CE6105999BB73BF884DD1D" Guid="{422B5832-B8FC-4FD2-924F-7717D38ABC00}">
+                    <Component Id="cmp4FDAD50274CE6105999BB73BF884DD1D" Guid="{D950E66D-18D3-4F8B-A7B8-D5F1BF10D241}">
                         <File Id="fil324E6B620A90FA83D90F966DBBDA2AB8" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\parameters6.png" />
                     </Component>
-                    <Component Id="cmp80E23E69F6BFD335D5BE2C38F9C1FE2C" Guid="{D6379CF6-91C5-4174-B1D5-63CA977BB63D}">
+                    <Component Id="cmp9C9646BA969959CDB04692029FCBCFB1" Guid="{4430A7E5-DAC6-448C-92B7-4EAAC860A6C1}">
+                        <File Id="filEE7774C6FBEC9BEBE6D13D916B101DE1" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\pinnumber1.png" />
+                    </Component>
+                    <Component Id="cmp7D05C60DDE4C4E276B03CA0BFA79AA8E" Guid="{549A22C4-045C-41D2-B498-82DB77ADE027}">
+                        <File Id="filD67E8930C63B1E2CEA3EE6AB431A5A86" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\pinnumber2.png" />
+                    </Component>
+                    <Component Id="cmp80E23E69F6BFD335D5BE2C38F9C1FE2C" Guid="{7F1B6EEE-B48B-4754-85AB-058ED3C5213E}">
                         <File Id="filC0DB531BC8215434E171272739A2B064" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\pin_order.png" />
                     </Component>
-                    <Component Id="cmpAF74F1FEB750C2B9BFD37D44390B6691" Guid="{FEDA3DD7-37F5-4165-A63A-1335BDBFD986}">
+                    <Component Id="cmpAF74F1FEB750C2B9BFD37D44390B6691" Guid="{B56C4A50-F68C-40CA-9701-FF026DD220C0}">
                         <File Id="fil9CB8DB4516A81D927C9C6F49E6F325B2" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\place_pin.png" />
                     </Component>
-                    <Component Id="cmpFB983E1BFC83DD89C4A99D9057D8C389" Guid="{37F4BD69-B8E1-47C1-BDD2-F153D1A86395}">
+                    <Component Id="cmpFB983E1BFC83DD89C4A99D9057D8C389" Guid="{DE27EAD8-6457-41CF-9AF4-290525431D67}">
                         <File Id="filA7DD925B3D1EBE02397C1AECBB1CC9B1" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\probes1.png" />
                     </Component>
-                    <Component Id="cmp4566BBCF269EC6BCF88C4BFB2B2B6C80" Guid="{7150A170-CF89-4065-BB37-45486D653F41}">
+                    <Component Id="cmp4566BBCF269EC6BCF88C4BFB2B2B6C80" Guid="{D1BB363A-723C-4A4D-95EF-0699EF5F72AC}">
                         <File Id="fil0846A786394B64E90ECF024DF63B9061" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\probes2.png" />
                     </Component>
-                    <Component Id="cmpA758271C8568D1608929092609C3B506" Guid="{5EC480BB-743A-40E2-961D-D108208BC137}">
+                    <Component Id="cmpA758271C8568D1608929092609C3B506" Guid="{CA36DD0D-52E9-4F2D-B59A-9C2118997C27}">
                         <File Id="fil1343AF18DB9E132769E45AE2CB4857BB" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\probes3.png" />
                     </Component>
-                    <Component Id="cmp99BC50A7724BDC92ECCC3639C4F5CF1C" Guid="{B000DE1E-AF34-4B0E-A8ED-767197BF3DC5}">
+                    <Component Id="cmp99BC50A7724BDC92ECCC3639C4F5CF1C" Guid="{DE74EB73-572A-4212-A9B1-F93F3E0F3BD2}">
                         <File Id="filC47B5FC9EB9261E65BBFA24D8F428CD9" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\probes4.png" />
                     </Component>
-                    <Component Id="cmp29BDE54D164B728761F361AB46051EC7" Guid="{690451A7-9158-4021-ADBA-2DC6FAC2AC74}">
+                    <Component Id="cmp29BDE54D164B728761F361AB46051EC7" Guid="{65E5A567-A4E6-4CB7-BB1D-ACA115DCA068}">
                         <File Id="fil87ED9B54CAB463732CA0EACAB6586CA5" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\probes5.png" />
                     </Component>
-                    <Component Id="cmp9371E40CA907E1224653D3D613F428FA" Guid="{81E2BAF1-4A68-49A5-88FD-4755B82A5B49}">
+                    <Component Id="cmp9371E40CA907E1224653D3D613F428FA" Guid="{BBD7FBF2-AE67-4E46-9118-D049C2BBB68C}">
                         <File Id="fil35A28728FD78919339B92265C3E95122" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\probes6.png" />
                     </Component>
-                    <Component Id="cmp812DFB322D7E50599455E4EFB783814D" Guid="{52DDF887-0B6D-4E5D-A3F2-F46E67179CF9}">
+                    <Component Id="cmp812DFB322D7E50599455E4EFB783814D" Guid="{58415B94-5198-420A-B28D-8D8051B2326B}">
                         <File Id="filE8D412923336B27AA4B62F7A4E2772D1" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\probes7.png" />
                     </Component>
-                    <Component Id="cmp9B3A7686BB046FC570A7F71F4AD981E3" Guid="{B27399BC-2CEA-4E0B-9E02-6A85688F196F}">
+                    <Component Id="cmp9B3A7686BB046FC570A7F71F4AD981E3" Guid="{4206F7D9-2E6D-40D2-900B-F427CE4B72DD}">
                         <File Id="filF381476E0AE82A64645BB3564E35B9FF" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\properties.obj.gz" />
                     </Component>
-                    <Component Id="cmp87920616631BEEA016176533E5C41578" Guid="{234D3B7A-FCB4-4752-86A5-F47C35C9ABD9}">
+                    <Component Id="cmp87920616631BEEA016176533E5C41578" Guid="{AB49A9A5-F1FC-40F8-AAAC-C8981D1BC518}">
                         <File Id="fil956458A20E4B3A9B4FAD4831F7FD2BF1" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\properties.png" />
                     </Component>
-                    <Component Id="cmp5B62A7CAE8EECF932F98EB403B5CDD29" Guid="{3D71454A-B6BC-47AB-A8DD-D57C11E73835}">
+                    <Component Id="cmp5B62A7CAE8EECF932F98EB403B5CDD29" Guid="{5C33D468-8CCB-4190-B658-743821A273EC}">
                         <File Id="fil1CACDA915CAC17ACE7F7A3B476C083FF" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\run_xschem.html" />
                     </Component>
-                    <Component Id="cmp9540E3F9B5835A06B30F0AE43A00BDCA" Guid="{9589C9AE-714A-4480-A36A-84C7632CFA7D}">
+                    <Component Id="cmp9540E3F9B5835A06B30F0AE43A00BDCA" Guid="{55E1227B-6C36-4C2F-BE84-41BCED6564FC}">
                         <File Id="fil2934B2FC856C8A8D86E4B92EF92AD1B9" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\simulation.html" />
                     </Component>
-                    <Component Id="cmp5DB828CEC70D5904EB1C1A5DC881F321" Guid="{23A3A821-28D9-4408-A71D-1E03711F3010}">
+                    <Component Id="cmp5DB828CEC70D5904EB1C1A5DC881F321" Guid="{299B2D3A-6AA6-4A4C-A9F8-C1A89A8CB3DE}">
                         <File Id="filE385A22A513F0A8A2C2F6EFB9F7326C0" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\simulation1.png" />
                     </Component>
-                    <Component Id="cmp6506097EF307EF163BD976300B67E723" Guid="{D2DD8E22-254E-4878-86E4-4A1E3FA5DE35}">
+                    <Component Id="cmp6506097EF307EF163BD976300B67E723" Guid="{10BA755E-AB9D-456D-AB4E-598DABFA80BD}">
                         <File Id="fil8B8716150B07BAFCB76371AE18CBF9FD" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\simulation10.png" />
                     </Component>
-                    <Component Id="cmp586706D51A4C65AC07C3CBA723106DAC" Guid="{EDE69633-4735-45E2-9E3C-13670EDA30FF}">
+                    <Component Id="cmp586706D51A4C65AC07C3CBA723106DAC" Guid="{4D2BB7CD-7D73-41F3-B230-99F8CDC6425B}">
                         <File Id="fil0D687864A1749293F429709034CAFD6D" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\simulation11.png" />
                     </Component>
-                    <Component Id="cmpC6BDA118BD458506C6AE68FB08C9E6F4" Guid="{983C0C34-297C-4DED-AC0E-5FE8BF973A38}">
+                    <Component Id="cmpC6BDA118BD458506C6AE68FB08C9E6F4" Guid="{92C854FF-DAEC-41FC-9BEF-CD17AF704E70}">
                         <File Id="filD0562B12A55B121FC5929D7999E473A4" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\simulation2.png" />
                     </Component>
-                    <Component Id="cmp4F4705CC5CF73A7A489868380F7C5AED" Guid="{6FC505A7-A164-43E8-8C60-9FF5F309A4BC}">
+                    <Component Id="cmp4F4705CC5CF73A7A489868380F7C5AED" Guid="{78442940-ECA1-41CA-8A11-7C5EC2468564}">
                         <File Id="fil6DCEFC2B190A7ED12C1835EEAB179A4B" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\simulation3.png" />
                     </Component>
-                    <Component Id="cmpB93DAC8800191B30844F8E147A61F228" Guid="{83A44FDD-5689-4D77-9965-2BC7A30C7D15}">
+                    <Component Id="cmpB93DAC8800191B30844F8E147A61F228" Guid="{87FACDCB-4D3C-429A-A884-D12D86EAE8BB}">
                         <File Id="filD1C64349ABF18BD5961F5EC3034AE6AD" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\simulation4.png" />
                     </Component>
-                    <Component Id="cmp10FC1FFBFBCD6271A357D774785D48AF" Guid="{13AD1DC2-F44D-40FE-9B2D-B4C814098520}">
+                    <Component Id="cmp10FC1FFBFBCD6271A357D774785D48AF" Guid="{79DD0B21-0917-4E82-AD2F-27D6C7A7129B}">
                         <File Id="fil9522C1B5EAEBCF1AE787162B5DF45240" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\simulation5.png" />
                     </Component>
-                    <Component Id="cmp7DA3BD7375D1974B0057AE3368ED6383" Guid="{A408527E-BC68-402F-8A0E-672AC3F25E75}">
+                    <Component Id="cmp7DA3BD7375D1974B0057AE3368ED6383" Guid="{6F66E218-32EB-42F4-A0DC-63E7E3E75438}">
                         <File Id="fil794B040FA5E6C35A877A418A45176AD8" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\simulation6.png" />
                     </Component>
-                    <Component Id="cmp5E1A3303614CCB4D3B2F28FFA9F105F1" Guid="{0F1E19B2-9F65-48E1-B87C-4CC2AB081468}">
+                    <Component Id="cmp5E1A3303614CCB4D3B2F28FFA9F105F1" Guid="{B8ABEF53-D696-4BD6-BF1E-6EB140C87D7E}">
                         <File Id="fil62BA63B9620D182F8CADE8A64540B95A" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\simulation7.png" />
                     </Component>
-                    <Component Id="cmp3D757DA33A5CF5AF0170728CE7879945" Guid="{1E93718C-4125-4F7A-A861-5ABD6A1DCAD8}">
+                    <Component Id="cmp3D757DA33A5CF5AF0170728CE7879945" Guid="{EC1AE034-CC0E-45EC-94EE-DA181D6B3BA3}">
                         <File Id="fil3E37B6F6FDFF279D7928A95164FF7E6B" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\simulation8.png" />
                     </Component>
-                    <Component Id="cmp69527BCF2EAC90D1F29B66558588F18B" Guid="{98DB688F-4927-4074-B837-C8A8F08AD5A3}">
+                    <Component Id="cmp69527BCF2EAC90D1F29B66558588F18B" Guid="{59A6F555-2A2A-476F-BFD8-0F413B613FC7}">
                         <File Id="filC92AF9E88132F6E5054A58E700AA5105" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\simulation9.png" />
                     </Component>
-                    <Component Id="cmp5DE5BF3A93CF32E9741EE29282B2D837" Guid="{A4816F9F-E170-4CF2-9241-2206022BBDD4}">
+                    <Component Id="cmp5DE5BF3A93CF32E9741EE29282B2D837" Guid="{7500FC72-2407-4798-A39C-AE6632ADE331}">
                         <File Id="fil04CBEA9A72CEDC2677EC59B8D8334A60" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\special1.png" />
                     </Component>
-                    <Component Id="cmpC7B56D2632EEBF106FA79FA33B3C75B7" Guid="{AE55CE19-B0AE-4378-AE65-D0647687DE14}">
+                    <Component Id="cmpC7B56D2632EEBF106FA79FA33B3C75B7" Guid="{0E1153F7-0552-473F-9116-1F256AC60FCF}">
                         <File Id="fil70F18A5DDE2501CADC984FBA7B4903AB" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\spiceprefix.png" />
                     </Component>
-                    <Component Id="cmpD26202FAF4841795B6A741328CB6A67B" Guid="{EE6FE019-B604-42C8-9177-13566C268EF4}">
+                    <Component Id="cmpD26202FAF4841795B6A741328CB6A67B" Guid="{7C4AA78F-6A4B-48FD-8B09-4F2F78890F04}">
                         <File Id="fil04059F87A12DD86AC2F4D7D04EDF2509" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\spice_backannotate.png" />
                     </Component>
-                    <Component Id="cmpFD4E64677B8277F8F66B179CC7D77CBF" Guid="{EC535B4C-E654-4234-8986-6E18359ACF40}">
+                    <Component Id="cmpFD4E64677B8277F8F66B179CC7D77CBF" Guid="{35AABD58-4557-4E32-9B07-4BAE1284E9AA}">
                         <File Id="fil02E6440D43CE38B206156921E6E06E4E" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\symbol_generation5.png" />
                     </Component>
-                    <Component Id="cmp80D71431189149660F707A733ED9DC48" Guid="{EE2D6996-C1EC-474C-9FF4-1FEA0491A937}">
+                    <Component Id="cmp80D71431189149660F707A733ED9DC48" Guid="{7C1610FA-8FF6-437B-B541-D4B939149929}">
                         <File Id="fil357970DD2C11943DF6420EF42642EB1C" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\symbol_generation6.png" />
                     </Component>
-                    <Component Id="cmp4E173EB8A7B4151CF229043A306A5618" Guid="{F34091DE-11DB-4ED3-A240-71DB12251141}">
+                    <Component Id="cmp4E173EB8A7B4151CF229043A306A5618" Guid="{E760997B-F83C-4C31-9732-3CBE3AA6BD7F}">
                         <File Id="filCA3BA0C82FEE664384F4C8ADA0482FE9" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\symbol_properties1.png" />
                     </Component>
-                    <Component Id="cmpB389126DA86CA574DE924B2998CB8630" Guid="{FB5DA062-B639-4F37-8050-751461D62186}">
+                    <Component Id="cmpB389126DA86CA574DE924B2998CB8630" Guid="{8E780507-CD3A-4EC9-8217-7A051FBF4505}">
                         <File Id="fil309C5B107815F1C8BF1F676968F9970F" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\symbol_property_syntax.html" />
                     </Component>
-                    <Component Id="cmp6D2ED59DF2340D1122FD7F1D589EF887" Guid="{BE866AAC-B2E8-4A2B-90FA-4E66590DF106}">
+                    <Component Id="cmp6D2ED59DF2340D1122FD7F1D589EF887" Guid="{39718BAA-879B-4C1B-9006-98A4F9E6209E}">
                         <File Id="fil17B785A67D043CC2CBC92B833F8AE0CB" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\symbol_property_syntax1.png" />
                     </Component>
-                    <Component Id="cmp5C29C1D986EFE74BCDC1524B14AA8C8D" Guid="{397F6EDC-AA18-415F-ADC9-3B419FC9C823}">
+                    <Component Id="cmp5C29C1D986EFE74BCDC1524B14AA8C8D" Guid="{171F569F-789C-4C7A-A8DD-C91F4EC6143F}">
                         <File Id="fil207BCD420D6D457604DED271A171DE67" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\symbol_property_syntax2.png" />
                     </Component>
-                    <Component Id="cmp9F6E802F56EEA72A1473FA788F20FBE5" Guid="{22825995-B46D-4E8F-BFEC-4409B971E00E}">
+                    <Component Id="cmp9F6E802F56EEA72A1473FA788F20FBE5" Guid="{E9C327DD-7453-471F-8BE4-E6AA3EDE4F34}">
                         <File Id="filF1ED18E7F4F67D529E56D9B00B050CAC" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\symbol_property_syntax3.png" />
                     </Component>
-                    <Component Id="cmp531EA85E335C3D3E948CB16A872837A6" Guid="{3EEA3B72-045A-49AD-86BB-1516EB17F96A}">
+                    <Component Id="cmp531EA85E335C3D3E948CB16A872837A6" Guid="{69EBA9DE-B3CA-499B-85B0-B175BF19CD20}">
                         <File Id="filF046A5CD15470FBE36F3CD60AF03B9F4" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\symbol_property_syntax4.png" />
                     </Component>
-                    <Component Id="cmpE918044EAD1A5F238F1B2A2DCEAE702C" Guid="{74BE4097-B257-457B-A961-85E1CF9FA18A}">
+                    <Component Id="cmpE918044EAD1A5F238F1B2A2DCEAE702C" Guid="{663CE106-2E0C-4783-B802-263C6CB07626}">
                         <File Id="fil7B22FD4ED48963FA2B408FBB7C90D8D1" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\symbol_property_syntax5.png" />
                     </Component>
-                    <Component Id="cmp30FF303E2BEC5A123613729EAFAF6576" Guid="{EAB6886F-0D69-4625-A662-6B8B89106B68}">
+                    <Component Id="cmp30FF303E2BEC5A123613729EAFAF6576" Guid="{9F6CF487-B0B3-497F-8FDD-665AA51FF19E}">
                         <File Id="filCCAC9D72DA84033404DE8E2EC5F8900A" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\symgen_vs_djboxsym.png" />
                     </Component>
-                    <Component Id="cmp160D310A1499755F8452C664AB1882FF" Guid="{2EABD492-1226-4FA7-966D-A0C44F90846D}">
+                    <Component Id="cmp160D310A1499755F8452C664AB1882FF" Guid="{DAFBFC93-1908-40EB-8DE5-5FE15EFACDA2}">
                         <File Id="fil56DD33FFAE144A1CBCA96D7E1BBA0900" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\text_property.png" />
                     </Component>
-                    <Component Id="cmp94BBC0CDFCEEBAF38436152C69968121" Guid="{08F079E2-B0E4-4E07-9AFB-690A49C24772}">
+                    <Component Id="cmp94BBC0CDFCEEBAF38436152C69968121" Guid="{633E9FD4-3C41-48B6-936F-A39C07CE5D59}">
                         <File Id="fil94DACC23AD5D78042F5DC25A93C6CB25" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_busses.html" />
                     </Component>
-                    <Component Id="cmp40D76DC73F81D8F5BD4F14F1E30940D0" Guid="{0578674A-33B0-4243-BA21-39DE335C2C8B}">
+                    <Component Id="cmp40D76DC73F81D8F5BD4F14F1E30940D0" Guid="{367E8213-5CC2-48E1-A40E-9F1F011FF436}">
                         <File Id="filEEDB457224FD62BE6182844208BBB7EF" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_create_symbol.html" />
                     </Component>
-                    <Component Id="cmp4FF524F42F947CABD5F6FD3BD84DC1DA" Guid="{CDD117E0-11B2-4452-B01B-2CB689206549}">
+                    <Component Id="cmp4FF524F42F947CABD5F6FD3BD84DC1DA" Guid="{4E5B4845-E159-4669-8E04-10136BE18855}">
                         <File Id="fil3873DBB621BF55DD33EE496ACD9FF1B9" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_create_symbol_00.png" />
                     </Component>
-                    <Component Id="cmp84692DFACCECD0F047FA5D03878AECB7" Guid="{AA0B6D18-CDC8-419A-B5A0-D21B8C90823C}">
+                    <Component Id="cmp84692DFACCECD0F047FA5D03878AECB7" Guid="{9FF07BB0-20A5-418A-811B-7DF907271774}">
                         <File Id="filAD56E54FD28F5C568D7A9756144D8AD7" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_create_symbol_000.png" />
                     </Component>
-                    <Component Id="cmp2DB450D1EC41E3AD8A6C1171E2FF8CEE" Guid="{469C793E-0727-4F76-8908-CD470EAF25E0}">
+                    <Component Id="cmp2DB450D1EC41E3AD8A6C1171E2FF8CEE" Guid="{718428EE-8C88-4CFF-AB44-BA118B5C366C}">
                         <File Id="filED7585DA00B352CE66A7B47CC89B9B92" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_create_symbol_001.png" />
                     </Component>
-                    <Component Id="cmpA272FD58834D3669C760324EAD32C35B" Guid="{2EB5B91E-A23F-4806-B68E-D3E96D6474C0}">
+                    <Component Id="cmpA272FD58834D3669C760324EAD32C35B" Guid="{E890A83D-0792-4043-8A3A-3DEB4C7B4024}">
                         <File Id="filA7841A65C5D8A7D8782373A804610099" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_create_symbol_01.png" />
                     </Component>
-                    <Component Id="cmpE6DF23E618E96503EBDEA9B25F651159" Guid="{542E2D38-AFA6-452D-BF7F-A8D7761414C4}">
+                    <Component Id="cmpE6DF23E618E96503EBDEA9B25F651159" Guid="{8EDAD441-C7F3-4BDE-8E43-04609FF0545D}">
                         <File Id="fil660305D812DA5416AE9938EE4C786E97" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_create_symbol_02.png" />
                     </Component>
-                    <Component Id="cmp4A224F8FDEB0CA2511880D989A214C10" Guid="{F5360881-FE9E-4A21-A0DD-34CDF4D9B6BB}">
+                    <Component Id="cmp4A224F8FDEB0CA2511880D989A214C10" Guid="{C491F7F0-7AF8-4443-8DE9-116E67351483}">
                         <File Id="fil901AB573CD07784D56B26A6A8973CA57" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_create_symbol_03.png" />
                     </Component>
-                    <Component Id="cmp2155DA6423AC435020BEF8E0D221EE94" Guid="{4E89C802-877A-4CA8-92F3-A148AC7FFCCA}">
+                    <Component Id="cmp2155DA6423AC435020BEF8E0D221EE94" Guid="{2ABD8D03-0E9B-4D11-9C7D-2A46D125B4D6}">
                         <File Id="fil8A4BD8F9978AFBBC3BCBBA485FB444C1" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_create_symbol_04.png" />
                     </Component>
-                    <Component Id="cmpA7A4A66632119F9EC34104CC612FD7D9" Guid="{FAD8F65D-561C-4C68-8AC5-981BCBF5D880}">
+                    <Component Id="cmpA7A4A66632119F9EC34104CC612FD7D9" Guid="{ED501971-29FF-4FF4-AE9A-0B5F52B9B8CC}">
                         <File Id="filC91D9B4698223B3F587CE11215EECE4C" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_create_symbol_05.png" />
                     </Component>
-                    <Component Id="cmpA16C35256E5D41179D5CECE61FDED23A" Guid="{30F90796-2537-4D44-BD03-9485CBAC5AF5}">
+                    <Component Id="cmpA16C35256E5D41179D5CECE61FDED23A" Guid="{B2D8C332-4CFC-4240-96E9-2687FBF1B400}">
                         <File Id="filE5A326DE7E7BB286C1A00762406ED589" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_create_symbol_06.png" />
                     </Component>
-                    <Component Id="cmp195429ED4471B6A02A4FAF762159968C" Guid="{E16E9A82-18E4-4559-9C99-C24CD2C56400}">
+                    <Component Id="cmp195429ED4471B6A02A4FAF762159968C" Guid="{509FCE38-1A0F-4A5B-A0CE-A8D78F3B3642}">
                         <File Id="fil6764237B7041E1894723477E709959B3" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_create_symbol_07.png" />
                     </Component>
-                    <Component Id="cmp22615544E6B7395726B9A4B0CB4BB6A2" Guid="{E4A0BDB6-6B38-4AFA-A57C-387C48ADA7BA}">
+                    <Component Id="cmp22615544E6B7395726B9A4B0CB4BB6A2" Guid="{D1BB17C7-0884-4576-8BAA-0079B5891801}">
                         <File Id="fil5D6DE4E12DC9D14483C267E120B615F0" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_create_symbol_08.png" />
                     </Component>
-                    <Component Id="cmp27BD1D4E7BF0E3262BA8FB817656F73B" Guid="{9A8BCE14-3B9A-4352-AE13-4774A67454FD}">
+                    <Component Id="cmp27BD1D4E7BF0E3262BA8FB817656F73B" Guid="{C1846BE6-12F5-4417-A7BF-BD9B7CDC3668}">
                         <File Id="fil1D06CCBC6BBCFFD4453C240DB58F51A5" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_create_symbol_09.png" />
                     </Component>
-                    <Component Id="cmp8C39ADC65700FE2E1F1A3179247F635A" Guid="{E718B015-F543-4AA0-A74A-09EDEE936B8A}">
+                    <Component Id="cmp8C39ADC65700FE2E1F1A3179247F635A" Guid="{FA65A072-616F-49F3-9C3F-A1C275495524}">
                         <File Id="fil28AD7EA4C997195CE1CB287009CC7BCB" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_create_symbol_10.png" />
                     </Component>
-                    <Component Id="cmpCC23BC0BC4A0067547ABCBF6AD43DAD4" Guid="{B149EC5F-2C25-4670-884E-A3C27F7CA962}">
+                    <Component Id="cmpCC23BC0BC4A0067547ABCBF6AD43DAD4" Guid="{E2F680C2-DFD4-41D0-9B6C-F3FF14A94812}">
                         <File Id="fil502F9DD7BE42C265AD9D41B1A7AF513A" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_create_symbol_11.png" />
                     </Component>
-                    <Component Id="cmp0BA107C0CECD62AC315574CBF7E4138E" Guid="{8D458A1E-9523-4173-B559-ECFD1AA14836}">
+                    <Component Id="cmp0BA107C0CECD62AC315574CBF7E4138E" Guid="{8A923966-3B0B-4A05-BF10-5DEA9C5E80DD}">
                         <File Id="filF9D06AC0AD7DC3D28B9C65EB1BC6667F" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_create_symbol_12.png" />
                     </Component>
-                    <Component Id="cmp58E432C3A25CEA26CB4A4370CC7E6045" Guid="{A714F1AC-AB1F-4623-BC85-EAB24D5ED9D6}">
+                    <Component Id="cmp58E432C3A25CEA26CB4A4370CC7E6045" Guid="{620A82BA-D7E5-44EC-9034-711FB16B7969}">
                         <File Id="fil7FD6C8738E0479F362B00515C2274979" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_create_symbol_13.png" />
                     </Component>
-                    <Component Id="cmp4A824D463A9E60355C93DD5D929E58EC" Guid="{74B1BECE-C05E-49D1-B0FC-8B53A1BC05CF}">
+                    <Component Id="cmp4A824D463A9E60355C93DD5D929E58EC" Guid="{B7570899-1558-45E1-9654-E50EFFA18442}">
                         <File Id="fil8D6D7FD490B3C95B214D7C8D892A7123" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_gschemtoxschem.html" />
                     </Component>
-                    <Component Id="cmpB98D1D0F9B93AB40F002D3EE781518E9" Guid="{E9022202-6340-43F5-9C28-0EF542D4D413}">
+                    <Component Id="cmpB98D1D0F9B93AB40F002D3EE781518E9" Guid="{DA8E301B-EC20-4961-A86C-FD8188D359CA}">
                         <File Id="filBE7AEE6C36D18B17CB2605BA5B2A7AE1" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_gschemtoxschem_01.png" />
                     </Component>
-                    <Component Id="cmpFEBDDFBC91B45D7739A346A5B78B9FD0" Guid="{70C43B00-E348-48C0-AA2B-1BBFF803EB43}">
+                    <Component Id="cmpFEBDDFBC91B45D7739A346A5B78B9FD0" Guid="{94CC5B0B-1163-4A0D-9029-1607FA9AAFA9}">
                         <File Id="fil1F0033CC2A9BFC1E078180ECC940083B" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_gschemtoxschem_02.png" />
                     </Component>
-                    <Component Id="cmpB1E8B60AADD74ADBDC3C5C8465AF37C3" Guid="{E368F569-00E1-45B2-94E3-F9ED621D6BB0}">
+                    <Component Id="cmpB1E8B60AADD74ADBDC3C5C8465AF37C3" Guid="{5B317B1E-C790-41AE-BDE9-8981B80B6DB0}">
                         <File Id="filBE21D2B8B5DA1EBF7EB82931A5CF8A6C" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_gschemtoxschem_03.png" />
                     </Component>
-                    <Component Id="cmpC372B57A8C14757C54DB897D66581131" Guid="{7015FDA5-B169-4482-B9B5-3278F97D94FF}">
+                    <Component Id="cmpC372B57A8C14757C54DB897D66581131" Guid="{283AE832-76DC-42BC-8F29-30C302457D5C}">
                         <File Id="filFB5B1ACD8610FACD2EF4FACC073FFF77" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_install_xschem.html" />
                     </Component>
-                    <Component Id="cmp9D0B89DCF5397D521839F61334021BDF" Guid="{1DF55075-16F9-4ECC-B438-5FE310E7C80F}">
+                    <Component Id="cmp9D0B89DCF5397D521839F61334021BDF" Guid="{9D76BFEE-86B3-4467-B7B5-E73EFCE69430}">
                         <File Id="fil99210CCDC62F9ECE81A17B1017CD333E" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_install_xschem_00.png" />
                     </Component>
-                    <Component Id="cmp767471F6FC5F67822922D1E12ADE0822" Guid="{376BF49B-96B5-42EA-A02E-7CF5F80D3CB5}">
+                    <Component Id="cmp767471F6FC5F67822922D1E12ADE0822" Guid="{3BAA48DB-9C84-426A-BC19-D1B9CEF03B10}">
                         <File Id="filA8BB2340D07FA956BE04D3D332637E02" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_install_xschem_01.png" />
                     </Component>
-                    <Component Id="cmp08A18A8F2204CA1A75EF228F26BD6557" Guid="{DD611EDF-D003-4973-ACBD-44AE443BAB51}">
+                    <Component Id="cmp08A18A8F2204CA1A75EF228F26BD6557" Guid="{B93713E2-9D17-40CF-BE5A-DAA2FD94CA9F}">
                         <File Id="fil6CA2DCA37C444E1D79585A72443AF8A3" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_install_xschem_02.png" />
                     </Component>
-                    <Component Id="cmpF1E797C25A67CA90E185252E8AEF245D" Guid="{E03978D9-AA7F-4785-82B9-71D42995F08E}">
+                    <Component Id="cmpF1E797C25A67CA90E185252E8AEF245D" Guid="{E7CB394B-D066-4874-B1DF-2FE591A84D7A}">
                         <File Id="fil6869059EF074E1EEF879163F3BF4F7C7" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_install_xschem_03.png" />
                     </Component>
-                    <Component Id="cmpABF84AFB79B9DC2F71B1B34EE257F128" Guid="{B91A906B-6E15-47E1-A990-CFFFE25951A9}">
+                    <Component Id="cmpABF84AFB79B9DC2F71B1B34EE257F128" Guid="{A76A5206-E438-43EE-8DA7-5F5E0DFC8CD2}">
                         <File Id="fil707F29992EE5C3E84A8140E993EAA77A" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_install_xschem_04.png" />
                     </Component>
-                    <Component Id="cmp05DA340928390AC3EA6192FF96B40DA4" Guid="{4627EE56-2DB6-47B9-AE80-2455B92AD0A4}">
+                    <Component Id="cmp05DA340928390AC3EA6192FF96B40DA4" Guid="{5148A779-A226-4CA2-AACC-59EA333B10A7}">
                         <File Id="fil0601362F9885C8F86B144B8EEA82757E" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_install_xschem_05.png" />
                     </Component>
-                    <Component Id="cmp6A1BCE97DD92E0A30A5D8DAD84D591F4" Guid="{93AF00FB-320E-44B6-B746-9498164DF6ED}">
+                    <Component Id="cmp6A1BCE97DD92E0A30A5D8DAD84D591F4" Guid="{3541230D-469E-4F55-BC9B-6769B52038CE}">
                         <File Id="filC38738280C06EA1AECB5D43B6FD265B0" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_install_xschem_06.png" />
                     </Component>
-                    <Component Id="cmpEE12CCF297358B1AF755776D9B8FBDB5" Guid="{DEBB8DA0-C5F1-43B5-876A-9F3DC2A92019}">
+                    <Component Id="cmpEE12CCF297358B1AF755776D9B8FBDB5" Guid="{107236C2-BC71-4768-8D13-346365288149}">
                         <File Id="filA80A863188FA717222DD4AF6D6CA8EBE" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_install_xschem_07.png" />
                     </Component>
-                    <Component Id="cmp710F4F002ED6F6CB0E9862784C453AF1" Guid="{794D0DAB-D30C-4B59-BB50-B9588A5481FF}">
+                    <Component Id="cmp710F4F002ED6F6CB0E9862784C453AF1" Guid="{518CEA76-C507-4138-A822-A9D926EDE287}">
                         <File Id="fil49C6CAB497D75426F4739CA274CA05DB" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_install_xschem_08.png" />
                     </Component>
-                    <Component Id="cmp651906A147E90D0C461D5C5590A9A51D" Guid="{9FCF6CF0-73F1-42F6-9F53-CEB17BC890AF}">
+                    <Component Id="cmp651906A147E90D0C461D5C5590A9A51D" Guid="{3D8B755F-BB1C-493C-B023-E998A3FDC9AB}">
                         <File Id="fil733EA6F2FDB659185289BE8AFD0C01C6" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_install_xschem_09.png" />
                     </Component>
-                    <Component Id="cmp985E62F77AD4CAB5BAD58A8FB1DDE01C" Guid="{016E44C7-E5D3-496C-88BD-C925DA080ACC}">
+                    <Component Id="cmp985E62F77AD4CAB5BAD58A8FB1DDE01C" Guid="{479C74CE-F69F-4BA3-8A9D-AF1E26AFB6E4}">
                         <File Id="filCE8F73D37564708A2A7577F6572AB436" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_install_xschem_10.png" />
                     </Component>
-                    <Component Id="cmpE446C6E6AE8E31BAB020041B768CE39F" Guid="{598EB6E3-964A-483B-AB30-F495D987A4F8}">
+                    <Component Id="cmpE446C6E6AE8E31BAB020041B768CE39F" Guid="{AFCFDB7F-FC31-49DD-A0B8-4CBF1698B215}">
                         <File Id="fil053FE6DA638A1B0E61F3A31E35D7802F" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_ngspice_backannotation.html" />
                     </Component>
-                    <Component Id="cmp15745350561238600071BBE2E3F27222" Guid="{6FD4E72F-1EAB-4792-803F-3839F2A7264F}">
+                    <Component Id="cmp15745350561238600071BBE2E3F27222" Guid="{E4EFAB85-F034-4F1B-BAD9-92670D6BF314}">
                         <File Id="fil419E868E3CBFE011F0BA698691212872" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_run_simulation.html" />
                     </Component>
-                    <Component Id="cmp52C11CD4D51DFF7449A091F7881DA4B1" Guid="{E0C712E3-4E76-4BCB-BF1A-2F91A2AA12A0}">
+                    <Component Id="cmp52C11CD4D51DFF7449A091F7881DA4B1" Guid="{549B06F4-212A-43BA-914D-2242479F2AE8}">
                         <File Id="fil29C33A2C7BC79F9774D94DC49D5FCCFC" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_run_simulation_01.png" />
                     </Component>
-                    <Component Id="cmpB72D81CAEA3E84EFA4198DF20FB36179" Guid="{8B3BA7C9-92A8-4938-BCAA-1DE048040DDC}">
+                    <Component Id="cmpB72D81CAEA3E84EFA4198DF20FB36179" Guid="{E502979D-E3B0-49D9-B7E2-5ABCCDB6695F}">
                         <File Id="fil465D83CAEF89BEACAB1B55B8DF987C22" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_run_simulation_02.png" />
                     </Component>
-                    <Component Id="cmpB77D89C150E1A7E1FCB0BBD23E819785" Guid="{3F68B458-D364-4254-BADE-E6D4CC31CC82}">
+                    <Component Id="cmpB77D89C150E1A7E1FCB0BBD23E819785" Guid="{B3DB636D-4FCE-466E-BF5E-22F2397E8125}">
                         <File Id="fil414BBD0C5027E586357D756E5E3DB0BE" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_run_simulation_03.png" />
                     </Component>
-                    <Component Id="cmp25F1E3E70721FC799633135753AC175F" Guid="{7F8651E0-D057-4DB6-AB19-FDCDA350BF02}">
+                    <Component Id="cmp25F1E3E70721FC799633135753AC175F" Guid="{C37184AD-739C-485A-AD0D-7E69C3643701}">
                         <File Id="filF7FF31749BEABA3E623C0565B0017909" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_run_simulation_04.png" />
                     </Component>
-                    <Component Id="cmpE9FD90F1CF5641A148B21BC14B793B76" Guid="{28F8EC78-CB19-456C-8072-5B4F0B969D2A}">
+                    <Component Id="cmpE9FD90F1CF5641A148B21BC14B793B76" Guid="{E58234F6-C285-4DB2-961F-A0E59F13062B}">
                         <File Id="fil0CB03B2DD172ACA1B7D5F887834FF33C" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_run_simulation_05.png" />
                     </Component>
-                    <Component Id="cmpDBD6B33479873DD3B6A18345B8A796BB" Guid="{8C7BC9DC-9725-4C86-B0B8-5271D2DADF89}">
+                    <Component Id="cmpDBD6B33479873DD3B6A18345B8A796BB" Guid="{E442767C-4E00-45BE-81CD-7559D1F7D87F}">
                         <File Id="filEC6ED4D161F3DB557E492FB75B9B326E" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_run_simulation_06.png" />
                     </Component>
-                    <Component Id="cmp34DB34B8CE7A11DBF95184D13665C7A3" Guid="{A1CF3975-C9C4-4335-82B2-CCEEB13CFE9A}">
+                    <Component Id="cmp34DB34B8CE7A11DBF95184D13665C7A3" Guid="{36DFCCF3-D28E-480D-98A4-DBDA0869E3A9}">
                         <File Id="fil451B1F7E116F604E40531B784F48ED7B" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_run_simulation_07.png" />
                     </Component>
-                    <Component Id="cmpF30BEF86E910B592533E88B56DEEF496" Guid="{CCE4C2F9-326E-4C67-B2E3-0A9AD7B5603A}">
+                    <Component Id="cmpF30BEF86E910B592533E88B56DEEF496" Guid="{8F765473-8747-4596-B2C8-906388211CD7}">
                         <File Id="filCF931501F7F7EC19C0FA482BCE608697" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_run_simulation_08.png" />
                     </Component>
-                    <Component Id="cmpB914BD58B465D9996191A52C41981288" Guid="{1F8E03E3-CEAD-41AF-8C2A-90A8BA9BF937}">
+                    <Component Id="cmpB914BD58B465D9996191A52C41981288" Guid="{B611EC5A-BDEF-4A03-813B-7EDDFAB3ABE1}">
                         <File Id="fil1EE9C10FAABCB2DD071A8B17FC5BFCEB" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_run_simulation_09.png" />
                     </Component>
-                    <Component Id="cmpF6C3D9737087F3D9B2228B21C6734980" Guid="{BB32D64F-6BAB-40D1-8C9A-49D90049A48D}">
+                    <Component Id="cmpF6C3D9737087F3D9B2228B21C6734980" Guid="{1319B78A-B435-40C5-B49C-B4DB1385FFD2}">
                         <File Id="fil4FA1C5C00C93E9729B1D42AAF2DC8786" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_run_simulation_10.png" />
                     </Component>
-                    <Component Id="cmpA1AF34A5AB0E46E83E2489246BC02E35" Guid="{AA5D2035-9A4D-4432-ABC0-059D6C6332E5}">
+                    <Component Id="cmpA1AF34A5AB0E46E83E2489246BC02E35" Guid="{8571A6A6-4853-4681-962B-FAFAE47D3FAC}">
                         <File Id="filAE2DADB4EC5D12FB0073EC1A86C9BB29" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_symgen.html" />
                     </Component>
-                    <Component Id="cmp89BE8EF1B2B36CB950714E6DDEC886BB" Guid="{C835F277-F6F0-4A3C-9D99-2BFCE906E3FB}">
+                    <Component Id="cmp89BE8EF1B2B36CB950714E6DDEC886BB" Guid="{47562DE0-56BA-4FDD-BE0C-65BD2FDE712C}">
                         <File Id="fil5CD1E212B7B582D79F8D04184CDA2D88" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_symgen_02.png" />
                     </Component>
-                    <Component Id="cmp1887EC93042A8F0C854E00EEC32380FD" Guid="{5E6B096E-68C6-471E-AF8E-E0AB436B1D91}">
+                    <Component Id="cmp24AB399EEF91852024CB83CD0A4EF749" Guid="{83EC6D3E-A4B6-4FBE-85FD-3194AD7D40C2}">
+                        <File Id="fil45DCB5B9DF486CFA015F93E38A972E15" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_use_existing_subckt.html" />
+                    </Component>
+                    <Component Id="cmp97B7734742CE69199C349409D98FEB6F" Guid="{00BDEB19-7C84-42B6-8F8E-64EC7CC899FA}">
+                        <File Id="fil45DE57728139B6FFAE1A58E39547F347" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_use_existing_subckt00.png" />
+                    </Component>
+                    <Component Id="cmpC3D4EC73230C6AC07E8194BC3757FC41" Guid="{10089DB8-401B-4EB6-BC71-621EFE933EE7}">
+                        <File Id="fil9A15A60CC26B8F1BE0ADC27329C27098" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_use_existing_subckt01.png" />
+                    </Component>
+                    <Component Id="cmp376282B9962A9D56861EE6DEC1861CAC" Guid="{B00F9E6A-49CD-4898-A194-4DB8306F8EAD}">
+                        <File Id="filF2C79781DFCBE52069500BB38580C0B6" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_use_existing_subckt02.png" />
+                    </Component>
+                    <Component Id="cmp64749469DE632D7DA54D2EBB7A3AE60B" Guid="{05EE96E1-03AE-437A-800E-22EE7BB6852E}">
+                        <File Id="filCA6F2997FBE46DBDC9D674FE109F2E1F" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_use_existing_subckt03.png" />
+                    </Component>
+                    <Component Id="cmpF18143BE546D526859F1C5471E11F2FB" Guid="{0AA08AD7-1A29-4CDD-A03C-C3E74EA16A9A}">
+                        <File Id="fil59D02C4764779462F9998AC4C9EAB3DA" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_use_existing_subckt04.png" />
+                    </Component>
+                    <Component Id="cmp8CB8AE85C605D9520D284D02A40D7A0E" Guid="{C68A78E1-F182-4991-A327-726A6AB4392A}">
+                        <File Id="filD8B7762B2F764BE530254430D5E292C2" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_use_existing_subckt05.png" />
+                    </Component>
+                    <Component Id="cmp641101E8D1E9AEADC4198F95BA7BD96F" Guid="{EDB02033-F727-4195-961B-E1C3F521BF8A}">
+                        <File Id="fil54F283D0C324204B7C99E097B8BEC07E" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_use_existing_subckt06.png" />
+                    </Component>
+                    <Component Id="cmp0A38E2FC1C828C9008B61E8F3719ECCC" Guid="{7CA51C0D-7A2F-49DD-A88F-89313836B503}">
+                        <File Id="fil613E0E9D05EBA27B050044509EAA87EE" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_use_existing_subckt07.png" />
+                    </Component>
+                    <Component Id="cmp1887EC93042A8F0C854E00EEC32380FD" Guid="{FFDE2EC2-2345-41B8-97A6-A2E9E0CEC7D5}">
                         <File Id="filD8D64C42C0EC471FA21B778DAE92DF5D" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_libraries.html" />
                     </Component>
-                    <Component Id="cmp02F36C6BCDFD4EAC97D7A1D83514BB74" Guid="{6E060EF6-6436-4F68-8EC9-48E4E862592F}">
+                    <Component Id="cmpF79E68A44B6D276CD4FD94243C7638EB" Guid="{067C6406-F4EB-42EE-B810-9D604AFFFBC4}">
+                        <File Id="fil85D5D71C171C7E75B40D36EF9393ACCB" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_sky130.html" />
+                    </Component>
+                    <Component Id="cmp789D1388A55CE9AADEAAE762DC494821" Guid="{996A638F-2D08-4B69-81EF-25000DD45AEB}">
+                        <File Id="fil64801DDEA7EE347873B81CE68A4D318E" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_sky130_01.png" />
+                    </Component>
+                    <Component Id="cmp27CCFCA8735FEA1F70696E4CC11B2245" Guid="{AC84B224-7897-4442-83E7-F756754A9CA6}">
+                        <File Id="fil12D725EFF278F1C79AA2ED8ED8BDC286" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_sky130_02.png" />
+                    </Component>
+                    <Component Id="cmp3CF52F67544072F25918CEA2F1A53102" Guid="{59068570-0ED5-4509-8428-D25A0CE2F262}">
+                        <File Id="fil2461CD8E802030397F78C8330D680FCE" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_sky130_03.png" />
+                    </Component>
+                    <Component Id="cmpC0909817135C078311BA958292379CC4" Guid="{AA6C24FF-5889-4110-972E-AA7A9EB1F2B8}">
+                        <File Id="filE63659CA430413BC74267CACBD3AB1E2" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_sky130_04.png" />
+                    </Component>
+                    <Component Id="cmpA3B864C71585ACAC196B4E961B5DB437" Guid="{FA50A555-3E1E-4E95-8D86-4A946A32AFAC}">
+                        <File Id="filD31AA7BD32998C1DFD4B996137A429AF" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_sky130_05.png" />
+                    </Component>
+                    <Component Id="cmp01895B909BF869B3E0579B007FF33C51" Guid="{114F844A-DB4E-4D76-85CA-31B42E4D6525}">
+                        <File Id="filD18805ABBFB42E91E4539E3F9DEFDA4A" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_sky130_06.png" />
+                    </Component>
+                    <Component Id="cmpACC84A8CADF454A45B82E0DB194474A7" Guid="{1A9CB2E3-43E9-49A9-BED1-1297C637DC0A}">
+                        <File Id="fil5485CFB92C9706326101E81D7162781C" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_sky130_07.png" />
+                    </Component>
+                    <Component Id="cmpB18E1C5C0C0279347B011EC72ACB36CB" Guid="{93DB5555-031A-4B3A-98D6-750D2C28A5FD}">
+                        <File Id="fil15D2FBC0F996F9B0115BD73DF5D5A235" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_sky130_08.png" />
+                    </Component>
+                    <Component Id="cmp03435CD38825723564A3160E6C0420A9" Guid="{670DEEBF-3CC9-4DCA-90D6-C9D6F8311C6A}">
+                        <File Id="fil31E1B8BCF830FDC0762F19C2CEFFFDAF" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_sky130_09.png" />
+                    </Component>
+                    <Component Id="cmp02F36C6BCDFD4EAC97D7A1D83514BB74" Guid="{3147427B-4CA6-46DE-8BBF-42167CB54261}">
                         <File Id="fil9BF9BD4FC2F1EF71EE446FB4AEAB90EB" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides.html" />
                     </Component>
-                    <Component Id="cmp5353727D96EF1D42BC670B9B5B643C85" Guid="{F3CE13DE-CAAF-472B-BB4A-C5FF476B0CBD}">
+                    <Component Id="cmp5353727D96EF1D42BC670B9B5B643C85" Guid="{0F137942-5FB1-4442-9634-3D84F06CF939}">
                         <File Id="filEEFA7C18C981AAAC7920C572EDD9540D" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides01.html" />
                     </Component>
-                    <Component Id="cmp08FFB226D6198AABF0A1D621D72E893B" Guid="{A571A043-FDDB-4AAE-86D6-E95B62B0C352}">
+                    <Component Id="cmp08FFB226D6198AABF0A1D621D72E893B" Guid="{5776DC42-2D23-4141-8B53-72F0C2A6039D}">
                         <File Id="fil159E3BBB12A401294C6B66807E374268" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides01.png" />
                     </Component>
-                    <Component Id="cmp3F88D77861D9694D198F90E3D77AE00D" Guid="{80AB7B7E-C154-4617-8C53-46719B64C911}">
+                    <Component Id="cmp3F88D77861D9694D198F90E3D77AE00D" Guid="{4AFCB82E-8062-4D66-B7A4-667A00010F9E}">
                         <File Id="fil8321C085991A7C913039F7FEE59BB4E1" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides02.html" />
                     </Component>
-                    <Component Id="cmp3B5D9FAEC192FF9A71ED378341511CBC" Guid="{DBD3537E-8B21-4122-91AF-AA2E0B53E37E}">
+                    <Component Id="cmp3B5D9FAEC192FF9A71ED378341511CBC" Guid="{27DFF201-E4FA-4160-BC24-0825F77C279F}">
                         <File Id="fil74A28A569E0F8E3CB88BAAB839A31805" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides02.png" />
                     </Component>
-                    <Component Id="cmpC341B0B7FB289A571F2C60E4A0E25D42" Guid="{A2F5DCEC-0D81-4FAC-AA17-6F8D79DAC852}">
+                    <Component Id="cmpC341B0B7FB289A571F2C60E4A0E25D42" Guid="{7A016AF3-04E2-4A3A-82ED-7FD074B7EF25}">
                         <File Id="fil5736432F62AB3C0676D7E6AA7118101C" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides03.html" />
                     </Component>
-                    <Component Id="cmp33B126A7BACF2F87E466B14394B4B068" Guid="{199CDBFE-2B81-42AA-A5B1-D648201C6824}">
+                    <Component Id="cmp33B126A7BACF2F87E466B14394B4B068" Guid="{748828D9-67E0-4312-BCDA-67ECAEC5FEA8}">
                         <File Id="filEB0975C3A1349508DA9C9B0F89010FED" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides03.png" />
                     </Component>
-                    <Component Id="cmp9620EC7E6D4D435F9837294614BDA09B" Guid="{C8E46ABD-D218-4D2F-B0F6-4F68ED8CA5B6}">
+                    <Component Id="cmp9620EC7E6D4D435F9837294614BDA09B" Guid="{93FDB6A5-76B3-4D8F-9072-390D85B14B8A}">
                         <File Id="filD9F08EF604A5C6CFB39361BEF625E5F7" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides04.html" />
                     </Component>
-                    <Component Id="cmp17B24650D8F1DD4B5A9476118BD44B10" Guid="{E83FF70C-B884-479D-A889-610EDD5AE502}">
+                    <Component Id="cmp17B24650D8F1DD4B5A9476118BD44B10" Guid="{4B9CFCC4-49DA-46DA-9F0D-FC922D06EEB8}">
                         <File Id="filA9F9922E7ACBC5263DE45D25F9D7F32E" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides04.png" />
                     </Component>
-                    <Component Id="cmp6F89FD0143CB07414A0818F32096F4C1" Guid="{6762CB18-2089-48FA-96D6-1FB1F63EC28B}">
+                    <Component Id="cmp6F89FD0143CB07414A0818F32096F4C1" Guid="{74C7F4F1-5DBB-400D-9EE2-EF111D58A253}">
                         <File Id="fil9630A4B1190ED68D1416A98A3E240359" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides05.html" />
                     </Component>
-                    <Component Id="cmp6AF977DFB8E2272A4BAE5CD13A5EAE16" Guid="{73D342AB-7203-4944-8449-C0588DCFE725}">
+                    <Component Id="cmp6AF977DFB8E2272A4BAE5CD13A5EAE16" Guid="{ABBF00C3-B42A-42A1-922D-6331820B2F86}">
                         <File Id="fil7FF64BB2284E9EF1C5C31BDC2864F687" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides05.png" />
                     </Component>
-                    <Component Id="cmp8B4A51AF9975A630BCF1685B72EBA8C0" Guid="{3D4C55FE-7F3F-423E-81C4-AE1F80AE99FB}">
+                    <Component Id="cmp8B4A51AF9975A630BCF1685B72EBA8C0" Guid="{53F2D49F-85E2-44C8-B01A-A393E8D32060}">
                         <File Id="fil623DEFC612B187B3851D0EBD8830F955" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides06.html" />
                     </Component>
-                    <Component Id="cmp13CFD4E45FE5082225FF1A4818E10B4C" Guid="{93F34453-F8F9-4274-950C-8422DC0681B2}">
+                    <Component Id="cmp13CFD4E45FE5082225FF1A4818E10B4C" Guid="{049456E1-E331-4791-BFA8-E595C25D34B3}">
                         <File Id="filDE867458C3D015583CC907EA234D5A70" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides06.png" />
                     </Component>
-                    <Component Id="cmp86489E83A62729ACE84BF02CD97E9D8D" Guid="{79F90C06-B54E-4038-B975-CD1A996FDE74}">
+                    <Component Id="cmp86489E83A62729ACE84BF02CD97E9D8D" Guid="{95C9BEB5-CBB5-4D37-8D8C-DF16F93339D5}">
                         <File Id="fil7309CE031B5BF9267CDD3BE1F6969F64" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides061.html" />
                     </Component>
-                    <Component Id="cmpB098B2375E66D87101702795823BCA35" Guid="{E799D257-F804-4E5E-A881-47D5E6E938B5}">
+                    <Component Id="cmpB098B2375E66D87101702795823BCA35" Guid="{A5387838-96D9-4F61-BADC-C7940FA020B7}">
                         <File Id="fil6613BE746B385FA4F89CA44C8FE045A7" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides07.html" />
                     </Component>
-                    <Component Id="cmp6E086C4BF5D217C9C16885E46E316AFD" Guid="{FA875A83-9D03-4FCE-98D9-C8A98794FBA0}">
+                    <Component Id="cmp6E086C4BF5D217C9C16885E46E316AFD" Guid="{BCA734D3-4304-4212-81A7-686BDDB468AA}">
                         <File Id="fil8269A98E9446E5256476AFC93DE00482" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides07.png" />
                     </Component>
-                    <Component Id="cmpA1355E8E1F54E719A97716E71063D572" Guid="{24C4E782-8523-404D-88E0-85F1D22D3A0A}">
+                    <Component Id="cmpA1355E8E1F54E719A97716E71063D572" Guid="{0A34D13F-23AD-4021-A888-16D0DB203379}">
                         <File Id="filD31008D63C373A6791126873BD2152D8" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides071.html" />
                     </Component>
-                    <Component Id="cmp32900AB6CD1FA77AF7230CF267D6D23E" Guid="{FF2ED342-9BF8-415E-AE45-7EE7D433CA90}">
+                    <Component Id="cmp32900AB6CD1FA77AF7230CF267D6D23E" Guid="{3ED54DDA-AD30-4B5D-B57C-7509A4C89264}">
                         <File Id="fil55E550FDE846EC5A020B6CEBC4E9F24E" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides08.html" />
                     </Component>
-                    <Component Id="cmp345E1BBF10A3BA0B5CDD15539A4F2CA9" Guid="{C6431074-9E71-486D-AE1F-9AA27D72EDE1}">
+                    <Component Id="cmp345E1BBF10A3BA0B5CDD15539A4F2CA9" Guid="{470526B3-57EA-4193-9872-A2A736CD10F5}">
                         <File Id="fil1FD0BD0280D2BB1A1C4C0B4C40697384" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides08.png" />
                     </Component>
-                    <Component Id="cmpDFD615AED8252A4643F6CD5CCA81E43F" Guid="{FBB51DB1-F898-4A29-B83E-6FF8C7DA8EF5}">
+                    <Component Id="cmpDFD615AED8252A4643F6CD5CCA81E43F" Guid="{6F651560-1446-4FEB-A869-620F51C676D2}">
                         <File Id="fil801D9265D8DE9C434F2DC420771B2E2E" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides081.html" />
                     </Component>
-                    <Component Id="cmpAAFAC577840296567AE39EC857468CD8" Guid="{ACB032B0-8365-4922-9369-B8AAB96B0894}">
+                    <Component Id="cmpAAFAC577840296567AE39EC857468CD8" Guid="{1B709042-3518-46A3-A30C-DAC0E2966820}">
                         <File Id="fil5E28FC6603881D32B5E201AC2C3F8E15" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides0812.html" />
                     </Component>
-                    <Component Id="cmp9E8FC6D3F4D0BAEA49D60599C5B9679C" Guid="{6318F53B-6074-4162-8D83-D0A06D14E7C4}">
+                    <Component Id="cmp9E8FC6D3F4D0BAEA49D60599C5B9679C" Guid="{8ECBB9D1-93AB-4530-BB0F-104A15F53BBD}">
                         <File Id="fil1A67B7CDCC2D6FE924000D32F90EBF43" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides083.html" />
                     </Component>
-                    <Component Id="cmp372B72F0070B27C3917E4D4EF5B3AA96" Guid="{DC283620-49A7-4AC7-952D-F2D0CEFD0435}">
+                    <Component Id="cmp372B72F0070B27C3917E4D4EF5B3AA96" Guid="{DE6C14C6-55B5-4485-84A6-55C4F03DDC8E}">
                         <File Id="fil8BCA6F58E08521D4A207CCD4201C447A" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides084.html" />
                     </Component>
-                    <Component Id="cmpE0730B3DCCC559E42C0979B05EB89CC2" Guid="{F87FB230-AA48-4C53-8EDD-5CE6F2F65E09}">
+                    <Component Id="cmpE0730B3DCCC559E42C0979B05EB89CC2" Guid="{50755310-1E80-4769-9217-73437D600924}">
                         <File Id="filB7FFAA6EB9C163E5B17EA5B73DA21392" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides085.html" />
                     </Component>
-                    <Component Id="cmp9869F211F2586C19C8CD064C09659F56" Guid="{C2113F45-9586-467A-8DE8-ED0303BE176D}">
+                    <Component Id="cmp9869F211F2586C19C8CD064C09659F56" Guid="{8E7AAA01-6050-449A-ABC3-AE786D07CE6C}">
                         <File Id="fil5FDEC9156FDA72B9D51614931896738D" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides09.html" />
                     </Component>
-                    <Component Id="cmp7A89D091242031A87D9E2A41006F172D" Guid="{DF8F76C7-D018-4417-B57F-4F5F79175DD6}">
+                    <Component Id="cmp7A89D091242031A87D9E2A41006F172D" Guid="{E01655ED-20DC-4A02-910A-FAB3B9E36CB9}">
                         <File Id="filD410FF2FAB7AAE4A19FD4F2B4A7A3B4D" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides09.png" />
                     </Component>
-                    <Component Id="cmpE7FE6FCF7B3C7E5B89E4B37A05E4E669" Guid="{344F8DCB-7425-4382-9CDA-1505D92ACF97}">
+                    <Component Id="cmpE7FE6FCF7B3C7E5B89E4B37A05E4E669" Guid="{A619580D-C520-4491-AB4C-4638F10BE27E}">
                         <File Id="fil89D956FBDFE1D39A6C2CC0338C58C077" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides10.html" />
                     </Component>
-                    <Component Id="cmpEF24AD7B3EC642B2723BB65723DFE220" Guid="{448E8109-76D7-450B-8EEA-4F0BACBBF07B}">
+                    <Component Id="cmpEF24AD7B3EC642B2723BB65723DFE220" Guid="{C7C70148-C0AC-4481-BB78-7EB3086B008C}">
                         <File Id="filFE38050D9BB7A117FA8DF627D9911F65" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides10.png" />
                     </Component>
-                    <Component Id="cmp7CE1CD7D78F4BAD70FF7744DD9E18E49" Guid="{D826209C-88C9-4A3F-ABA4-52D313EA4570}">
+                    <Component Id="cmp7CE1CD7D78F4BAD70FF7744DD9E18E49" Guid="{ADA0390C-3104-4C64-95B8-5B2A3035DBD6}">
                         <File Id="fil64ACF00E7B923539A5F9B00FD56BB0DA" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides11.png" />
                     </Component>
-                    <Component Id="cmpA05832D4F7CD74AACC138004B141022D" Guid="{B1FCB750-0101-45DB-8843-08B5B0F0697A}">
+                    <Component Id="cmpA05832D4F7CD74AACC138004B141022D" Guid="{6BB557CD-9173-4F07-9902-9BF0ED7E7AB6}">
                         <File Id="fil26CB66DC30AD8725033BAD670841DBA0" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides12.png" />
                     </Component>
-                    <Component Id="cmp852F22994D0DA6F7DC680637CD2651DD" Guid="{7465A502-9D20-4046-9E83-1A395587ECB6}">
+                    <Component Id="cmp852F22994D0DA6F7DC680637CD2651DD" Guid="{C641DC48-91CD-4300-BDCE-CA915E585986}">
                         <File Id="filEF431DBBC74E24988C98F05F4C90F1B7" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides13.png" />
                     </Component>
-                    <Component Id="cmpAA76FC6DCE1AFA54E98382C659E37649" Guid="{509CBF78-403C-4A79-AD53-A69867D58248}">
+                    <Component Id="cmpAA76FC6DCE1AFA54E98382C659E37649" Guid="{88E7AE6A-B2E5-4DA1-AE23-A1D9D58491FB}">
                         <File Id="filAB549DDEEC489DA46E8754C886AADE69" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides14.png" />
                     </Component>
-                    <Component Id="cmpA8B5D6F30644BE780DC08BBCC4216DA4" Guid="{8414CEC5-C3D9-4210-87F9-E7AA01A3D229}">
+                    <Component Id="cmpA8B5D6F30644BE780DC08BBCC4216DA4" Guid="{27E4EB96-A84D-4350-862C-A796311847E8}">
                         <File Id="fil7D6BD627C972BDE0D0FF090F8F3428E4" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides15.png" />
                     </Component>
-                    <Component Id="cmp0C12D41FF80DC346726FF608A3D00B41" Guid="{3B2F33DC-CA5C-47A7-8E8F-857221DF8FD7}">
+                    <Component Id="cmp0C12D41FF80DC346726FF608A3D00B41" Guid="{FFEE44B2-DBFB-48F6-91D1-694C6517339B}">
                         <File Id="fil09612F2658D96922E07455FCC7541FA4" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides16.png" />
                     </Component>
-                    <Component Id="cmpF66560404ECC028EEB74854EF5B964D4" Guid="{309D589B-CE3C-4F15-A56E-7E462F2A84DA}">
+                    <Component Id="cmpF66560404ECC028EEB74854EF5B964D4" Guid="{B4AD8C90-A305-4EF2-8AE3-34B5824C52EB}">
                         <File Id="fil4F7B6C2C12CF5E7B8F76AA2D9BFF620B" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides17.png" />
                     </Component>
-                    <Component Id="cmpA15CD5ADF7C13EF9A0B6D51AB9D6E1A6" Guid="{C3CBE9D0-A61F-416C-AD91-1B5BB7E9A3D3}">
+                    <Component Id="cmpA15CD5ADF7C13EF9A0B6D51AB9D6E1A6" Guid="{8DB4D29E-0E5C-4D06-9774-3401D43B61BC}">
                         <File Id="fil1C24492C83FB766BF8688946A46A148C" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides18.png" />
                     </Component>
-                    <Component Id="cmpED62CECF0C026BF9ADB0981B193E1B31" Guid="{33D680D3-0A30-43E5-B373-29D2ECC21ADC}">
+                    <Component Id="cmpED62CECF0C026BF9ADB0981B193E1B31" Guid="{12FF41B3-C514-45F4-A618-92770A60B84C}">
                         <File Id="fil70CAD54C6CE5BE360E213086F8F43865" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides19.png" />
                     </Component>
-                    <Component Id="cmpE47BD7E4872B9D6BAFA2FE2D1AB53B3D" Guid="{DE2DBDBC-1EA6-4F8C-9623-BEB60DE9CFDA}">
+                    <Component Id="cmpE47BD7E4872B9D6BAFA2FE2D1AB53B3D" Guid="{30773CF0-38C1-422E-A63B-6714823E9155}">
                         <File Id="fil96EDA0070AB3D4961F736B4C4B2D6E9C" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides20.png" />
                     </Component>
-                    <Component Id="cmp7F5ECC4EF31F2231E700463039B84A41" Guid="{9B642057-7752-4734-84B0-3E3B61744EA6}">
+                    <Component Id="cmp7F5ECC4EF31F2231E700463039B84A41" Guid="{AED36FF3-BBCF-4748-8C18-76E307520AA5}">
                         <File Id="fil9524BA989C3B645DEE949869560F9F24" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides21.png" />
                     </Component>
-                    <Component Id="cmp9FB8501417C4C3FEA991339E15926F58" Guid="{861A5891-66BD-4A0A-94E1-99A5D1F5ED46}">
+                    <Component Id="cmp9FB8501417C4C3FEA991339E15926F58" Guid="{EA856305-C601-4A6A-B2F2-790A1BCA3EE1}">
                         <File Id="fil8D9EFBFAC9FA6B98E8597A48BF1E2D97" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides22.png" />
                     </Component>
-                    <Component Id="cmpB9B9A571BDF784AE8314A3BA9D438819" Guid="{2D41001C-532B-4DE2-8375-A936D0F9BB9B}">
+                    <Component Id="cmpB9B9A571BDF784AE8314A3BA9D438819" Guid="{AE19C53A-1A58-4F0F-9D5C-7B836825DADD}">
                         <File Id="filDDB82195B52BC7ACAAB7C46590364C62" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\tutorial_xschem_slides23.png" />
                     </Component>
-                    <Component Id="cmp279E57E17AB43F22E6C821819A91C85F" Guid="{26417F79-53C4-42FF-B86E-71F63272D832}">
+                    <Component Id="cmp279E57E17AB43F22E6C821819A91C85F" Guid="{CFCF87BC-2349-43F1-91A6-D42468127E35}">
                         <File Id="filE414DDB12AEC3DBD5F196AC553EADA87" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\underconstr.png" />
                     </Component>
-                    <Component Id="cmp08DDC145FFF8AB898C637C06495B0D65" Guid="{79BDADB6-DDA1-4476-AE68-0E46C09E19A0}">
+                    <Component Id="cmp08DDC145FFF8AB898C637C06495B0D65" Guid="{96AA0AA3-C7FD-4F36-8689-1364D70BD402}">
                         <File Id="filFCE4FF2AB78CD3379C41682BE12C9BD4" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\what_is_xschem.html" />
                     </Component>
-                    <Component Id="cmp1A207E9C1A5AF157E751AAC52AD2E5BB" Guid="{9EB16A4F-858E-4D2A-9CF7-E1398118D2BE}">
+                    <Component Id="cmp1A207E9C1A5AF157E751AAC52AD2E5BB" Guid="{878167E1-0BBD-4091-9526-E320E0990528}">
                         <File Id="fil70D2418AFC94BC84222D90AFA3553BEC" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\xschem.gif" />
                     </Component>
-                    <Component Id="cmpCCBF63930F2543BBFA634A646CC92A7F" Guid="{CEF04621-B012-4701-BAFD-C487CD46BD03}">
+                    <Component Id="cmpCCBF63930F2543BBFA634A646CC92A7F" Guid="{4D42A121-67BF-4D3C-AC0B-DBD7F8510698}">
                         <File Id="fil079D33B80447240D01313163EBFC76BE" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\xschem_all_selected.png" />
                     </Component>
-                    <Component Id="cmpF71FB2B0412C9E3893E361A1FB197194" Guid="{BF3DD45B-6507-4F5C-8081-22BD16B6D29A}">
+                    <Component Id="cmpF71FB2B0412C9E3893E361A1FB197194" Guid="{CAF02551-AA7E-473D-911B-DB21D174F22F}">
                         <File Id="filD92A545F1ABF66264152DE08BA1BA0D0" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\xschem_bg.png" />
                     </Component>
-                    <Component Id="cmp9746E572A30350C06F7F06EF3B388160" Guid="{22E7F503-2E1C-45B1-B13D-C3FD21921D95}">
+                    <Component Id="cmp9746E572A30350C06F7F06EF3B388160" Guid="{BE27BC55-A714-4E61-9BD9-A32C3AEF9DA9}">
                         <File Id="filA3712E2CA47D0206EF6EB78C41392DB9" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\xschem_bg2.png" />
                     </Component>
-                    <Component Id="cmp7BE97CD3CBF0884C1C1C25E0A92B0596" Guid="{BDE5D64B-BD4E-4932-AFA8-6F2094F13D2B}">
+                    <Component Id="cmp7BE97CD3CBF0884C1C1C25E0A92B0596" Guid="{8E29C74A-CD2A-4BED-9206-E7FEE561DC7C}">
                         <File Id="fil18BE8ED3D969FBD9283F282DB0A75E44" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\xschem_bus.png" />
                     </Component>
-                    <Component Id="cmp70D0CD57A086ED306152EDE13A905984" Guid="{9031DDB8-6052-44BA-9725-C26541F508F9}">
+                    <Component Id="cmp70D0CD57A086ED306152EDE13A905984" Guid="{0E00AF36-BFA9-491E-A832-A6EC690BA157}">
                         <File Id="fil95EDF49A30E6F6120B493F6163DC44C8" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\xschem_elements.html" />
                     </Component>
-                    <Component Id="cmp6B48AA7094D53B6FF3383551D59EA480" Guid="{103C8708-1021-404D-A9D2-0F4378B7A4B5}">
+                    <Component Id="cmp6B48AA7094D53B6FF3383551D59EA480" Guid="{1143CB27-068D-42E0-B650-F51C463E2A65}">
                         <File Id="filDC4F570939972B6B4B7CDE734E8B3AC8" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\xschem_elements_01.png" />
                     </Component>
-                    <Component Id="cmp5ABEE6DB981819B015E47A17446A7A5E" Guid="{75677EC7-11B3-4DFE-A3AA-BEFE53E9D2E9}">
+                    <Component Id="cmp5ABEE6DB981819B015E47A17446A7A5E" Guid="{BD720471-A0A5-4BC1-A355-303A56318222}">
                         <File Id="fil0662BFF6D7EA9E768E639C60B71E37DB" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\xschem_elements_02.png" />
                     </Component>
-                    <Component Id="cmp687A244FDAB260B85C16868A46F882E8" Guid="{DAEF449F-7D60-4120-A04A-0D5FF3ED97CD}">
+                    <Component Id="cmp687A244FDAB260B85C16868A46F882E8" Guid="{2197458A-B858-4B58-B8DB-8920F9C8CB6C}">
                         <File Id="filFFD395DFF6C8CF5B2C8E05ED6B7307F3" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\xschem_footer.html" />
                     </Component>
-                    <Component Id="cmp2FB1D710C101A964468578F44650A633" Guid="{85525F69-41E2-4DE8-9A3F-BC361574BD7A}">
+                    <Component Id="cmp2FB1D710C101A964468578F44650A633" Guid="{FEFB3D80-F64C-4906-820D-568347A4B3B1}">
                         <File Id="fil911D80CB2C5D19EBECB69D9D29FA8FBA" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\xschem_home.png" />
                     </Component>
-                    <Component Id="cmpDB6E9745FFE6EB75FE2C455C4E6BF40B" Guid="{9C4534E7-1F99-4FF9-B347-E08F60542A77}">
+                    <Component Id="cmpDB6E9745FFE6EB75FE2C455C4E6BF40B" Guid="{C86E7124-45C0-40EC-8F00-E9E1844D28CE}">
                         <File Id="fil03956E8F1A2B682605AAD08B5DDC2FBB" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\xschem_home1.png" />
                     </Component>
-                    <Component Id="cmpA45E2A5AA597D55FF4F5DDB11069D676" Guid="{59EF7095-F5A4-438E-BC90-D41B8279D9D2}">
+                    <Component Id="cmpA45E2A5AA597D55FF4F5DDB11069D676" Guid="{C19F09BA-0F2C-4D54-8A78-CF2FF9A9FF10}">
                         <File Id="filC860D7CA9A50DD9584EEFC656C91D4E9" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\xschem_insert.png" />
                     </Component>
-                    <Component Id="cmp98569F5795715F019544B3B53E27B7AD" Guid="{2A4871A2-237F-4483-ACE4-05D1E24FDFDB}">
+                    <Component Id="cmp98569F5795715F019544B3B53E27B7AD" Guid="{B876628A-273A-46A8-8495-EB677CD7B765}">
                         <File Id="fil0F24F7D6E9CE8C82A78A6252031DC79B" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\xschem_lines.png" />
                     </Component>
-                    <Component Id="cmpA3ECA3EE56C7667AE0D9502499270E35" Guid="{99D31323-4875-4802-A09B-DA663BC88CED}">
+                    <Component Id="cmpA3ECA3EE56C7667AE0D9502499270E35" Guid="{0C1D0BF7-B253-4827-9BF8-D66CEEC895BA}">
                         <File Id="fil27451C478B43890F36BED78E106F5395" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\xschem_logo.png" />
                     </Component>
-                    <Component Id="cmpC47D2E68F93BDFE7A1A9A46EF787C84B" Guid="{37108F14-277E-4F9C-9572-E1C4391D8443}">
+                    <Component Id="cmpC47D2E68F93BDFE7A1A9A46EF787C84B" Guid="{06DED9F3-B9FE-4935-9F4B-8A7CED1D3561}">
                         <File Id="fil125238C91EF489D015DED971D4E58397" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\xschem_man.bck.css" />
                     </Component>
-                    <Component Id="cmp09A41567E4D242D52AA78A2EB221CC11" Guid="{E631FAE6-9A3F-4700-B76F-51667377D1B8}">
+                    <Component Id="cmp09A41567E4D242D52AA78A2EB221CC11" Guid="{90225EF5-2204-4917-AC1A-2E9339203911}">
                         <File Id="fil23A98138CED345BA6F0F8741351F8C7A" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\xschem_man.css" />
                     </Component>
-                    <Component Id="cmpD3405252BBE8BE0E89FF98C796E886D2" Guid="{C521AE73-CAA7-4A1D-BFCB-0B7E0E843538}">
+                    <Component Id="cmpD3405252BBE8BE0E89FF98C796E886D2" Guid="{622D519D-B3BB-4838-98BE-B12052BAC094}">
                         <File Id="filB83C74655F954E6751386E9C458D6B50" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\xschem_man.html" />
                     </Component>
-                    <Component Id="cmp79D078894A1E9865B1FAA6D6E3A67E41" Guid="{429AF21D-5F7F-4CEF-AFAF-F3E9709EE3A4}">
+                    <Component Id="cmp79D078894A1E9865B1FAA6D6E3A67E41" Guid="{5A5B3F61-439E-4674-941C-C0E92A2A5A45}">
                         <File Id="filDBD6D15AFF1AF414C301B4C8A208D722" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\xschem_manual.pdf" />
                     </Component>
-                    <Component Id="cmp32DBC6F4737AABC6CA5CDB21A1BFB39B" Guid="{0672EDAE-25FA-4470-8BCE-287D3466E38E}">
+                    <Component Id="cmp32DBC6F4737AABC6CA5CDB21A1BFB39B" Guid="{3CE22024-BA3B-48DF-A90D-79D956EDF38D}">
                         <File Id="filFA6A6237EC8CF4CB0F26019613DAEC53" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\xschem_new_file.png" />
                     </Component>
-                    <Component Id="cmp364E784B2508A89E6EE1B209FDA34BE8" Guid="{B3C16208-3FE2-4C5E-92CC-3807B4F32F72}">
+                    <Component Id="cmp364E784B2508A89E6EE1B209FDA34BE8" Guid="{AFA30524-9084-4808-A1FC-EB8574F28C6B}">
                         <File Id="filAE7639E8C18C2C241B76DB8C3CC29FB6" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\xschem_ngspice.png" />
                     </Component>
-                    <Component Id="cmp42E13A00B2A3155255BC2BBF3F4F3663" Guid="{F03A0851-DEF0-4E68-B1A0-BD2FCB0CC5A0}">
+                    <Component Id="cmp42E13A00B2A3155255BC2BBF3F4F3663" Guid="{5ABC5A68-CEB6-4B2A-A049-5E7FAE586723}">
                         <File Id="fil42F8D21D70D1F1CE6CECF6137CAB21EB" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\xschem_polygons.png" />
                     </Component>
-                    <Component Id="cmp9D3C617DC8C7C285152842BEB40A58B0" Guid="{0A057082-8A4D-4CAA-988C-1D7BA0B48381}">
+                    <Component Id="cmp9D3C617DC8C7C285152842BEB40A58B0" Guid="{8C24D5CB-7B65-4396-9131-1666A9B58301}">
                         <File Id="fil6E561FE037D0F06F144FEC5785F15740" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\xschem_properties.html" />
                     </Component>
-                    <Component Id="cmp11AC5BB5892B12CA0D0FDC3702442FC3" Guid="{5F4CD0BB-150A-4F76-B77F-D9B93F88CF77}">
+                    <Component Id="cmp11AC5BB5892B12CA0D0FDC3702442FC3" Guid="{50D2E2E0-504C-40C1-9C8B-6EA8089118F2}">
                         <File Id="fil9C8DE9BEE5663AA3EF8D0736A9D3D64F" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\xschem_rectangles.png" />
                     </Component>
-                    <Component Id="cmp876F621EA35578C847E5FA63BFBF07FB" Guid="{BAB65A6B-EA4A-4538-9EE2-0FF4A7CC4EFB}">
+                    <Component Id="cmp876F621EA35578C847E5FA63BFBF07FB" Guid="{2CA4A1AE-B5B2-4A21-9B54-9DECFF78FCF4}">
                         <File Id="fil516922E2D2DBF0257D5875222309AF59" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\xschem_remote.html" />
                     </Component>
-                    <Component Id="cmpCDCC1313725B9ED0DF98CE9E7E29487B" Guid="{9A28170A-1B77-4E05-8BC0-69EE730881E8}">
+                    <Component Id="cmpCDCC1313725B9ED0DF98CE9E7E29487B" Guid="{AA2F3422-F58B-4042-9DEE-C029E2260C09}">
                         <File Id="fil540B84177873AD3937F1F368E2F380F3" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\xschem_saveas.png" />
                     </Component>
-                    <Component Id="cmp5AB8D09A8D24743292EAC3F53B5EF7D9" Guid="{BBD6DD21-EFF8-44EC-BB16-C492A67A5658}">
+                    <Component Id="cmp5AB8D09A8D24743292EAC3F53B5EF7D9" Guid="{7CE139C7-2244-4704-991A-1E35D11F27C7}">
                         <File Id="fil0CB0DA7B72B200A99309732F64D80160" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\xschem_symbols.png" />
                     </Component>
-                    <Component Id="cmp2203F3A301C2F6D068A8E45F9DA1FCC9" Guid="{68DD8D83-C68B-40D0-BB4B-17A83AB0602F}">
+                    <Component Id="cmp2203F3A301C2F6D068A8E45F9DA1FCC9" Guid="{45A5BF69-DC75-489B-B9B1-B0523F0981ED}">
                         <File Id="fil5658EA166D0DECDAE5F2756A77F381D9" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\xschem_texts.png" />
                     </Component>
-                    <Component Id="cmpE07D671B6F1CD6B50BFFE2377596657F" Guid="{879A2EA9-44D3-4F6C-8B0B-E758F97CC6B0}">
+                    <Component Id="cmpE07D671B6F1CD6B50BFFE2377596657F" Guid="{31379484-0D63-4C6A-8EF5-CDF449AFD10A}">
                         <File Id="filAF034478CAA6B3483E094264F129F3C8" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\xschem_texts1.png" />
                     </Component>
-                    <Component Id="cmpAC92D4EA651950349917C00C3E9B6F7B" Guid="{662C7702-85BB-4500-A9F7-C933E20BE027}">
+                    <Component Id="cmpAC92D4EA651950349917C00C3E9B6F7B" Guid="{4D6DBBBE-E2EC-4CB8-ACDA-F1F7A7C2B401}">
                         <File Id="fil19C655E1F2E0B4E7F7DEDD0706A69392" KeyPath="yes" Source="$(var.docSrcDir)\xschem_man\xschem_wires.png" />
                     </Component>
                 </Directory>
@@ -903,13 +969,9 @@
             <ComponentRef Id="cmp899AB8B9ABE11F20A0C7BC767419FC1B" />
             <ComponentRef Id="cmp5C7893CE9CAC7172186A19D4F7C9B3F6" />
             <ComponentRef Id="cmp830D9797AC395079C02810A4A8D445E4" />
+            <ComponentRef Id="cmp46766002C824318846B83CDF4DBAD182" />
             <ComponentRef Id="cmpD6A28746EC2D28A8FBAAAACA17ED987B" />
             <ComponentRef Id="cmp582FBF503439D78BC069B234036D9E89" />
-            <ComponentRef Id="cmp69EEA82A2C967338A67DDF35FDE45600" />
-            <ComponentRef Id="cmpE3B9694CA93BB1526F76E33A642CEA1B" />
-            <ComponentRef Id="cmp20646ABB70916F03A33E968411B57A70" />
-            <ComponentRef Id="cmp0A4C3E7FD6878AAA1D26FE8FD960048D" />
-            <ComponentRef Id="cmp17017531D96EA1AD3E48E88A3A9B8DBB" />
             <ComponentRef Id="cmp00B6516520113473361C8E8DF1C8141B" />
             <ComponentRef Id="cmp2211334633C86C7FD8FB44CD2B513095" />
             <ComponentRef Id="cmp57CBA7F2D8CABC805E262E532C0D3F90" />
@@ -927,6 +989,10 @@
             <ComponentRef Id="cmp2EA5ABF0232607FE2B60946F461AB4C8" />
             <ComponentRef Id="cmpEF190926FE94250EAD5B7813D4CB078D" />
             <ComponentRef Id="cmp74F21FF343DE290DFDEE33310BE585E1" />
+            <ComponentRef Id="cmp09E38EB19A0FE87BCEEC21CA7364F723" />
+            <ComponentRef Id="cmp6ADE2A2D330812ABB718A3118C89B3F3" />
+            <ComponentRef Id="cmpC4CC987EDB3814BF6CDA06AD166E1AA5" />
+            <ComponentRef Id="cmpF7D3EF7C7886FBF551B10FB97DAAD596" />
             <ComponentRef Id="cmpBE23AC11FA02835A80FA838229BC8687" />
             <ComponentRef Id="cmp6554BF7593A105E9B2BA2EE07C4D931C" />
             <ComponentRef Id="cmp327F0BACA71CBC62C20CA0DE456D4ECD" />
@@ -986,6 +1052,7 @@
             <ComponentRef Id="cmp5D66F2AD13E998B64847AB8B0624EE21" />
             <ComponentRef Id="cmp99C532DCC5EF9E1CD1D26BED58B2934E" />
             <ComponentRef Id="cmpA41BECAFCCD0A01F5DAD18A949FF2827" />
+            <ComponentRef Id="cmp2122C826D84E0925566AEC470A7CFABD" />
             <ComponentRef Id="cmp7D84114D6FDF0E09CB66A982B3C581C3" />
             <ComponentRef Id="cmpDB80566B13B66B2A92E91DA0585404A9" />
             <ComponentRef Id="cmp8C7AB373FA963AF5F88C8B394FB28B19" />
@@ -1013,6 +1080,8 @@
             <ComponentRef Id="cmpF9280278155042E1B4DC007B03E1CCE6" />
             <ComponentRef Id="cmp8737C923A2CD6802ED6E13112BBB6599" />
             <ComponentRef Id="cmp4FDAD50274CE6105999BB73BF884DD1D" />
+            <ComponentRef Id="cmp9C9646BA969959CDB04692029FCBCFB1" />
+            <ComponentRef Id="cmp7D05C60DDE4C4E276B03CA0BFA79AA8E" />
             <ComponentRef Id="cmp80E23E69F6BFD335D5BE2C38F9C1FE2C" />
             <ComponentRef Id="cmpAF74F1FEB750C2B9BFD37D44390B6691" />
             <ComponentRef Id="cmpFB983E1BFC83DD89C4A99D9057D8C389" />
@@ -1099,7 +1168,26 @@
             <ComponentRef Id="cmpF6C3D9737087F3D9B2228B21C6734980" />
             <ComponentRef Id="cmpA1AF34A5AB0E46E83E2489246BC02E35" />
             <ComponentRef Id="cmp89BE8EF1B2B36CB950714E6DDEC886BB" />
+            <ComponentRef Id="cmp24AB399EEF91852024CB83CD0A4EF749" />
+            <ComponentRef Id="cmp97B7734742CE69199C349409D98FEB6F" />
+            <ComponentRef Id="cmpC3D4EC73230C6AC07E8194BC3757FC41" />
+            <ComponentRef Id="cmp376282B9962A9D56861EE6DEC1861CAC" />
+            <ComponentRef Id="cmp64749469DE632D7DA54D2EBB7A3AE60B" />
+            <ComponentRef Id="cmpF18143BE546D526859F1C5471E11F2FB" />
+            <ComponentRef Id="cmp8CB8AE85C605D9520D284D02A40D7A0E" />
+            <ComponentRef Id="cmp641101E8D1E9AEADC4198F95BA7BD96F" />
+            <ComponentRef Id="cmp0A38E2FC1C828C9008B61E8F3719ECCC" />
             <ComponentRef Id="cmp1887EC93042A8F0C854E00EEC32380FD" />
+            <ComponentRef Id="cmpF79E68A44B6D276CD4FD94243C7638EB" />
+            <ComponentRef Id="cmp789D1388A55CE9AADEAAE762DC494821" />
+            <ComponentRef Id="cmp27CCFCA8735FEA1F70696E4CC11B2245" />
+            <ComponentRef Id="cmp3CF52F67544072F25918CEA2F1A53102" />
+            <ComponentRef Id="cmpC0909817135C078311BA958292379CC4" />
+            <ComponentRef Id="cmpA3B864C71585ACAC196B4E961B5DB437" />
+            <ComponentRef Id="cmp01895B909BF869B3E0579B007FF33C51" />
+            <ComponentRef Id="cmpACC84A8CADF454A45B82E0DB194474A7" />
+            <ComponentRef Id="cmpB18E1C5C0C0279347B011EC72ACB36CB" />
+            <ComponentRef Id="cmp03435CD38825723564A3160E6C0420A9" />
             <ComponentRef Id="cmp02F36C6BCDFD4EAC97D7A1D83514BB74" />
             <ComponentRef Id="cmp5353727D96EF1D42BC670B9B5B643C85" />
             <ComponentRef Id="cmp08FFB226D6198AABF0A1D621D72E893B" />
diff --git a/src/xschem.tcl b/src/xschem.tcl
index 4d413dfb..38ff455a 100644
--- a/src/xschem.tcl
+++ b/src/xschem.tcl
@@ -6047,7 +6047,7 @@ proc set_replace_key_binding {} {
 proc source_user_tcl_files {} {
   global tcl_files
   foreach i $tcl_files {
-    uplevel #0 "source $i"
+    uplevel #0 [list source $i]
   }
 }