diff --git a/sky130/klayout/LICENSE b/sky130/klayout/LICENSE
new file mode 100644
index 0000000..a5fca4d
--- /dev/null
+++ b/sky130/klayout/LICENSE
@@ -0,0 +1,25 @@
+BSD 2-Clause License
+
+Copyright (c) 2020, laurentc2
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/sky130/klayout/sky130.lyp b/sky130/klayout/sky130.lyp
index cf7ec0b..ad00629 100644
--- a/sky130/klayout/sky130.lyp
+++ b/sky130/klayout/sky130.lyp
@@ -22,7 +22,7 @@
   <fill-color>#00ffff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C21</dither-pattern>
+  <dither-pattern>C20</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -39,7 +39,7 @@
   <fill-color>#ffbff2</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C39</dither-pattern>
+  <dither-pattern>C38</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -107,7 +107,7 @@
   <fill-color>#96c8ff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C39</dither-pattern>
+  <dither-pattern>C38</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -141,7 +141,7 @@
   <fill-color>#00cc66</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C21</dither-pattern>
+  <dither-pattern>C20</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -175,7 +175,7 @@
   <fill-color>#268c6b</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C37</dither-pattern>
+  <dither-pattern>C36</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -209,7 +209,7 @@
   <fill-color>#c8ffc8</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C48</dither-pattern>
+  <dither-pattern>C47</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -243,7 +243,7 @@
   <fill-color>#00ff00</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C35</dither-pattern>
+  <dither-pattern>C34</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -294,7 +294,7 @@
   <fill-color>#268c6b</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C37</dither-pattern>
+  <dither-pattern>C36</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -362,7 +362,7 @@
   <fill-color>#9900e6</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C37</dither-pattern>
+  <dither-pattern>C36</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -379,7 +379,7 @@
   <fill-color>#d9cc00</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C35</dither-pattern>
+  <dither-pattern>C34</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -464,7 +464,7 @@
   <fill-color>#9900e6</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C23</dither-pattern>
+  <dither-pattern>C22</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -481,7 +481,7 @@
   <fill-color>#e61f0d</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C22</dither-pattern>
+  <dither-pattern>C21</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -498,7 +498,7 @@
   <fill-color>#ff0000</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C42</dither-pattern>
+  <dither-pattern>C41</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -515,7 +515,7 @@
   <fill-color>#ff8000</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C39</dither-pattern>
+  <dither-pattern>C38</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -634,7 +634,7 @@
   <fill-color>#ff0000</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C37</dither-pattern>
+  <dither-pattern>C36</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -685,7 +685,7 @@
   <fill-color>#00cc66</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C51</dither-pattern>
+  <dither-pattern>C50</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -753,7 +753,7 @@
   <fill-color>#9900e6</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C42</dither-pattern>
+  <dither-pattern>C41</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -770,7 +770,7 @@
   <fill-color>#ffffcc</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C24</dither-pattern>
+  <dither-pattern>C23</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -872,7 +872,7 @@
   <fill-color>#bf4026</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C47</dither-pattern>
+  <dither-pattern>C46</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -940,7 +940,7 @@
   <fill-color>#ffe6bf</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C54</dither-pattern>
+  <dither-pattern>C53</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -974,7 +974,7 @@
   <fill-color>#bf4026</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C54</dither-pattern>
+  <dither-pattern>C53</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -991,7 +991,7 @@
   <fill-color>#ffe6bf</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C37</dither-pattern>
+  <dither-pattern>C36</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -1212,7 +1212,7 @@
   <fill-color>#0000ff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C54</dither-pattern>
+  <dither-pattern>C53</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -1229,7 +1229,7 @@
   <fill-color>#0000ff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C37</dither-pattern>
+  <dither-pattern>C36</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -1263,7 +1263,7 @@
   <fill-color>#0000ff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C26</dither-pattern>
+  <dither-pattern>C25</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -1280,7 +1280,7 @@
   <fill-color>#0000ff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C27</dither-pattern>
+  <dither-pattern>C26</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -1297,7 +1297,7 @@
   <fill-color>#0000ff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C28</dither-pattern>
+  <dither-pattern>C27</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -1314,7 +1314,7 @@
   <fill-color>#0000ff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C29</dither-pattern>
+  <dither-pattern>C28</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -1331,7 +1331,7 @@
   <fill-color>#0000ff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C30</dither-pattern>
+  <dither-pattern>C29</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -1348,7 +1348,7 @@
   <fill-color>#0000ff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C31</dither-pattern>
+  <dither-pattern>C30</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -1365,7 +1365,7 @@
   <fill-color>#0000ff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C32</dither-pattern>
+  <dither-pattern>C31</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -1382,7 +1382,7 @@
   <fill-color>#0000ff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C33</dither-pattern>
+  <dither-pattern>C32</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -1467,7 +1467,7 @@
   <fill-color>#ff00ff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C38</dither-pattern>
+  <dither-pattern>C37</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -1518,7 +1518,7 @@
   <fill-color>#ff00ff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C46</dither-pattern>
+  <dither-pattern>C45</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -1586,7 +1586,7 @@
   <fill-color>#ff00ff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C54</dither-pattern>
+  <dither-pattern>C53</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -1603,7 +1603,7 @@
   <fill-color>#ff00ff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C37</dither-pattern>
+  <dither-pattern>C36</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -1637,7 +1637,7 @@
   <fill-color>#ff00ff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C26</dither-pattern>
+  <dither-pattern>C25</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -1654,7 +1654,7 @@
   <fill-color>#ff00ff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C27</dither-pattern>
+  <dither-pattern>C26</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -1671,7 +1671,7 @@
   <fill-color>#ff00ff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C28</dither-pattern>
+  <dither-pattern>C27</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -1688,7 +1688,7 @@
   <fill-color>#ff00ff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C29</dither-pattern>
+  <dither-pattern>C28</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -1705,7 +1705,7 @@
   <fill-color>#ff00ff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C30</dither-pattern>
+  <dither-pattern>C29</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -1722,7 +1722,7 @@
   <fill-color>#ff00ff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C31</dither-pattern>
+  <dither-pattern>C30</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -1739,7 +1739,7 @@
   <fill-color>#ff00ff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C32</dither-pattern>
+  <dither-pattern>C31</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -1756,7 +1756,7 @@
   <fill-color>#ff00ff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C33</dither-pattern>
+  <dither-pattern>C32</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -1774,7 +1774,7 @@
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
   <dither-pattern>I1</dither-pattern>
-  <line-style>C7</line-style>
+  <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
   <transparent>false</transparent>
@@ -1841,7 +1841,7 @@
   <fill-color>#00ffff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C50</dither-pattern>
+  <dither-pattern>C49</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -1892,7 +1892,7 @@
   <fill-color>#00ffff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C35</dither-pattern>
+  <dither-pattern>C34</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -1960,7 +1960,7 @@
   <fill-color>#00ffff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C54</dither-pattern>
+  <dither-pattern>C53</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -1977,7 +1977,7 @@
   <fill-color>#00ffff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C37</dither-pattern>
+  <dither-pattern>C36</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -2028,7 +2028,7 @@
   <fill-color>#00ffff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C26</dither-pattern>
+  <dither-pattern>C25</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -2045,7 +2045,7 @@
   <fill-color>#00ffff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C27</dither-pattern>
+  <dither-pattern>C26</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -2062,7 +2062,7 @@
   <fill-color>#00ffff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C28</dither-pattern>
+  <dither-pattern>C27</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -2079,7 +2079,7 @@
   <fill-color>#00ffff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C29</dither-pattern>
+  <dither-pattern>C28</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -2096,7 +2096,7 @@
   <fill-color>#00ffff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C30</dither-pattern>
+  <dither-pattern>C29</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -2113,7 +2113,7 @@
   <fill-color>#00ffff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C31</dither-pattern>
+  <dither-pattern>C30</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -2130,7 +2130,7 @@
   <fill-color>#00ffff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C32</dither-pattern>
+  <dither-pattern>C31</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -2147,7 +2147,7 @@
   <fill-color>#00ffff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C33</dither-pattern>
+  <dither-pattern>C32</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -2165,7 +2165,7 @@
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
   <dither-pattern>I1</dither-pattern>
-  <line-style>C7</line-style>
+  <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
   <transparent>false</transparent>
@@ -2283,7 +2283,7 @@
   <fill-color>#5e00e6</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C35</dither-pattern>
+  <dither-pattern>C34</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -2351,7 +2351,7 @@
   <fill-color>#5e00e6</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C54</dither-pattern>
+  <dither-pattern>C53</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -2368,7 +2368,7 @@
   <fill-color>#5e00e6</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C37</dither-pattern>
+  <dither-pattern>C36</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -2419,7 +2419,7 @@
   <fill-color>#5e00e6</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C26</dither-pattern>
+  <dither-pattern>C25</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -2436,7 +2436,7 @@
   <fill-color>#5e00e6</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C27</dither-pattern>
+  <dither-pattern>C26</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -2453,7 +2453,7 @@
   <fill-color>#5e00e6</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C28</dither-pattern>
+  <dither-pattern>C27</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -2470,7 +2470,7 @@
   <fill-color>#5e00e6</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C29</dither-pattern>
+  <dither-pattern>C28</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -2487,7 +2487,7 @@
   <fill-color>#5e00e6</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C30</dither-pattern>
+  <dither-pattern>C29</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -2504,7 +2504,7 @@
   <fill-color>#5e00e6</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C31</dither-pattern>
+  <dither-pattern>C30</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -2521,7 +2521,7 @@
   <fill-color>#5e00e6</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C32</dither-pattern>
+  <dither-pattern>C31</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -2538,7 +2538,7 @@
   <fill-color>#5e00e6</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C33</dither-pattern>
+  <dither-pattern>C32</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -2556,7 +2556,7 @@
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
   <dither-pattern>I1</dither-pattern>
-  <line-style>C7</line-style>
+  <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
   <transparent>false</transparent>
@@ -2623,7 +2623,7 @@
   <fill-color>#d9cc00</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C43</dither-pattern>
+  <dither-pattern>C42</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -2674,7 +2674,7 @@
   <fill-color>#d9cc00</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C35</dither-pattern>
+  <dither-pattern>C34</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -2742,7 +2742,7 @@
   <fill-color>#d9cc00</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C54</dither-pattern>
+  <dither-pattern>C53</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -2759,7 +2759,7 @@
   <fill-color>#d9cc00</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C37</dither-pattern>
+  <dither-pattern>C36</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -2810,7 +2810,7 @@
   <fill-color>#d9cc00</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C26</dither-pattern>
+  <dither-pattern>C25</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -2827,7 +2827,7 @@
   <fill-color>#d9cc00</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C27</dither-pattern>
+  <dither-pattern>C26</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -2844,7 +2844,7 @@
   <fill-color>#d9cc00</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C28</dither-pattern>
+  <dither-pattern>C27</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -2861,7 +2861,7 @@
   <fill-color>#d9cc00</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C29</dither-pattern>
+  <dither-pattern>C28</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -2878,7 +2878,7 @@
   <fill-color>#d9cc00</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C30</dither-pattern>
+  <dither-pattern>C29</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -2895,7 +2895,7 @@
   <fill-color>#d9cc00</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C31</dither-pattern>
+  <dither-pattern>C30</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -2912,7 +2912,7 @@
   <fill-color>#d9cc00</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C32</dither-pattern>
+  <dither-pattern>C31</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -2929,7 +2929,7 @@
   <fill-color>#d9cc00</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C33</dither-pattern>
+  <dither-pattern>C32</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -2946,7 +2946,7 @@
   <fill-color>#00cc66</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C51</dither-pattern>
+  <dither-pattern>C50</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -2963,7 +2963,7 @@
   <fill-color>#ffffcc</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C21</dither-pattern>
+  <dither-pattern>C20</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -2997,7 +2997,7 @@
   <fill-color>#d9e6ff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C35</dither-pattern>
+  <dither-pattern>C34</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -3082,7 +3082,7 @@
   <fill-color>#96c8ff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C39</dither-pattern>
+  <dither-pattern>C38</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -3095,6 +3095,23 @@
   <source>86/20@1</source>
  </properties>
  <properties>
+  <frame-color>#ffffff</frame-color>
+  <fill-color>#c896ff</fill-color>
+  <frame-brightness>0</frame-brightness>
+  <fill-brightness>0</fill-brightness>
+  <dither-pattern>C38</dither-pattern>
+  <line-style>C0</line-style>
+  <valid>true</valid>
+  <visible>true</visible>
+  <transparent>false</transparent>
+  <width>1</width>
+  <marked>false</marked>
+  <xfill>false</xfill>
+  <animation>0</animation>
+  <name>urpm.drawing - 79/20</name>
+  <source>79/20@1</source>
+ </properties>
+ <properties>
   <frame-color>#9900e6</frame-color>
   <fill-color>#9900e6</fill-color>
   <frame-brightness>0</frame-brightness>
@@ -3117,7 +3134,7 @@
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
   <dither-pattern>C0</dither-pattern>
-  <line-style>C7</line-style>
+  <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
   <transparent>false</transparent>
@@ -3184,7 +3201,7 @@
   <fill-color>#ffe6bf</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C21</dither-pattern>
+  <dither-pattern>C20</dither-pattern>
   <line-style>C1</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -3201,7 +3218,7 @@
   <fill-color>#bf4026</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C41</dither-pattern>
+  <dither-pattern>C40</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -3218,7 +3235,7 @@
   <fill-color>#e61f0d</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C48</dither-pattern>
+  <dither-pattern>C47</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -3235,7 +3252,7 @@
   <fill-color>#e61f0d</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C35</dither-pattern>
+  <dither-pattern>C34</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -3303,7 +3320,7 @@
   <fill-color>#e61f0d</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C37</dither-pattern>
+  <dither-pattern>C36</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -3320,7 +3337,7 @@
   <fill-color>#e61f0d</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C26</dither-pattern>
+  <dither-pattern>C25</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -3337,7 +3354,7 @@
   <fill-color>#e61f0d</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C27</dither-pattern>
+  <dither-pattern>C26</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -3354,7 +3371,7 @@
   <fill-color>#e61f0d</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C28</dither-pattern>
+  <dither-pattern>C27</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -3371,7 +3388,7 @@
   <fill-color>#e61f0d</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C29</dither-pattern>
+  <dither-pattern>C28</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -3388,7 +3405,7 @@
   <fill-color>#e61f0d</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C30</dither-pattern>
+  <dither-pattern>C29</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -3405,7 +3422,7 @@
   <fill-color>#e61f0d</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C31</dither-pattern>
+  <dither-pattern>C30</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -3422,7 +3439,7 @@
   <fill-color>#e61f0d</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C32</dither-pattern>
+  <dither-pattern>C31</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -3439,7 +3456,7 @@
   <fill-color>#e61f0d</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C33</dither-pattern>
+  <dither-pattern>C32</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -3473,7 +3490,7 @@
   <fill-color>#ffbff2</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C21</dither-pattern>
+  <dither-pattern>C20</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -3524,7 +3541,7 @@
   <fill-color>#ffffff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C26</dither-pattern>
+  <dither-pattern>C25</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -3541,7 +3558,7 @@
   <fill-color>#ffffff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C27</dither-pattern>
+  <dither-pattern>C26</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -3558,7 +3575,7 @@
   <fill-color>#ffffff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C28</dither-pattern>
+  <dither-pattern>C27</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -3575,7 +3592,7 @@
   <fill-color>#ccccd9</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C21</dither-pattern>
+  <dither-pattern>C20</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -3660,7 +3677,7 @@
   <fill-color>#ccccd9</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C21</dither-pattern>
+  <dither-pattern>C20</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -3677,7 +3694,7 @@
   <fill-color>#268c6b</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C21</dither-pattern>
+  <dither-pattern>C20</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -4153,7 +4170,7 @@
   <fill-color>#00cc66</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C21</dither-pattern>
+  <dither-pattern>C20</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -4221,7 +4238,7 @@
   <fill-color>#ffff00</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C21</dither-pattern>
+  <dither-pattern>C20</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -4289,7 +4306,7 @@
   <fill-color>#d9cc00</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C21</dither-pattern>
+  <dither-pattern>C20</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -4357,7 +4374,7 @@
   <fill-color>#ffff00</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C21</dither-pattern>
+  <dither-pattern>C20</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -4374,7 +4391,7 @@
   <fill-color>#fff5e6</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C21</dither-pattern>
+  <dither-pattern>C20</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -4442,7 +4459,7 @@
   <fill-color>#00cc66</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C21</dither-pattern>
+  <dither-pattern>C20</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -4544,7 +4561,7 @@
   <fill-color>#ff8000</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C21</dither-pattern>
+  <dither-pattern>C20</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -4765,7 +4782,7 @@
   <fill-color>#0000ff</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C21</dither-pattern>
+  <dither-pattern>C20</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -4918,7 +4935,7 @@
   <fill-color>#ffbff2</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C21</dither-pattern>
+  <dither-pattern>C20</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -5071,7 +5088,7 @@
   <fill-color>#5e00e6</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C21</dither-pattern>
+  <dither-pattern>C20</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -5173,7 +5190,7 @@
   <fill-color>#e61f0d</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C40</dither-pattern>
+  <dither-pattern>C39</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -5292,7 +5309,7 @@
   <fill-color>#00cc66</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C21</dither-pattern>
+  <dither-pattern>C20</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -5309,7 +5326,7 @@
   <fill-color>#ffe6bf</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C21</dither-pattern>
+  <dither-pattern>C20</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -5734,7 +5751,7 @@
   <fill-color>#e61f0d</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C48</dither-pattern>
+  <dither-pattern>C47</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -5751,7 +5768,7 @@
   <fill-color>#bf4026</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C41</dither-pattern>
+  <dither-pattern>C40</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -5785,7 +5802,7 @@
   <fill-color>#ffbff2</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C21</dither-pattern>
+  <dither-pattern>C20</dither-pattern>
   <line-style>C0</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -5803,7 +5820,7 @@
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
   <dither-pattern>C0</dither-pattern>
-  <line-style>C7</line-style>
+  <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
   <transparent>false</transparent>
@@ -5820,7 +5837,7 @@
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
   <dither-pattern>C0</dither-pattern>
-  <line-style>C7</line-style>
+  <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
   <transparent>false</transparent>
@@ -5837,7 +5854,7 @@
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
   <dither-pattern>C0</dither-pattern>
-  <line-style>C7</line-style>
+  <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
   <transparent>false</transparent>
@@ -5854,7 +5871,7 @@
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
   <dither-pattern>C0</dither-pattern>
-  <line-style>C7</line-style>
+  <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
   <transparent>false</transparent>
@@ -5871,7 +5888,7 @@
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
   <dither-pattern>C2</dither-pattern>
-  <line-style>C7</line-style>
+  <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
   <transparent>false</transparent>
@@ -5888,7 +5905,7 @@
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
   <dither-pattern>C2</dither-pattern>
-  <line-style>C7</line-style>
+  <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
   <transparent>false</transparent>
@@ -5905,7 +5922,7 @@
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
   <dither-pattern>C0</dither-pattern>
-  <line-style>C7</line-style>
+  <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
   <transparent>false</transparent>
@@ -5922,7 +5939,7 @@
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
   <dither-pattern>C0</dither-pattern>
-  <line-style>C7</line-style>
+  <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
   <transparent>false</transparent>
@@ -5939,7 +5956,7 @@
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
   <dither-pattern>C0</dither-pattern>
-  <line-style>C7</line-style>
+  <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
   <transparent>false</transparent>
@@ -5956,7 +5973,7 @@
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
   <dither-pattern>C0</dither-pattern>
-  <line-style>C7</line-style>
+  <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
   <transparent>false</transparent>
@@ -5973,7 +5990,7 @@
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
   <dither-pattern>C0</dither-pattern>
-  <line-style>C7</line-style>
+  <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
   <transparent>false</transparent>
@@ -5990,7 +6007,7 @@
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
   <dither-pattern>C0</dither-pattern>
-  <line-style>C7</line-style>
+  <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
   <transparent>false</transparent>
@@ -6007,7 +6024,7 @@
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
   <dither-pattern>C0</dither-pattern>
-  <line-style>C7</line-style>
+  <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
   <transparent>false</transparent>
@@ -6023,7 +6040,7 @@
   <fill-color>#ccccd9</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C23</dither-pattern>
+  <dither-pattern>C22</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -6041,7 +6058,7 @@
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
   <dither-pattern>C0</dither-pattern>
-  <line-style>C7</line-style>
+  <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
   <transparent>false</transparent>
@@ -6058,7 +6075,7 @@
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
   <dither-pattern>C0</dither-pattern>
-  <line-style>C7</line-style>
+  <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
   <transparent>false</transparent>
@@ -6125,8 +6142,8 @@
   <fill-color>#c8ffc8</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C21</dither-pattern>
-  <line-style>C7</line-style>
+  <dither-pattern>C20</dither-pattern>
+  <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
   <transparent>false</transparent>
@@ -6143,7 +6160,7 @@
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
   <dither-pattern>C1</dither-pattern>
-  <line-style>C7</line-style>
+  <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
   <transparent>false</transparent>
@@ -6160,7 +6177,7 @@
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
   <dither-pattern>C0</dither-pattern>
-  <line-style>C7</line-style>
+  <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
   <transparent>false</transparent>
@@ -6177,7 +6194,7 @@
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
   <dither-pattern>C0</dither-pattern>
-  <line-style>C7</line-style>
+  <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
   <transparent>false</transparent>
@@ -6194,7 +6211,7 @@
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
   <dither-pattern>C0</dither-pattern>
-  <line-style>C7</line-style>
+  <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
   <transparent>false</transparent>
@@ -6211,7 +6228,7 @@
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
   <dither-pattern>C0</dither-pattern>
-  <line-style>C7</line-style>
+  <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
   <transparent>false</transparent>
@@ -6228,7 +6245,7 @@
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
   <dither-pattern>C0</dither-pattern>
-  <line-style>C7</line-style>
+  <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
   <transparent>false</transparent>
@@ -6245,7 +6262,7 @@
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
   <dither-pattern>C0</dither-pattern>
-  <line-style>C7</line-style>
+  <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
   <transparent>false</transparent>
@@ -6262,7 +6279,7 @@
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
   <dither-pattern>C0</dither-pattern>
-  <line-style>C7</line-style>
+  <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
   <transparent>false</transparent>
@@ -6279,7 +6296,7 @@
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
   <dither-pattern>C0</dither-pattern>
-  <line-style>C7</line-style>
+  <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
   <transparent>false</transparent>
@@ -6296,7 +6313,7 @@
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
   <dither-pattern>C0</dither-pattern>
-  <line-style>C7</line-style>
+  <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
   <transparent>false</transparent>
@@ -6313,7 +6330,7 @@
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
   <dither-pattern>C0</dither-pattern>
-  <line-style>C7</line-style>
+  <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
   <transparent>false</transparent>
@@ -6380,7 +6397,7 @@
   <fill-color>#8c8ca6</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C38</dither-pattern>
+  <dither-pattern>C37</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -6397,7 +6414,7 @@
   <fill-color>#8c8ca6</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C50</dither-pattern>
+  <dither-pattern>C49</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -6431,7 +6448,7 @@
   <fill-color>#8c8ca6</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C43</dither-pattern>
+  <dither-pattern>C42</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -6465,7 +6482,7 @@
   <fill-color>#00ffe7</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C38</dither-pattern>
+  <dither-pattern>C37</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -6482,7 +6499,7 @@
   <fill-color>#00ffe7</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C50</dither-pattern>
+  <dither-pattern>C49</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -6516,7 +6533,7 @@
   <fill-color>#00ffe7</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C43</dither-pattern>
+  <dither-pattern>C42</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -6550,7 +6567,7 @@
   <fill-color>#ffffcc</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C38</dither-pattern>
+  <dither-pattern>C37</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -6567,7 +6584,7 @@
   <fill-color>#ffffcc</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C50</dither-pattern>
+  <dither-pattern>C49</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -6601,7 +6618,7 @@
   <fill-color>#ffffcc</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C43</dither-pattern>
+  <dither-pattern>C42</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -6635,7 +6652,7 @@
   <fill-color>#802626</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C38</dither-pattern>
+  <dither-pattern>C37</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -6652,7 +6669,7 @@
   <fill-color>#802626</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C50</dither-pattern>
+  <dither-pattern>C49</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -6686,7 +6703,7 @@
   <fill-color>#802626</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C43</dither-pattern>
+  <dither-pattern>C42</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -6720,7 +6737,7 @@
   <fill-color>#333399</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C38</dither-pattern>
+  <dither-pattern>C37</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -6737,7 +6754,7 @@
   <fill-color>#333399</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C50</dither-pattern>
+  <dither-pattern>C49</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -6771,7 +6788,7 @@
   <fill-color>#333399</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C43</dither-pattern>
+  <dither-pattern>C42</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -6805,7 +6822,7 @@
   <fill-color>#fa8072</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C38</dither-pattern>
+  <dither-pattern>C37</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -6822,7 +6839,7 @@
   <fill-color>#fa8072</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C50</dither-pattern>
+  <dither-pattern>C49</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -6856,7 +6873,7 @@
   <fill-color>#fa8072</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C43</dither-pattern>
+  <dither-pattern>C42</dither-pattern>
   <line-style>C0</line-style>
   <valid>true</valid>
   <visible>true</visible>
@@ -6975,7 +6992,7 @@
   <fill-color>#ffe6bf</fill-color>
   <frame-brightness>0</frame-brightness>
   <fill-brightness>0</fill-brightness>
-  <dither-pattern>C21</dither-pattern>
+  <dither-pattern>C20</dither-pattern>
   <line-style>C1</line-style>
   <valid>false</valid>
   <visible>true</visible>
@@ -6987,7 +7004,262 @@
   <name>blanking.drawing - 124/40</name>
   <source>124/40@1</source>
  </properties>
- <name/>
+ <properties>
+  <frame-color>#80a8ff</frame-color>
+  <fill-color>#80a8ff</fill-color>
+  <frame-brightness>0</frame-brightness>
+  <fill-brightness>0</fill-brightness>
+  <dither-pattern>I5</dither-pattern>
+  <line-style/>
+  <valid>true</valid>
+  <visible>true</visible>
+  <transparent>false</transparent>
+  <width/>
+  <marked>false</marked>
+  <xfill>false</xfill>
+  <animation>0</animation>
+  <name>via.label 5/1@1</name>
+  <source>5/1@1</source>
+ </properties>
+ <properties>
+  <frame-color>#80a8ff</frame-color>
+  <fill-color>#80a8ff</fill-color>
+  <frame-brightness>0</frame-brightness>
+  <fill-brightness>0</fill-brightness>
+  <dither-pattern>I9</dither-pattern>
+  <line-style/>
+  <valid>true</valid>
+  <visible>true</visible>
+  <transparent>false</transparent>
+  <width/>
+  <marked>false</marked>
+  <xfill>false</xfill>
+  <animation>0</animation>
+  <name>via.blockage 5/3@1</name>
+  <source>5/3@1</source>
+ </properties>
+ <properties>
+  <frame-color>#ff0080</frame-color>
+  <fill-color>#ff0080</fill-color>
+  <frame-brightness>0</frame-brightness>
+  <fill-brightness>0</fill-brightness>
+  <dither-pattern>I5</dither-pattern>
+  <line-style/>
+  <valid>true</valid>
+  <visible>true</visible>
+  <transparent>false</transparent>
+  <width/>
+  <marked>false</marked>
+  <xfill>false</xfill>
+  <animation>0</animation>
+  <name>via2.blockage 7/3@1</name>
+  <source>7/3@1</source>
+ </properties>
+ <properties>
+  <frame-color>#8000ff</frame-color>
+  <fill-color>#8000ff</fill-color>
+  <frame-brightness>0</frame-brightness>
+  <fill-brightness>0</fill-brightness>
+  <dither-pattern>I9</dither-pattern>
+  <line-style/>
+  <valid>true</valid>
+  <visible>true</visible>
+  <transparent>false</transparent>
+  <width/>
+  <marked>false</marked>
+  <xfill>false</xfill>
+  <animation>0</animation>
+  <name>via3.label 9/1@1</name>
+  <source>9/1@1</source>
+ </properties>
+ <properties>
+  <frame-color>#8000ff</frame-color>
+  <fill-color>#8000ff</fill-color>
+  <frame-brightness>0</frame-brightness>
+  <fill-brightness>0</fill-brightness>
+  <dither-pattern>I5</dither-pattern>
+  <line-style/>
+  <valid>true</valid>
+  <visible>true</visible>
+  <transparent>false</transparent>
+  <width/>
+  <marked>false</marked>
+  <xfill>false</xfill>
+  <animation>0</animation>
+  <name>via3.blockage 9/3@1</name>
+  <source>9/3@1</source>
+ </properties>
+ <properties>
+  <frame-color>#0080ff</frame-color>
+  <fill-color>#0080ff</fill-color>
+  <frame-brightness>0</frame-brightness>
+  <fill-brightness>0</fill-brightness>
+  <dither-pattern>I9</dither-pattern>
+  <line-style/>
+  <valid>true</valid>
+  <visible>true</visible>
+  <transparent>false</transparent>
+  <width/>
+  <marked>false</marked>
+  <xfill>false</xfill>
+  <animation>0</animation>
+  <name>via4.label 11/1@1</name>
+  <source>11/1@1</source>
+ </properties>
+ <properties>
+  <frame-color>#0080ff</frame-color>
+  <fill-color>#0080ff</fill-color>
+  <frame-brightness>0</frame-brightness>
+  <fill-brightness>0</fill-brightness>
+  <dither-pattern>I5</dither-pattern>
+  <line-style/>
+  <valid>true</valid>
+  <visible>true</visible>
+  <transparent>false</transparent>
+  <width/>
+  <marked>false</marked>
+  <xfill>false</xfill>
+  <animation>0</animation>
+  <name>via4.blockage 11/3@1</name>
+  <source>11/3@1</source>
+ </properties>
+ <properties>
+  <frame-color>#800057</frame-color>
+  <fill-color>#800057</fill-color>
+  <frame-brightness>0</frame-brightness>
+  <fill-brightness>0</fill-brightness>
+  <dither-pattern>I9</dither-pattern>
+  <line-style/>
+  <valid>true</valid>
+  <visible>true</visible>
+  <transparent>false</transparent>
+  <width/>
+  <marked>false</marked>
+  <xfill>false</xfill>
+  <animation>0</animation>
+  <name>rdlcon.drawing 13/0@1</name>
+  <source>13/0@1</source>
+ </properties>
+ <properties>
+  <frame-color>#0080ff</frame-color>
+  <fill-color>#0080ff</fill-color>
+  <frame-brightness>0</frame-brightness>
+  <fill-brightness>0</fill-brightness>
+  <dither-pattern>I5</dither-pattern>
+  <line-style/>
+  <valid>true</valid>
+  <visible>true</visible>
+  <transparent>false</transparent>
+  <width/>
+  <marked>false</marked>
+  <xfill>false</xfill>
+  <animation>0</animation>
+  <name>marker.error 83/6@1</name>
+  <source>83/6@1</source>
+ </properties>
+ <properties>
+  <frame-color>#0080ff</frame-color>
+  <fill-color>#0080ff</fill-color>
+  <frame-brightness>0</frame-brightness>
+  <fill-brightness>0</fill-brightness>
+  <dither-pattern>I9</dither-pattern>
+  <line-style/>
+  <valid>true</valid>
+  <visible>true</visible>
+  <transparent>false</transparent>
+  <width/>
+  <marked>false</marked>
+  <xfill>false</xfill>
+  <animation>0</animation>
+  <name>marker.warning 83/7@1</name>
+  <source>83/7@1</source>
+ </properties>
+ <properties>
+  <frame-color>#0080ff</frame-color>
+  <fill-color>#0080ff</fill-color>
+  <frame-brightness>0</frame-brightness>
+  <fill-brightness>0</fill-brightness>
+  <dither-pattern>C0</dither-pattern>
+  <line-style/>
+  <valid>true</valid>
+  <visible>true</visible>
+  <transparent>false</transparent>
+  <width/>
+  <marked>false</marked>
+  <xfill>false</xfill>
+  <animation>0</animation>
+  <name>text.drawing 83/44@1</name>
+  <source>83/44@1</source>
+ </properties>
+ <properties>
+  <frame-color>#008080</frame-color>
+  <fill-color>#008080</fill-color>
+  <frame-brightness>0</frame-brightness>
+  <fill-brightness>0</fill-brightness>
+  <dither-pattern>I9</dither-pattern>
+  <line-style/>
+  <valid>true</valid>
+  <visible>true</visible>
+  <transparent>false</transparent>
+  <width/>
+  <marked>false</marked>
+  <xfill>false</xfill>
+  <animation>0</animation>
+  <name>crrpm.mask 102/0@1</name>
+  <source>102/0@1</source>
+ </properties>
+ <properties>
+  <frame-color>#008080</frame-color>
+  <fill-color>#008080</fill-color>
+  <frame-brightness>0</frame-brightness>
+  <fill-brightness>0</fill-brightness>
+  <dither-pattern>I5</dither-pattern>
+  <line-style/>
+  <valid>true</valid>
+  <visible>true</visible>
+  <transparent>false</transparent>
+  <width/>
+  <marked>false</marked>
+  <xfill>false</xfill>
+  <animation>0</animation>
+  <name>rrpm.drawing 102/20@1</name>
+  <source>102/20@1</source>
+ </properties>
+ <properties>
+  <frame-color>#80ff8d</frame-color>
+  <fill-color>#80ff8d</fill-color>
+  <frame-brightness>0</frame-brightness>
+  <fill-brightness>0</fill-brightness>
+  <dither-pattern>C0</dither-pattern>
+  <line-style/>
+  <valid>true</valid>
+  <visible>true</visible>
+  <transparent>false</transparent>
+  <width/>
+  <marked>false</marked>
+  <xfill>false</xfill>
+  <animation>0</animation>
+  <name>prBoundary.drawing 235/0@1</name>
+  <source>235/0@1</source>
+ </properties>
+ <properties>
+  <frame-color>#ffae00</frame-color>
+  <fill-color>#ffae00</fill-color>
+  <frame-brightness>0</frame-brightness>
+  <fill-brightness>0</fill-brightness>
+  <dither-pattern>C0</dither-pattern>
+  <line-style/>
+  <valid>true</valid>
+  <visible>true</visible>
+  <transparent>false</transparent>
+  <width/>
+  <marked>false</marked>
+  <xfill>false</xfill>
+  <animation>0</animation>
+  <name>OUTLINE 236/0@1</name>
+  <source>236/0@1</source>
+ </properties>
+ <name>GDS</name>
  <custom-dither-pattern>
   <pattern>
    <line>................</line>
diff --git a/sky130/klayout/sky130.lyt b/sky130/klayout/sky130.lyt
index 09b916f..af38c8f 100644
--- a/sky130/klayout/sky130.lyt
+++ b/sky130/klayout/sky130.lyt
@@ -2,128 +2,115 @@
 <technology>
  <name>TECHNAME</name>
  <description>TECHNAME-metals</description>
+ <dbu>0.001</dbu>
  <layer-properties_file>TECHNAME.lyp</layer-properties_file>
  <add-other-layers>true</add-other-layers>
- <layer-map>
-'66/15 : PY_SHORT	';
-'72/15 : M5_SHORT	';
-'81/14 : LDID	';
-'122/16 :PWELL_PIN	';
-'64/5  : NWELLLABEL	';
-'64/16 : NWELLPT ';
-'64/59 : PWELLLABEL	';
-'64/20 : NWELL	';
-'64/18 : DNWELL ';
-'65/20 : DIFF	';
-'65/44 : TAP	';
-'125/44 : LVTN	';
-'78/44 : HVTP	';
-'75/20 : HVI	';
-'80/20 : TUNM	';
-'66/20 : POLY	';
-'95/20 : NPC	';
-'94/20 : PSDM	';
-'93/44 : NSDM	';
-'66/44 : LICON1 ';
-'67/20 : LI1	';
-'67/16 : LI1T	';
-'67/5  : LI1P	';
-'67/44 : MCON	';
-'68/20 : MET1	';
-'68/16 : MET1T  ';
-'68/5  : MET1P  ';
-'68/44 : VIA1	';
-'69/20 : MET2	';
-'69/16 : MET2T  ';
-'69/5  : MET2P  ';
-'69/44 : VIA2	';
-'70/20 : MET3	';
-'70/16 : MET3T  ';
-'70/5  : MET3P  ';
-'70/44 : VIA3	';
-'71/20 : MET4	';
-'71/16 : MET4T  ';
-'71/5  : MET4P  ';
-'71/44 : VIA4	';
-'72/20 : MET5	';
-'72/16 : MET5T  ';
-'72/5  : MET5P  ';
-'76/20 : PAD	';
-'76/16 : PADT	';
-'76/5  : PADP	';
-'81/4  : BOUND  ';
-'83/44 : TEXT	';
-'18/20 : HVTR	';
-'92/44 : NCM	';
-'86/20 : RPM	';
-'61/20 : NSM	';
-'74/20 : RDL	';
-'74/21 : VHVI	';
-'11/44 : LDNTM  ';
-'125/20 : HVNTM  ';
-'85/44 : PMM	';
-'82/44 : PNP	';
-'82/64 : CAP	';
-'82/24 : IND	';
-'64/13 : PWRES  ';
-'66/13 : POLYRES';
-'65/13 : DIFFRES';
-'81/23 : DIODE  ';
-</layer-map>
- <create-other-layers>true</create-other-layers>
- <lef-def-import>
-  <read-all-layers>true</read-all-layers>
-  <layer-map/>
-  <produce-net-names>true</produce-net-names>
-  <net-property-name>#1</net-property-name>
-  <produce-cell-outlines>true</produce-cell-outlines>
-  <cell-outline-layer>OUTLINE</cell-outline-layer>
-  <produce-placement-blockages>true</produce-placement-blockages>
-  <placement-blockage-layer>PLACEMENT_BLK</placement-blockage-layer>
-  <produce-via-geometry>true</produce-via-geometry>
-  <via-geometry-suffix/>
-  <via-geometry-datatype>0</via-geometry-datatype>
-  <produce-pins>true</produce-pins>
-  <pins-suffix>.PIN</pins-suffix>
-  <pins-datatype>2</pins-datatype>
-  <produce-obstructions>true</produce-obstructions>
-  <obstructions-suffix>.OBS</obstructions-suffix>
-  <obstructions-datatype>3</obstructions-datatype>
-  <produce-blockages>true</produce-blockages>
-  <blockages-suffix>.BLK</blockages-suffix>
-  <blockages-datatype>4</blockages-datatype>
-  <produce-labels>true</produce-labels>
-  <labels-suffix>.LABEL</labels-suffix>
-  <labels-datatype>1</labels-datatype>
-  <produce-routing>true</produce-routing>
-  <routing-suffix/>
-  <routing-datatype>0</routing-datatype>
- </lef-def-import>
+ <reader-options>
+  <gds2>
+   <box-mode>1</box-mode>
+   <allow-big-records>true</allow-big-records>
+   <allow-multi-xy-records>true</allow-multi-xy-records>
+  </gds2>
+  <common>
+   <create-other-layers>true</create-other-layers>
+   <layer-map>layer_map()</layer-map>
+   <enable-properties>true</enable-properties>
+   <enable-text-objects>true</enable-text-objects>
+  </common>
+  <lefdef>
+   <read-all-layers>true</read-all-layers>
+   <layer-map>layer_map('areaid.analog : 81/79';'areaid.core : 81/2';'areaid.critCorner : 81/51';'areaid.critSid : 81/52';'areaid.deadZon : 81/50';'areaid.dieCut : 81/11';'areaid.diode : 81/23';'areaid.esd : 81/19';'areaid.etest : 81/101';'areaid.extendedDrain : 81/57';'areaid.frame : 81/3';'areaid.frameRect : 81/12';'areaid.hvnwell : 81/63';'areaid.injection : 81/17';'areaid.lowTapDensity : 81/14';'areaid.lvNative : 81/60';'areaid.moduleCut : 81/10';'areaid.notCritSide : 81/15';'areaid.opcDrop : 81/54';'areaid.photo : 81/81';'areaid.rdlprobepad : 81/27';'areaid.rfdiode : 81/125';'areaid.seal : 81/1';'areaid.sigPadDiff : 81/6';'areaid.sigPadMetNtr : 81/8';'areaid.sigPadWell : 81/7';'areaid.standardc : 81/4';'areaid.substrateCut : 81/53';'areaid.waffleWindow : 81/13';'blanking.drawing : 124/40';'bump.drawing : 127/22';'capacitor.drawing : 82/64';'cbump.mask : 101/0';'cctm1.drawing : 101/44';'cctm1.mask : 35/0';'cctm1.maskAdd : 101/43';'cctm1.maskDrop : 101/42';'ccu1m.mask : 93/0';'cdnm.drawing : 110/20';'cdnm.mask : 48/0';'cdnm.maskAdd : 110/21';'cdnm.maskDrop : 110/22';'cfom.drawing : 22/20';'cfom.mask : 23/0';'cfom.maskAdd : 22/21';'cfom.maskDrop : 22/22';'cfom.waffleDrop : 22/24';'chvntm.drawing : 38/20';'chvntm.mask : 39/0';'chvntm.maskAdd : 38/21';'chvntm.maskDrop : 38/22';'chvtpm.drawing : 88/44';'chvtpm.mask : 97/0';'chvtpm.maskAdd : 97/43';'chvtpm.maskDrop : 97/42';'chvtrm.drawing : 98/44';'chvtrm.mask : 98/0';'chvtrm.maskAdd : 98/43';'chvtrm.maskDrop : 98/42';'cldntm.drawing : 11/20';'cldntm.mask : 11/0';'cli1m.drawing : 115/44';'cli1m.mask : 56/0';'cli1m.maskAdd : 115/43';'cli1m.maskDrop : 115/42';'clicm1.drawing : 106/44';'clicm1.mask : 43/0';'clicm1.maskAdd : 106/43';'clicm1.maskDrop : 106/42';'clvom.drawing : 45/20';'clvom.mask : 46/0';'clvom.maskAdd : 45/21';'clvom.maskDrop : 45/22';'clvtnm.drawing : 25/44';'clvtnm.mask : 25/0';'clvtnm.maskAdd : 25/43';'clvtnm.maskDrop : 25/42';'cmm1.drawing : 62/20';'cmm1.mask : 36/0';'cmm1.maskAdd : 62/21';'cmm1.maskDrop : 62/22';'cmm1.waffleDrop : 62/24';'cmm2.drawing : 105/44';'cmm2.mask : 41/0';'cmm2.maskAdd : 105/43';'cmm2.maskDrop : 105/42';'cmm2.waffleDrop : 105/52';'cmm3.drawing : 107/20';'cmm3.mask : 34/0';'cmm3.maskAdd : 107/21';'cmm3.maskDrop : 107/22';'cmm3.waffleDrop : 107/24';'cmm4.mask : 51/0';'cmm4.maskAdd : 112/43';'cmm4.maskDrop : 112/42';'cmm4.waffleDrop : 112/4';'cmm5.mask : 59/0';'cmm5.waffleDrop : 117/4';'cncm.drawing : 96/44';'cncm.mask : 17/0';'cnpc.drawing : 44/20';'cnpc.mask : 49/0';'cnpc.maskAdd : 44/43';'cnpc.maskDrop : 44/42';'cnsdm.drawing : 29/20';'cnsdm.mask : 30/0';'cnsdm.maskAdd : 29/21';'cnsdm.maskDrop : 29/22';'cnsm.mask : 22/0';'cntm.drawing : 26/20';'cntm.mask : 27/0';'cntm.maskAdd : 26/21';'cntm.maskDrop : 26/22';'cnwm.drawing : 109/44';'cnwm.mask : 21/0';'cnwm.maskAdd : 109/43';'cnwm.maskDrop : 109/42';'conom.drawing : 87/44';'conom.mask : 88/0';'conom.maskAdd : 87/43';'conom.maskDrop : 87/42';'cp1m.drawing : 33/44';'cp1m.mask : 28/0';'cp1m.maskAdd : 33/43';'cp1m.maskDrop : 33/42';'cp1m.waffleDrop : 33/24';'cpbo.mask : 99/0';'cpdm.drawing : 104/44';'cpdm.mask : 37/0';'cpdm.maskAdd : 104/43';'cpdm.maskDrop : 104/42';'cpmm2.mask : 94/0';'cpmm.drawing : 91/44';'cpsdm.drawing : 31/20';'cpsdm.mask : 32/0';'cpsdm.maskAdd : 31/21';'cpsdm.maskDrop : 31/22';'crpm.drawing : 53/44';'crpm.mask : 96/0';'crpm.maskAdd : 53/43';'crpm.maskDrop : 53/42';'crrpm.mask : 102/0';'ctunm.drawing : 96/20';'ctunm.mask : 20/0';'ctunm.maskAdd : 96/21';'ctunm.maskDrop : 96/22';'cubm.mask : 100/0';'cviam2.drawing : 108/20';'cviam2.mask : 44/0';'cviam2.maskAdd : 108/21';'cviam2.maskDrop : 108/22';'cviam3.drawing : 112/20';'cviam3.mask : 50/0';'cviam3.maskAdd : 112/21';'cviam3.maskDrop : 112/22';'cviam4.drawing : 117/20';'cviam4.mask : 58/0';'cviam4.maskAdd : 117/21';'cviam4.maskDrop : 117/22';'cviam.drawing : 105/20';'cviam.mask : 40/0';'cviam.maskAdd : 105/21';'cviam.maskDrop : 105/22';'diff.boundary : 65/4';'diff.cut : 65/14';'diff.drawing : 65/20';'diff.hv : 65/8';'diff.label : 65/6';'diff.net : 65/23';'diff.pin : 65/16';'diff.res : 65/13';'dnwell.drawing : 64/18';'fom.dummy : 22/23';'hvi.drawing : 75/20';'hvntm.drawing : 125/20';'hvtp.drawing : 78/44';'hvtr.drawing : 18/20';'inductor.drawing : 82/24';'inductor.label : 82/25';'inductor.term1 : 82/26';'inductor.term2 : 82/27';'inductor.term3 : 82/28';'ldntm.drawing : 11/44';'li1.blockage : 67/10';'li1.boundary : 67/4';'li1.cut : 67/14';'li1.drawing : 67/20';'li1.label : 67/5';'li1.net : 67/23';'li1.pin : 67/16';'li1.probe : 67/25';'li1.res : 67/13';'li1.short : 67/15';'licon1.boundary : 66/60';'licon1.drawing : 66/44';'licon1.net : 66/41';'licon1.pin : 66/58';'lvtn.drawing : 125/44';'marker.error : 83/6';'marker.warning : 83/7';'mcon.boundary : 67/60';'mcon.drawing : 67/44';'mcon.blockage : 67/44';'mcon.net : 67/41';'mcon.pin : 67/48';'met1.blockage : 68/10';'met1.boundary : 68/4';'met1.cut : 68/14';'met1.drawing : 68/20';'met1.label : 68/5';'met1.net : 68/23';'met1.option1 : 68/32';'met1.option2 : 68/33';'met1.option3 : 68/34';'met1.option4 : 68/35';'met1.option5 : 68/36';'met1.option6 : 68/37';'met1.option7 : 68/38';'met1.option8 : 68/39';'met1.pin : 68/16';'met1.probe : 68/25';'met1.psa1 : 68/88';'met1.psa2 : 68/89';'met1.psa3 : 68/90';'met1.psa4 : 68/91';'met1.psa5 : 68/92';'met1.psa6 : 68/93';'met1.res : 68/13';'met1.short : 68/15';'met2.blockage : 69/10';'met2.boundary : 69/4';'met2.cut : 69/14';'met2.drawing : 69/20';'met2.label : 69/5';'met2.net : 69/23';'met2.option1 : 69/32';'met2.option2 : 69/33';'met2.option3 : 69/34';'met2.option4 : 69/35';'met2.option5 : 69/36';'met2.option6 : 69/37';'met2.option7 : 69/38';'met2.option8 : 69/39';'met2.pin : 69/16';'met2.probe : 69/25';'met2.psa1 : 69/88';'met2.psa2 : 69/89';'met2.psa3 : 69/90';'met2.psa4 : 69/91';'met2.psa5 : 69/92';'met2.psa6 : 69/93';'met2.res : 69/13';'met2.short : 69/15';'met3.blockage : 70/10';'met3.boundary : 70/4';'met3.cut : 70/14';'met3.drawing : 70/20';'met3.fuse : 70/17';'met3.label : 70/5';'met3.net : 70/23';'met3.option1 : 70/32';'met3.option2 : 70/33';'met3.option3 : 70/34';'met3.option4 : 70/35';'met3.option5 : 70/36';'met3.option6 : 70/37';'met3.option7 : 70/38';'met3.option8 : 70/39';'met3.pin : 70/16';'met3.probe : 70/25';'met3.psa1 : 70/88';'met3.psa2 : 70/89';'met3.psa3 : 70/90';'met3.psa4 : 70/91';'met3.psa5 : 70/92';'met3.psa6 : 70/93';'met3.res : 70/13';'met3.short : 70/15';'met4.blockage : 71/10';'met4.boundary : 71/4';'met4.cut : 71/14';'met4.drawing : 71/20';'met4.fuse : 71/17';'met4.label : 71/5';'met4.net : 71/23';'met4.option1 : 71/32';'met4.option2 : 71/33';'met4.option3 : 71/34';'met4.option4 : 71/35';'met4.option5 : 71/36';'met4.option6 : 71/37';'met4.option7 : 71/38';'met4.option8 : 71/39';'met4.pin : 71/16';'met4.probe : 71/25';'met4.psa1 : 71/88';'met4.psa2 : 71/89';'met4.psa3 : 71/90';'met4.psa4 : 71/91';'met4.psa5 : 71/92';'met4.psa6 : 71/93';'met4.res : 71/13';'met4.short : 71/15';'met5.blockage : 72/10';'met5.boundary : 72/4';'met5.cut : 72/14';'met5.drawing : 72/20';'met5.fuse : 72/17';'met5.label : 72/5';'met5.net : 72/23';'met5.option1 : 72/32';'met5.option2 : 72/33';'met5.option3 : 72/34';'met5.option4 : 72/35';'met5.option5 : 72/36';'met5.option6 : 72/37';'met5.option7 : 72/38';'met5.option8 : 72/39';'met5.pin : 72/16';'met5.probe : 72/25';'met5.psa1 : 72/88';'met5.psa2 : 72/89';'met5.psa3 : 72/90';'met5.psa4 : 72/91';'met5.psa5 : 72/92';'met5.psa6 : 72/93';'met5.res : 72/13';'met5.short : 72/15';'ncm.drawing : 92/44';'npc.drawing : 95/20';'npn.drawing : 82/20';'npn.label : 82/5';'nsdm.drawing : 93/44';'nsm.drawing : 61/20';'nwell.drawing : 64/20';'nwell.label : 64/5';'nwell.net : 84/23';'nwell.pin : 64/16';'overlap.boundary : 90/4';'overlap.drawing : 90/20';'pad.drawing : 76/20';'pad.label : 76/5';'pad.pin : 76/16';'padCenter.drawing : 81/20';'pmm2.drawing : 77/20';'pmm.drawing : 85/44';'pnp.drawing : 82/44';'pnp.label : 82/59';'poly.boundary : 66/4';'poly.cut : 66/14';'poly.drawing : 66/20';'poly.gate : 66/9';'poly.label : 66/5';'poly.model : 66/83';'poly.net : 66/23';'poly.pin : 66/16';'poly.probe : 66/25';'poly.res : 66/13';'poly.short : 66/15';'prBoundary.boundary : 235/4';'prBoundary.drawing : 235/0';'prune.drawing : 84/44';'psdm.drawing : 94/20';'pwell.cut : 64/14';'pwell.drawing : 64/44';'pwell.label : 64/59';'pwell.pin : 122/16';'pwell.res : 64/13';'pwelliso.label : 44/5';'pwelliso.pin : 44/16';'rdl.cut : 74/14';'rdl.drawing : 74/20';'rdl.label : 74/5';'rdl.option1 : 89/32';'rdl.option2 : 89/33';'rdl.option3 : 89/34';'rdl.option4 : 89/35';'rdl.option5 : 89/36';'rdl.option6 : 89/37';'rdl.option7 : 89/38';'rdl.option8 : 89/39';'rdl.pin : 74/16';'rdl.psa1 : 74/88';'rdl.psa2 : 74/89';'rdl.psa3 : 74/90';'rdl.psa4 : 74/91';'rdl.psa5 : 74/92';'rdl.psa6 : 74/93';'rdl.res : 74/13';'rdl.short : 74/15';'rpm.drawing : 86/20';'rrpm.drawing : 102/20';'tap.boundary : 65/60';'tap.drawing : 65/44';'tap.label : 65/5';'tap.net : 65/41';'tap.pin : 65/48';'target.drawing : 76/44';'text.drawing : 83/44';'tunm.drawing : 80/20';'ubm.drawing : 127/21';'vhvi.drawing : 74/21';'via2.boundary : 69/60';'via2.drawing : 69/44';'via2.net : 69/41';'via2.pin : 69/58';'via3.boundary : 70/60';'via3.drawing : 70/44';'via3.net : 70/41';'via3.pin : 70/48';'via4.boundary : 71/60';'via4.drawing : 71/44';'via4.net : 71/41';'via4.pin : 71/48';'via.boundary : 68/60';'via.drawing : 68/44';'via.net : 68/41';'via.pin : 68/58')</layer-map>
+   <dbu>0.001</dbu>
+   <produce-net-names>true</produce-net-names>
+   <net-property-name>#1</net-property-name>
+   <produce-inst-names>true</produce-inst-names>
+   <inst-property-name>#1</inst-property-name>
+   <produce-cell-outlines>true</produce-cell-outlines>
+   <cell-outline-layer>OUTLINE</cell-outline-layer>
+   <produce-placement-blockages>true</produce-placement-blockages>
+   <placement-blockage-layer>PLACEMENT_BLK</placement-blockage-layer>
+   <produce-regions>true</produce-regions>
+   <region-layer>REGIONS</region-layer>
+   <produce-via-geometry>true</produce-via-geometry>
+   <via-geometry-suffix>.drawing</via-geometry-suffix>
+   <via-geometry-datatype>0</via-geometry-datatype>
+   <produce-pins>true</produce-pins>
+   <pins-suffix>.pin</pins-suffix>
+   <pins-datatype>2</pins-datatype>
+   <produce-obstructions>true</produce-obstructions>
+   <obstructions-suffix>.blockage</obstructions-suffix>
+   <obstructions-datatype>3</obstructions-datatype>
+   <produce-blockages>true</produce-blockages>
+   <blockages-suffix>.blockage</blockages-suffix>
+   <blockages-datatype>4</blockages-datatype>
+   <produce-labels>true</produce-labels>
+   <labels-suffix>.label</labels-suffix>
+   <labels-datatype>1</labels-datatype>
+   <produce-routing>true</produce-routing>
+   <routing-suffix>.drawing</routing-suffix>
+   <routing-datatype>0</routing-datatype>
+  </lefdef>
+  <dxf>
+   <dbu>0.001</dbu>
+   <unit>1</unit>
+   <text-scaling>100</text-scaling>
+   <circle-points>100</circle-points>
+   <circle-accuracy>0</circle-accuracy>
+   <contour-accuracy>0</contour-accuracy>
+   <polyline-mode>0</polyline-mode>
+   <render-texts-as-polygons>false</render-texts-as-polygons>
+   <keep-other-cells>false</keep-other-cells>
+   <keep-layer-names>false</keep-layer-names>
+   <create-other-layers>true</create-other-layers>
+   <layer-map>layer_map()</layer-map>
+  </dxf>
+  <cif>
+   <wire-mode>0</wire-mode>
+   <dbu>0.001</dbu>
+   <layer-map>layer_map()</layer-map>
+   <create-other-layers>true</create-other-layers>
+   <keep-layer-names>false</keep-layer-names>
+  </cif>
+ </reader-options>
+ <writer-options>
+  <gds2>
+   <write-timestamps>true</write-timestamps>
+   <write-cell-properties>false</write-cell-properties>
+   <write-file-properties>false</write-file-properties>
+   <no-zero-length-paths>false</no-zero-length-paths>
+   <multi-xy-records>false</multi-xy-records>
+   <max-vertex-count>8000</max-vertex-count>
+   <max-cellname-length>32000</max-cellname-length>
+   <libname>LIB</libname>
+  </gds2>
+  <oasis>
+   <compression-level>2</compression-level>
+   <write-cblocks>false</write-cblocks>
+   <strict-mode>false</strict-mode>
+   <write-std-properties>1</write-std-properties>
+   <subst-char>*</subst-char>
+   <permissive>false</permissive>
+  </oasis>
+  <cif>
+   <polygon-mode>0</polygon-mode>
+  </cif>
+  <cif>
+   <dummy-calls>false</dummy-calls>
+   <blank-separator>false</blank-separator>
+  </cif>
+ </writer-options>
  <connectivity>
-  <connection>LI1,LICON1,SRCDRN</connection>
-  <connection>LI1,LICON1,POLY</connection>
-  <connection>MET1,MCON,LI1</connection>
-  <connection>MET1,VIA1,MET2</connection>
-  <connection>MET2,VIA2,MET3</connection>
-  <connection>MET3,VIA3,MET4</connection>
-  <connection>MET4,VIA4,MET5</connection>
-  <connection>LI1,LICON1,NWP</connection>
-  <symbols>SRCDRN='DIFF-POLY'</symbols>
-  <symbols>PTAP='TAP'</symbols>
-  <symbols>NWP='TAP+NWELL'</symbols>
-  <symbols>DIFF='65/20'</symbols>
-  <symbols>POLY='66/20'</symbols>
-  <symbols>LICON1='66/44'</symbols>
-  <symbols>LI1='67/20'</symbols>
-  <symbols>MCON='67/44'</symbols>
-  <symbols>MET1='68/20'</symbols>
-  <symbols>VIA1='68/44'</symbols>
-  <symbols>MET2='69/20'</symbols>
-  <symbols>VIA2='69/44'</symbols>
-  <symbols>MET3='70/20'</symbols>
-  <symbols>VIA3='70/44'</symbols>
-  <symbols>MET4='71/20'</symbols>
-  <symbols>VIA4='71/44'</symbols>
-  <symbols>MET5='72/20'</symbols>
+  <connection>66/20,66/44,li</connection>
+  <connection>li,67/44,met1</connection>
+  <connection>met1,68/44,met2</connection>
+  <connection>met2,69/44,met3</connection>
+  <connection>met3,70/44,met4</connection>
+  <connection>met4,71/44,met5</connection>
+  <symbols>li='67/20+67/5'</symbols>
+  <symbols>met1='68/20+68/5'</symbols>
+  <symbols>met2='69/20+69/5'</symbols>
+  <symbols>met3='70/20+70/5'</symbols>
+  <symbols>met4='71/20+71/5'</symbols>
+  <symbols>met5='72/20+72/5'</symbols>
  </connectivity>
 </technology>