Index: ref/arc_angles.dsn
===================================================================
--- ref/arc_angles.dsn	(revision 16943)
+++ ref/arc_angles.dsn	(revision 16944)
@@ -7,16 +7,16 @@
   )
   (resolution mm 1000000)
   (structure
-    (layer "comp1"
+    (layer "3__top_copper"
       (type signal)
     )
-    (layer "inner1"
+    (layer "5__Intern"
       (type signal)
     )
-    (layer "inner2"
+    (layer "7__Intern"
       (type signal)
     )
-    (layer "solder1"
+    (layer "10__bottom_copper"
       (type signal)
     )
     (boundary
@@ -35,10 +35,6 @@
   (placement
   )
   (library
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
-      (attach off)
-    )
   )
   (network
     (class geda_default
Index: ref/arc_f_clear.dsn
===================================================================
--- ref/arc_f_clear.dsn	(revision 16943)
+++ ref/arc_f_clear.dsn	(revision 16944)
@@ -7,16 +7,16 @@
   )
   (resolution mm 1000000)
   (structure
-    (layer "comp1"
+    (layer "3__top_copper"
       (type signal)
     )
-    (layer "inner1"
+    (layer "5__Intern"
       (type signal)
     )
-    (layer "inner2"
+    (layer "7__Intern"
       (type signal)
     )
-    (layer "solder1"
+    (layer "10__bottom_copper"
       (type signal)
     )
     (boundary
@@ -35,10 +35,6 @@
   (placement
   )
   (library
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
-      (attach off)
-    )
   )
   (network
     (class geda_default
Index: ref/arc_normal.dsn
===================================================================
--- ref/arc_normal.dsn	(revision 16943)
+++ ref/arc_normal.dsn	(revision 16944)
@@ -7,16 +7,16 @@
   )
   (resolution mm 1000000)
   (structure
-    (layer "comp1"
+    (layer "3__top_copper"
       (type signal)
     )
-    (layer "inner1"
+    (layer "5__Intern"
       (type signal)
     )
-    (layer "inner2"
+    (layer "7__Intern"
       (type signal)
     )
-    (layer "solder1"
+    (layer "10__bottom_copper"
       (type signal)
     )
     (boundary
@@ -35,10 +35,6 @@
   (placement
   )
   (library
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
-      (attach off)
-    )
   )
   (network
     (class geda_default
Index: ref/arc_offpage.dsn
===================================================================
--- ref/arc_offpage.dsn	(revision 16943)
+++ ref/arc_offpage.dsn	(revision 16944)
@@ -7,16 +7,16 @@
   )
   (resolution mm 1000000)
   (structure
-    (layer "comp1"
+    (layer "3__top_copper"
       (type signal)
     )
-    (layer "inner1"
+    (layer "5__Intern"
       (type signal)
     )
-    (layer "inner2"
+    (layer "7__Intern"
       (type signal)
     )
-    (layer "solder1"
+    (layer "10__bottom_copper"
       (type signal)
     )
     (boundary
@@ -35,10 +35,6 @@
   (placement
   )
   (library
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
-      (attach off)
-    )
   )
   (network
     (class geda_default
Index: ref/arc_sizes.dsn
===================================================================
--- ref/arc_sizes.dsn	(revision 16943)
+++ ref/arc_sizes.dsn	(revision 16944)
@@ -7,16 +7,16 @@
   )
   (resolution mm 1000000)
   (structure
-    (layer "comp1"
+    (layer "3__top_copper"
       (type signal)
     )
-    (layer "inner1"
+    (layer "5__Intern"
       (type signal)
     )
-    (layer "inner2"
+    (layer "7__Intern"
       (type signal)
     )
-    (layer "solder1"
+    (layer "10__bottom_copper"
       (type signal)
     )
     (boundary
@@ -35,10 +35,6 @@
   (placement
   )
   (library
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
-      (attach off)
-    )
   )
   (network
     (class geda_default
Index: ref/comp1.dsn
===================================================================
--- ref/comp1.dsn	(revision 16943)
+++ ref/comp1.dsn	(revision 16944)
@@ -7,16 +7,16 @@
   )
   (resolution mm 1000000)
   (structure
-    (layer "comp1"
+    (layer "3__top_copper"
       (type signal)
     )
-    (layer "inner1"
+    (layer "5__Intern"
       (type signal)
     )
-    (layer "inner2"
+    (layer "7__Intern"
       (type signal)
     )
-    (layer "solder1"
+    (layer "10__bottom_copper"
       (type signal)
     )
     (boundary
@@ -38,10 +38,6 @@
     )
   )
   (library
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
-      (attach off)
-    )
   )
   (network
     (class geda_default
@@ -52,9 +48,9 @@
     )
   )
     (wiring
-        (wire (path comp1 0.508000 0.635000 8.890000 12.065000 8.890000)
+        (wire (path 3__top_copper 0.508000 0.635000 8.890000 12.065000 8.890000)
             (type protect))
-        (wire (path solder1 0.508000 0.635000 9.525000 12.065000 9.525000)
+        (wire (path 10__bottom_copper 0.508000 0.635000 9.525000 12.065000 9.525000)
             (type protect))
 
     )
Index: ref/coord_rounding.dsn
===================================================================
--- ref/coord_rounding.dsn	(revision 16943)
+++ ref/coord_rounding.dsn	(revision 16944)
@@ -7,16 +7,16 @@
   )
   (resolution mm 1000000)
   (structure
-    (layer "comp1"
+    (layer "3__top_copper"
       (type signal)
     )
-    (layer "inner1"
+    (layer "5__Intern"
       (type signal)
     )
-    (layer "inner2"
+    (layer "7__Intern"
       (type signal)
     )
-    (layer "solder1"
+    (layer "10__bottom_copper"
       (type signal)
     )
     (boundary
@@ -35,10 +35,6 @@
   (placement
   )
   (library
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
-      (attach off)
-    )
   )
   (network
     (class geda_default
@@ -49,9 +45,9 @@
     )
   )
     (wiring
-        (wire (path comp1 1.000000 6.000000 6.600000 6.110000 6.589000)
+        (wire (path 3__top_copper 1.000000 6.000000 6.600000 6.110000 6.589000)
             (type protect))
-        (wire (path comp1 1.000000 6.111100 6.588890 6.111111 6.589000)
+        (wire (path 3__top_copper 1.000000 6.111100 6.588890 6.111111 6.589000)
             (type protect))
 
     )
Index: ref/elem_pads.dsn
===================================================================
--- ref/elem_pads.dsn	(revision 16943)
+++ ref/elem_pads.dsn	(revision 16944)
@@ -7,16 +7,16 @@
   )
   (resolution mm 1000000)
   (structure
-    (layer "comp1"
+    (layer "3__top_copper"
       (type signal)
     )
-    (layer "inner1"
+    (layer "5__Intern"
       (type signal)
     )
-    (layer "inner2"
+    (layer "7__Intern"
       (type signal)
     )
-    (layer "solder1"
+    (layer "10__bottom_copper"
       (type signal)
     )
     (boundary
@@ -52,13 +52,9 @@
       (pin Pstk_shape_32 "4" 0.660400 1.778000)
       (pin Pstk_shape_33 "5" 0.000000 1.778000)
     )
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
-      (attach off)
-    )
     (padstack Pstk_shape_7
       (shape
-        (polygon "comp1" 0
+        (polygon "3__top_copper" 0
         0.649986 0.949960 -0.649986 0.949960 -0.649986 -0.949960
         0.649986 -0.949960
         )
@@ -67,7 +63,7 @@
     )
     (padstack Pstk_shape_8
       (shape
-        (polygon "comp1" 0
+        (polygon "3__top_copper" 0
         0.649986 0.949960 -0.649986 0.949960 -0.649986 -0.949960
         0.649986 -0.949960
         )
@@ -76,7 +72,7 @@
     )
     (padstack Pstk_shape_29
       (shape
-        (polygon "comp1" 0
+        (polygon "3__top_copper" 0
         0.190500 0.444500 -0.190500 0.444500 -0.190500 -0.444500
         0.190500 -0.444500
         )
@@ -85,7 +81,7 @@
     )
     (padstack Pstk_shape_30
       (shape
-        (polygon "comp1" 0
+        (polygon "3__top_copper" 0
         0.190500 0.444500 -0.190500 0.444500 -0.190500 -0.444500
         0.190500 -0.444500
         )
@@ -94,7 +90,7 @@
     )
     (padstack Pstk_shape_31
       (shape
-        (polygon "comp1" 0
+        (polygon "3__top_copper" 0
         0.190500 0.444500 -0.190500 0.444500 -0.190500 -0.444500
         0.190500 -0.444500
         )
@@ -103,7 +99,7 @@
     )
     (padstack Pstk_shape_32
       (shape
-        (polygon "comp1" 0
+        (polygon "3__top_copper" 0
         0.190500 0.444500 -0.190500 0.444500 -0.190500 -0.444500
         0.190500 -0.444500
         )
@@ -112,7 +108,7 @@
     )
     (padstack Pstk_shape_33
       (shape
-        (polygon "comp1" 0
+        (polygon "3__top_copper" 0
         0.190500 0.444500 -0.190500 0.444500 -0.190500 -0.444500
         0.190500 -0.444500
         )
Index: ref/elem_pads_ds.dsn
===================================================================
--- ref/elem_pads_ds.dsn	(revision 16943)
+++ ref/elem_pads_ds.dsn	(revision 16944)
@@ -7,16 +7,16 @@
   )
   (resolution mm 1000000)
   (structure
-    (layer "comp1"
+    (layer "3__top_copper"
       (type signal)
     )
-    (layer "inner1"
+    (layer "5__Intern"
       (type signal)
     )
-    (layer "inner2"
+    (layer "7__Intern"
       (type signal)
     )
-    (layer "solder1"
+    (layer "10__bottom_copper"
       (type signal)
     )
     (boundary
@@ -42,13 +42,9 @@
       (pin Pstk_shape_7 "1" 0.952500 0.000000)
       (pin Pstk_shape_8 "2" 2.540000 -1.587500)
     )
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
-      (attach off)
-    )
     (padstack Pstk_shape_7
       (shape
-        (polygon "comp1" 0
+        (polygon "3__top_copper" 0
         -1.079500 -0.127000 -1.079500 0.127000 1.079500 0.127000
         1.079500 -0.127000
         )
@@ -57,7 +53,7 @@
     )
     (padstack Pstk_shape_8
       (shape
-        (polygon "solder1" 0
+        (polygon "10__bottom_copper" 0
         -0.127000 1.079500 0.127000 1.079500 0.127000 -1.079500
         -0.127000 -1.079500
         )
Index: ref/elem_pins.dsn
===================================================================
--- ref/elem_pins.dsn	(revision 16943)
+++ ref/elem_pins.dsn	(revision 16944)
@@ -7,16 +7,16 @@
   )
   (resolution mm 1000000)
   (structure
-    (layer "comp1"
+    (layer "3__top_copper"
       (type signal)
     )
-    (layer "inner1"
+    (layer "5__Intern"
       (type signal)
     )
-    (layer "inner2"
+    (layer "7__Intern"
       (type signal)
     )
-    (layer "solder1"
+    (layer "10__bottom_copper"
       (type signal)
     )
     (boundary
@@ -49,25 +49,21 @@
       (pin Pstk_shape_39 "1" 0.000000 0.000000)
       (pin Pstk_shape_40 "2" 7.620000 0.000000)
     )
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
-      (attach off)
-    )
     (padstack Pstk_shape_7
       (shape
-        (polygon "comp1" 0
+        (polygon "3__top_copper" 0
         -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
         -1.016000 -1.016000
         )
-        (polygon "inner1" 0
+        (polygon "5__Intern" 0
         -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
         -1.016000 -1.016000
         )
-        (polygon "inner2" 0
+        (polygon "7__Intern" 0
         -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
         -1.016000 -1.016000
         )
-        (polygon "solder1" 0
+        (polygon "10__bottom_copper" 0
         -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
         -1.016000 -1.016000
         )
@@ -76,31 +72,31 @@
     )
     (padstack Pstk_shape_8
       (shape
-        (circle "comp1" 2.032000)
-        (circle "inner1" 2.032000)
-        (circle "inner2" 2.032000)
-        (circle "solder1" 2.032000)
+        (circle "3__top_copper" 2.032000)
+        (circle "5__Intern" 2.032000)
+        (circle "7__Intern" 2.032000)
+        (circle "10__bottom_copper" 2.032000)
       )
       (attach off)
     )
     (padstack Pstk_shape_39
       (shape
-        (polygon "comp1" 0
+        (polygon "3__top_copper" 0
         2.032000 0.420841 0.841682 1.016000 -0.420841 1.016000
         -1.016000 0.420841 -1.016000 -0.420841 -0.420841 -1.016000
         0.841682 -1.016000 2.032000 -0.420841
         )
-        (polygon "inner1" 0
+        (polygon "5__Intern" 0
         2.032000 0.420841 0.841682 1.016000 -0.420841 1.016000
         -1.016000 0.420841 -1.016000 -0.420841 -0.420841 -1.016000
         0.841682 -1.016000 2.032000 -0.420841
         )
-        (polygon "inner2" 0
+        (polygon "7__Intern" 0
         2.032000 0.420841 0.841682 1.016000 -0.420841 1.016000
         -1.016000 0.420841 -1.016000 -0.420841 -0.420841 -1.016000
         0.841682 -1.016000 2.032000 -0.420841
         )
-        (polygon "solder1" 0
+        (polygon "10__bottom_copper" 0
         2.032000 0.420841 0.841682 1.016000 -0.420841 1.016000
         -1.016000 0.420841 -1.016000 -0.420841 -0.420841 -1.016000
         0.841682 -1.016000 2.032000 -0.420841
@@ -110,22 +106,22 @@
     )
     (padstack Pstk_shape_40
       (shape
-        (polygon "comp1" 0
+        (polygon "3__top_copper" 0
         2.032000 0.841682 0.841682 2.032000 -0.841682 2.032000
         -2.032000 0.841682 -2.032000 -0.420841 -0.841682 -1.016000
         0.841682 -1.016000 2.032000 -0.420841
         )
-        (polygon "inner1" 0
+        (polygon "5__Intern" 0
         2.032000 0.841682 0.841682 2.032000 -0.841682 2.032000
         -2.032000 0.841682 -2.032000 -0.420841 -0.841682 -1.016000
         0.841682 -1.016000 2.032000 -0.420841
         )
-        (polygon "inner2" 0
+        (polygon "7__Intern" 0
         2.032000 0.841682 0.841682 2.032000 -0.841682 2.032000
         -2.032000 0.841682 -2.032000 -0.420841 -0.841682 -1.016000
         0.841682 -1.016000 2.032000 -0.420841
         )
-        (polygon "solder1" 0
+        (polygon "10__bottom_copper" 0
         2.032000 0.841682 0.841682 2.032000 -0.841682 2.032000
         -2.032000 0.841682 -2.032000 -0.420841 -0.841682 -1.016000
         0.841682 -1.016000 2.032000 -0.420841
Index: ref/elem_sides_smd.dsn
===================================================================
--- ref/elem_sides_smd.dsn	(revision 16943)
+++ ref/elem_sides_smd.dsn	(revision 16944)
@@ -7,16 +7,16 @@
   )
   (resolution mm 1000000)
   (structure
-    (layer "comp1"
+    (layer "3__top_copper"
       (type signal)
     )
-    (layer "inner1"
+    (layer "5__Intern"
       (type signal)
     )
-    (layer "inner2"
+    (layer "7__Intern"
       (type signal)
     )
-    (layer "solder1"
+    (layer "10__bottom_copper"
       (type signal)
     )
     (boundary
@@ -49,13 +49,9 @@
       (pin Pstk_shape_29 "1" 1.499870 0.000000)
       (pin Pstk_shape_30 "2" -1.499870 0.000000)
     )
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
-      (attach off)
-    )
     (padstack Pstk_shape_7
       (shape
-        (polygon "comp1" 0
+        (polygon "3__top_copper" 0
         0.649986 0.949960 -0.649986 0.949960 -0.649986 -0.949960
         0.649986 -0.949960
         )
@@ -64,7 +60,7 @@
     )
     (padstack Pstk_shape_8
       (shape
-        (polygon "comp1" 0
+        (polygon "3__top_copper" 0
         0.649986 0.949960 -0.649986 0.949960 -0.649986 -0.949960
         0.649986 -0.949960
         )
@@ -73,7 +69,7 @@
     )
     (padstack Pstk_shape_29
       (shape
-        (polygon "comp1" 0
+        (polygon "10__bottom_copper" 0
         0.649986 0.949960 -0.649986 0.949960 -0.649986 -0.949960
         0.649986 -0.949960
         )
@@ -82,7 +78,7 @@
     )
     (padstack Pstk_shape_30
       (shape
-        (polygon "comp1" 0
+        (polygon "10__bottom_copper" 0
         0.649986 0.949960 -0.649986 0.949960 -0.649986 -0.949960
         0.649986 -0.949960
         )
Index: ref/elem_sides_trh.dsn
===================================================================
--- ref/elem_sides_trh.dsn	(revision 16943)
+++ ref/elem_sides_trh.dsn	(revision 16944)
@@ -7,16 +7,16 @@
   )
   (resolution mm 1000000)
   (structure
-    (layer "comp1"
+    (layer "3__top_copper"
       (type signal)
     )
-    (layer "inner1"
+    (layer "5__Intern"
       (type signal)
     )
-    (layer "inner2"
+    (layer "7__Intern"
       (type signal)
     )
-    (layer "solder1"
+    (layer "10__bottom_copper"
       (type signal)
     )
     (boundary
@@ -49,25 +49,21 @@
       (pin Pstk_shape_39 "1" 0.000000 0.000000)
       (pin Pstk_shape_40 "2" -7.620000 0.000000)
     )
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
-      (attach off)
-    )
     (padstack Pstk_shape_7
       (shape
-        (polygon "comp1" 0
+        (polygon "3__top_copper" 0
         -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
         -1.016000 -1.016000
         )
-        (polygon "inner1" 0
+        (polygon "5__Intern" 0
         -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
         -1.016000 -1.016000
         )
-        (polygon "inner2" 0
+        (polygon "7__Intern" 0
         -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
         -1.016000 -1.016000
         )
-        (polygon "solder1" 0
+        (polygon "10__bottom_copper" 0
         -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
         -1.016000 -1.016000
         )
@@ -76,28 +72,28 @@
     )
     (padstack Pstk_shape_8
       (shape
-        (circle "comp1" 2.032000)
-        (circle "inner1" 2.032000)
-        (circle "inner2" 2.032000)
-        (circle "solder1" 2.032000)
+        (circle "3__top_copper" 2.032000)
+        (circle "5__Intern" 2.032000)
+        (circle "7__Intern" 2.032000)
+        (circle "10__bottom_copper" 2.032000)
       )
       (attach off)
     )
     (padstack Pstk_shape_39
       (shape
-        (polygon "solder1" 0
+        (polygon "3__top_copper" 0
         1.016000 -1.016000 -1.016000 -1.016000 -1.016000 1.016000
         1.016000 1.016000
         )
-        (polygon "outline" 0
+        (polygon "5__Intern" 0
         1.016000 -1.016000 -1.016000 -1.016000 -1.016000 1.016000
         1.016000 1.016000
         )
-        (polygon "inner2" 0
+        (polygon "7__Intern" 0
         1.016000 -1.016000 -1.016000 -1.016000 -1.016000 1.016000
         1.016000 1.016000
         )
-        (polygon "comp1" 0
+        (polygon "10__bottom_copper" 0
         1.016000 -1.016000 -1.016000 -1.016000 -1.016000 1.016000
         1.016000 1.016000
         )
@@ -106,10 +102,10 @@
     )
     (padstack Pstk_shape_40
       (shape
-        (circle "solder1" 2.032000)
-        (circle "outline" 2.032000)
-        (circle "inner2" 2.032000)
-        (circle "comp1" 2.032000)
+        (circle "3__top_copper" 2.032000)
+        (circle "5__Intern" 2.032000)
+        (circle "7__Intern" 2.032000)
+        (circle "10__bottom_copper" 2.032000)
       )
       (attach off)
     )
Index: ref/layer_copper.dsn
===================================================================
--- ref/layer_copper.dsn	(revision 16943)
+++ ref/layer_copper.dsn	(revision 16944)
@@ -7,16 +7,16 @@
   )
   (resolution mm 1000000)
   (structure
-    (layer "comp1"
+    (layer "3__top_copper"
       (type signal)
     )
-    (layer "inner1"
+    (layer "5__Intern"
       (type signal)
     )
-    (layer "inner2"
+    (layer "7__Intern"
       (type signal)
     )
-    (layer "solder1"
+    (layer "10__bottom_copper"
       (type signal)
     )
     (boundary
@@ -35,10 +35,6 @@
   (placement
   )
   (library
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
-      (attach off)
-    )
   )
   (network
     (class geda_default
@@ -49,11 +45,11 @@
     )
   )
     (wiring
-        (wire (path comp1 0.254000 1.270000 10.795000 1.270000 3.810000)
+        (wire (path 3__top_copper 0.254000 1.270000 10.795000 1.270000 3.810000)
             (type protect))
-        (wire (path inner1 0.254000 2.540000 8.890000 8.255000 3.175000)
+        (wire (path 5__Intern 0.254000 2.540000 8.890000 8.255000 3.175000)
             (type protect))
-        (wire (path solder1 0.254000 1.905000 10.795000 10.160000 10.795000)
+        (wire (path 10__bottom_copper 0.254000 1.905000 10.795000 10.160000 10.795000)
             (type protect))
 
     )
Index: ref/layer_outline.dsn
===================================================================
--- ref/layer_outline.dsn	(revision 16943)
+++ ref/layer_outline.dsn	(revision 16944)
@@ -7,16 +7,16 @@
   )
   (resolution mm 1000000)
   (structure
-    (layer "comp1"
+    (layer "3__top_copper"
       (type signal)
     )
-    (layer "inner1"
+    (layer "5__Intern"
       (type signal)
     )
-    (layer "inner2"
+    (layer "7__Intern"
       (type signal)
     )
-    (layer "solder1"
+    (layer "10__bottom_copper"
       (type signal)
     )
     (boundary
@@ -35,10 +35,6 @@
   (placement
   )
   (library
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
-      (attach off)
-    )
   )
   (network
     (class geda_default
@@ -49,12 +45,6 @@
     )
   )
     (wiring
-        (wire (path outline 0.254000 1.905000 10.160000 1.905000 2.540000)
-            (type protect))
-        (wire (path outline 0.254000 1.905000 2.540000 9.525000 2.540000)
-            (type protect))
-        (wire (path outline 0.254000 9.525000 2.540000 1.905000 10.160000)
-            (type protect))
 
     )
 )
Index: ref/layer_silk.dsn
===================================================================
--- ref/layer_silk.dsn	(revision 16943)
+++ ref/layer_silk.dsn	(revision 16944)
@@ -7,16 +7,16 @@
   )
   (resolution mm 1000000)
   (structure
-    (layer "comp1"
+    (layer "3__top_copper"
       (type signal)
     )
-    (layer "inner1"
+    (layer "5__Intern"
       (type signal)
     )
-    (layer "inner2"
+    (layer "7__Intern"
       (type signal)
     )
-    (layer "solder1"
+    (layer "10__bottom_copper"
       (type signal)
     )
     (boundary
@@ -35,10 +35,6 @@
   (placement
   )
   (library
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
-      (attach off)
-    )
   )
   (network
     (class geda_default
Index: ref/line_f_clear.dsn
===================================================================
--- ref/line_f_clear.dsn	(revision 16943)
+++ ref/line_f_clear.dsn	(revision 16944)
@@ -7,16 +7,16 @@
   )
   (resolution mm 1000000)
   (structure
-    (layer "comp1"
+    (layer "3__top_copper"
       (type signal)
     )
-    (layer "inner1"
+    (layer "5__Intern"
       (type signal)
     )
-    (layer "inner2"
+    (layer "7__Intern"
       (type signal)
     )
-    (layer "solder1"
+    (layer "10__bottom_copper"
       (type signal)
     )
     (boundary
@@ -35,10 +35,6 @@
   (placement
   )
   (library
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
-      (attach off)
-    )
   )
   (network
     (class geda_default
@@ -49,13 +45,13 @@
     )
   )
     (wiring
-        (wire (path comp1 0.381000 3.175000 6.350000 10.160000 6.350000)
+        (wire (path 3__top_copper 0.381000 3.175000 6.350000 10.160000 6.350000)
             (type protect))
-        (wire (path comp1 0.254000 6.350000 9.525000 6.350000 3.175000)
+        (wire (path 3__top_copper 0.254000 6.350000 9.525000 6.350000 3.175000)
             (type protect))
-        (wire (path comp1 0.508000 6.350000 6.350000 10.160000 7.620000)
+        (wire (path 3__top_copper 0.508000 6.350000 6.350000 10.160000 7.620000)
             (type protect))
-        (wire (path comp1 0.127000 6.350000 6.350000 3.810000 8.890000)
+        (wire (path 3__top_copper 0.127000 6.350000 6.350000 3.810000 8.890000)
             (type protect))
 
     )
Index: ref/line_normal.dsn
===================================================================
--- ref/line_normal.dsn	(revision 16943)
+++ ref/line_normal.dsn	(revision 16944)
@@ -7,16 +7,16 @@
   )
   (resolution mm 1000000)
   (structure
-    (layer "comp1"
+    (layer "3__top_copper"
       (type signal)
     )
-    (layer "inner1"
+    (layer "5__Intern"
       (type signal)
     )
-    (layer "inner2"
+    (layer "7__Intern"
       (type signal)
     )
-    (layer "solder1"
+    (layer "10__bottom_copper"
       (type signal)
     )
     (boundary
@@ -35,10 +35,6 @@
   (placement
   )
   (library
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
-      (attach off)
-    )
   )
   (network
     (class geda_default
@@ -49,13 +45,13 @@
     )
   )
     (wiring
-        (wire (path comp1 0.381000 3.175000 6.350000 10.160000 6.350000)
+        (wire (path 3__top_copper 0.381000 3.175000 6.350000 10.160000 6.350000)
             (type protect))
-        (wire (path comp1 0.254000 6.350000 9.525000 6.350000 3.175000)
+        (wire (path 3__top_copper 0.254000 6.350000 9.525000 6.350000 3.175000)
             (type protect))
-        (wire (path comp1 0.508000 6.350000 6.350000 10.160000 7.620000)
+        (wire (path 3__top_copper 0.508000 6.350000 6.350000 10.160000 7.620000)
             (type protect))
-        (wire (path comp1 0.127000 6.350000 6.350000 3.810000 8.890000)
+        (wire (path 3__top_copper 0.127000 6.350000 6.350000 3.810000 8.890000)
             (type protect))
 
     )
Index: ref/line_offpage.dsn
===================================================================
--- ref/line_offpage.dsn	(revision 16943)
+++ ref/line_offpage.dsn	(revision 16944)
@@ -7,16 +7,16 @@
   )
   (resolution mm 1000000)
   (structure
-    (layer "comp1"
+    (layer "3__top_copper"
       (type signal)
     )
-    (layer "inner1"
+    (layer "5__Intern"
       (type signal)
     )
-    (layer "inner2"
+    (layer "7__Intern"
       (type signal)
     )
-    (layer "solder1"
+    (layer "10__bottom_copper"
       (type signal)
     )
     (boundary
@@ -35,10 +35,6 @@
   (placement
   )
   (library
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
-      (attach off)
-    )
   )
   (network
     (class geda_default
@@ -49,7 +45,7 @@
     )
   )
     (wiring
-        (wire (path comp1 0.254000 2.540000 7.620000 15.240000 7.620000)
+        (wire (path 3__top_copper 0.254000 2.540000 7.620000 15.240000 7.620000)
             (type protect))
 
     )
Index: ref/line_overlap1.dsn
===================================================================
--- ref/line_overlap1.dsn	(revision 16943)
+++ ref/line_overlap1.dsn	(revision 16944)
@@ -7,16 +7,16 @@
   )
   (resolution mm 1000000)
   (structure
-    (layer "comp1"
+    (layer "3__top_copper"
       (type signal)
     )
-    (layer "inner1"
+    (layer "5__Intern"
       (type signal)
     )
-    (layer "inner2"
+    (layer "7__Intern"
       (type signal)
     )
-    (layer "solder1"
+    (layer "10__bottom_copper"
       (type signal)
     )
     (boundary
@@ -35,10 +35,6 @@
   (placement
   )
   (library
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
-      (attach off)
-    )
   )
   (network
     (class geda_default
@@ -49,9 +45,9 @@
     )
   )
     (wiring
-        (wire (path comp1 0.381000 5.080000 7.620000 6.350000 7.620000)
+        (wire (path 3__top_copper 0.381000 5.080000 7.620000 6.350000 7.620000)
             (type protect))
-        (wire (path comp1 0.381000 5.588000 7.620000 7.620000 7.620000)
+        (wire (path 3__top_copper 0.381000 5.588000 7.620000 7.620000 7.620000)
             (type protect))
 
     )
Index: ref/line_overlap2.dsn
===================================================================
--- ref/line_overlap2.dsn	(revision 16943)
+++ ref/line_overlap2.dsn	(revision 16944)
@@ -7,16 +7,16 @@
   )
   (resolution mm 1000000)
   (structure
-    (layer "comp1"
+    (layer "3__top_copper"
       (type signal)
     )
-    (layer "inner1"
+    (layer "5__Intern"
       (type signal)
     )
-    (layer "inner2"
+    (layer "7__Intern"
       (type signal)
     )
-    (layer "solder1"
+    (layer "10__bottom_copper"
       (type signal)
     )
     (boundary
@@ -35,10 +35,6 @@
   (placement
   )
   (library
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
-      (attach off)
-    )
   )
   (network
     (class geda_default
@@ -49,9 +45,9 @@
     )
   )
     (wiring
-        (wire (path comp1 0.381000 5.080000 7.620000 8.890000 7.620000)
+        (wire (path 3__top_copper 0.381000 5.080000 7.620000 8.890000 7.620000)
             (type protect))
-        (wire (path comp1 0.381000 5.588000 7.620000 7.620000 7.620000)
+        (wire (path 3__top_copper 0.381000 5.588000 7.620000 7.620000 7.620000)
             (type protect))
 
     )
Index: ref/line_overlap3.dsn
===================================================================
--- ref/line_overlap3.dsn	(revision 16943)
+++ ref/line_overlap3.dsn	(revision 16944)
@@ -7,16 +7,16 @@
   )
   (resolution mm 1000000)
   (structure
-    (layer "comp1"
+    (layer "3__top_copper"
       (type signal)
     )
-    (layer "inner1"
+    (layer "5__Intern"
       (type signal)
     )
-    (layer "inner2"
+    (layer "7__Intern"
       (type signal)
     )
-    (layer "solder1"
+    (layer "10__bottom_copper"
       (type signal)
     )
     (boundary
@@ -35,10 +35,6 @@
   (placement
   )
   (library
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
-      (attach off)
-    )
   )
   (network
     (class geda_default
@@ -49,9 +45,9 @@
     )
   )
     (wiring
-        (wire (path comp1 0.381000 5.080000 7.620000 8.890000 7.620000)
+        (wire (path 3__top_copper 0.381000 5.080000 7.620000 8.890000 7.620000)
             (type protect))
-        (wire (path comp1 0.381000 5.080000 7.620000 8.890000 7.620000)
+        (wire (path 3__top_copper 0.381000 5.080000 7.620000 8.890000 7.620000)
             (type protect))
 
     )
Index: ref/line_overlap4.dsn
===================================================================
--- ref/line_overlap4.dsn	(revision 16943)
+++ ref/line_overlap4.dsn	(revision 16944)
@@ -7,16 +7,16 @@
   )
   (resolution mm 1000000)
   (structure
-    (layer "comp1"
+    (layer "3__top_copper"
       (type signal)
     )
-    (layer "inner1"
+    (layer "5__Intern"
       (type signal)
     )
-    (layer "inner2"
+    (layer "7__Intern"
       (type signal)
     )
-    (layer "solder1"
+    (layer "10__bottom_copper"
       (type signal)
     )
     (boundary
@@ -35,10 +35,6 @@
   (placement
   )
   (library
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
-      (attach off)
-    )
   )
   (network
     (class geda_default
@@ -49,9 +45,9 @@
     )
   )
     (wiring
-        (wire (path comp1 0.127000 5.080000 7.620000 8.890000 7.620000)
+        (wire (path 3__top_copper 0.127000 5.080000 7.620000 8.890000 7.620000)
             (type protect))
-        (wire (path comp1 0.381000 5.080000 7.620000 8.890000 7.620000)
+        (wire (path 3__top_copper 0.381000 5.080000 7.620000 8.890000 7.620000)
             (type protect))
 
     )
Index: ref/line_zerolen.dsn
===================================================================
--- ref/line_zerolen.dsn	(revision 16943)
+++ ref/line_zerolen.dsn	(revision 16944)
@@ -7,16 +7,16 @@
   )
   (resolution mm 1000000)
   (structure
-    (layer "comp1"
+    (layer "3__top_copper"
       (type signal)
     )
-    (layer "inner1"
+    (layer "5__Intern"
       (type signal)
     )
-    (layer "inner2"
+    (layer "7__Intern"
       (type signal)
     )
-    (layer "solder1"
+    (layer "10__bottom_copper"
       (type signal)
     )
     (boundary
@@ -35,10 +35,6 @@
   (placement
   )
   (library
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
-      (attach off)
-    )
   )
   (network
     (class geda_default
@@ -49,7 +45,7 @@
     )
   )
     (wiring
-        (wire (path comp1 0.381000 5.080000 7.620000 5.080000 7.620000)
+        (wire (path 3__top_copper 0.381000 5.080000 7.620000 5.080000 7.620000)
             (type protect))
 
     )
Index: ref/netlist.dsn
===================================================================
--- ref/netlist.dsn	(revision 16943)
+++ ref/netlist.dsn	(revision 16944)
@@ -7,16 +7,16 @@
   )
   (resolution mm 1000000)
   (structure
-    (layer "comp1"
+    (layer "3__top_copper"
       (type signal)
     )
-    (layer "inner1"
+    (layer "5__Intern"
       (type signal)
     )
-    (layer "inner2"
+    (layer "7__Intern"
       (type signal)
     )
-    (layer "solder1"
+    (layer "10__bottom_copper"
       (type signal)
     )
     (boundary
@@ -44,25 +44,21 @@
       (pin Pstk_shape_9 "2" 0.000000 -2.540000)
       (pin Pstk_shape_10 "3" 7.620000 -2.540000)
     )
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
-      (attach off)
-    )
     (padstack Pstk_shape_7
       (shape
-        (polygon "comp1" 0
+        (polygon "3__top_copper" 0
         -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
         -1.016000 -1.016000
         )
-        (polygon "inner1" 0
+        (polygon "5__Intern" 0
         -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
         -1.016000 -1.016000
         )
-        (polygon "inner2" 0
+        (polygon "7__Intern" 0
         -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
         -1.016000 -1.016000
         )
-        (polygon "solder1" 0
+        (polygon "10__bottom_copper" 0
         -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
         -1.016000 -1.016000
         )
@@ -71,28 +67,28 @@
     )
     (padstack Pstk_shape_8
       (shape
-        (circle "comp1" 2.032000)
-        (circle "inner1" 2.032000)
-        (circle "inner2" 2.032000)
-        (circle "solder1" 2.032000)
+        (circle "3__top_copper" 2.032000)
+        (circle "5__Intern" 2.032000)
+        (circle "7__Intern" 2.032000)
+        (circle "10__bottom_copper" 2.032000)
       )
       (attach off)
     )
     (padstack Pstk_shape_9
       (shape
-        (circle "comp1" 2.032000)
-        (circle "inner1" 2.032000)
-        (circle "inner2" 2.032000)
-        (circle "solder1" 2.032000)
+        (circle "3__top_copper" 2.032000)
+        (circle "5__Intern" 2.032000)
+        (circle "7__Intern" 2.032000)
+        (circle "10__bottom_copper" 2.032000)
       )
       (attach off)
     )
     (padstack Pstk_shape_10
       (shape
-        (circle "comp1" 2.032000)
-        (circle "inner1" 2.032000)
-        (circle "inner2" 2.032000)
-        (circle "solder1" 2.032000)
+        (circle "3__top_copper" 2.032000)
+        (circle "5__Intern" 2.032000)
+        (circle "7__Intern" 2.032000)
+        (circle "10__bottom_copper" 2.032000)
       )
       (attach off)
     )
Index: ref/netlist_ba.dsn
===================================================================
--- ref/netlist_ba.dsn	(revision 16943)
+++ ref/netlist_ba.dsn	(revision 16944)
@@ -7,16 +7,16 @@
   )
   (resolution mm 1000000)
   (structure
-    (layer "comp1"
+    (layer "3__top_copper"
       (type signal)
     )
-    (layer "inner1"
+    (layer "5__Intern"
       (type signal)
     )
-    (layer "inner2"
+    (layer "7__Intern"
       (type signal)
     )
-    (layer "solder1"
+    (layer "10__bottom_copper"
       (type signal)
     )
     (boundary
@@ -44,25 +44,21 @@
       (pin Pstk_shape_9 "2" 0.000000 -2.540000)
       (pin Pstk_shape_10 "3" 7.620000 -2.540000)
     )
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
-      (attach off)
-    )
     (padstack Pstk_shape_7
       (shape
-        (polygon "comp1" 0
+        (polygon "3__top_copper" 0
         -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
         -1.016000 -1.016000
         )
-        (polygon "inner1" 0
+        (polygon "5__Intern" 0
         -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
         -1.016000 -1.016000
         )
-        (polygon "inner2" 0
+        (polygon "7__Intern" 0
         -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
         -1.016000 -1.016000
         )
-        (polygon "solder1" 0
+        (polygon "10__bottom_copper" 0
         -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
         -1.016000 -1.016000
         )
@@ -71,28 +67,28 @@
     )
     (padstack Pstk_shape_8
       (shape
-        (circle "comp1" 2.032000)
-        (circle "inner1" 2.032000)
-        (circle "inner2" 2.032000)
-        (circle "solder1" 2.032000)
+        (circle "3__top_copper" 2.032000)
+        (circle "5__Intern" 2.032000)
+        (circle "7__Intern" 2.032000)
+        (circle "10__bottom_copper" 2.032000)
       )
       (attach off)
     )
     (padstack Pstk_shape_9
       (shape
-        (circle "comp1" 2.032000)
-        (circle "inner1" 2.032000)
-        (circle "inner2" 2.032000)
-        (circle "solder1" 2.032000)
+        (circle "3__top_copper" 2.032000)
+        (circle "5__Intern" 2.032000)
+        (circle "7__Intern" 2.032000)
+        (circle "10__bottom_copper" 2.032000)
       )
       (attach off)
     )
     (padstack Pstk_shape_10
       (shape
-        (circle "comp1" 2.032000)
-        (circle "inner1" 2.032000)
-        (circle "inner2" 2.032000)
-        (circle "solder1" 2.032000)
+        (circle "3__top_copper" 2.032000)
+        (circle "5__Intern" 2.032000)
+        (circle "7__Intern" 2.032000)
+        (circle "10__bottom_copper" 2.032000)
       )
       (attach off)
     )
Index: ref/padrot.dsn
===================================================================
--- ref/padrot.dsn	(revision 16943)
+++ ref/padrot.dsn	(revision 16944)
@@ -7,16 +7,16 @@
   )
   (resolution mm 1000000)
   (structure
-    (layer "comp1"
+    (layer "3__top_copper"
       (type signal)
     )
-    (layer "inner1"
+    (layer "5__Intern"
       (type signal)
     )
-    (layer "inner2"
+    (layer "7__Intern"
       (type signal)
     )
-    (layer "solder1"
+    (layer "10__bottom_copper"
       (type signal)
     )
     (boundary
@@ -83,13 +83,9 @@
     (image 194
       (pin Pstk_shape_196 "1" 0.881761 -0.360172)
     )
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
-      (attach off)
-    )
     (padstack Pstk_shape_7
       (shape
-        (polygon "comp1" 0
+        (polygon "3__top_copper" 0
         -1.079500 -0.127000 -1.079500 0.127000 1.079500 0.127000
         1.079500 -0.127000
         )
@@ -98,7 +94,7 @@
     )
     (padstack Pstk_shape_34
       (shape
-        (polygon "comp1" 0
+        (polygon "3__top_copper" 0
         -0.127000 1.079500 0.127000 1.079500 0.127000 -1.079500
         -0.127000 -1.079500
         )
@@ -107,7 +103,7 @@
     )
     (padstack Pstk_shape_61
       (shape
-        (polygon "comp1" 0
+        (polygon "3__top_copper" 0
         -1.079499 0.126999 -1.079499 -0.126999 1.079499 -0.126999
         1.079499 0.126999
         )
@@ -116,7 +112,7 @@
     )
     (padstack Pstk_shape_88
       (shape
-        (polygon "comp1" 0
+        (polygon "3__top_copper" 0
         0.126999 1.079499 -0.126999 1.079499 -0.126999 -1.079499
         0.126999 -1.079499
         )
@@ -125,7 +121,7 @@
     )
     (padstack Pstk_shape_115
       (shape
-        (polygon "comp1" 0
+        (polygon "3__top_copper" 0
         -0.853086 0.673481 -0.673481 0.853086 0.853086 -0.673481
         0.673481 -0.853086
         )
@@ -134,7 +130,7 @@
     )
     (padstack Pstk_shape_142
       (shape
-        (polygon "comp1" 0
+        (polygon "3__top_copper" 0
         -0.673481 0.853085 -0.853085 0.673481 0.673481 -0.853085
         0.853085 -0.673481
         )
@@ -143,7 +139,7 @@
     )
     (padstack Pstk_shape_169
       (shape
-        (polygon "comp1" 0
+        (polygon "3__top_copper" 0
         -1.047355 0.290626 -0.951307 0.525766 1.047355 -0.290626
         0.951307 -0.525766
         )
@@ -152,7 +148,7 @@
     )
     (padstack Pstk_shape_196
       (shape
-        (polygon "comp1" 0
+        (polygon "3__top_copper" 0
         -0.951308 0.525765 -1.047354 0.290625 0.951308 -0.525765
         1.047354 -0.290625
         )
Index: ref/padstack.dsn
===================================================================
--- ref/padstack.dsn	(revision 16943)
+++ ref/padstack.dsn	(revision 16944)
@@ -7,16 +7,16 @@
   )
   (resolution mm 1000000)
   (structure
-    (layer "comp1"
+    (layer "3__top_copper"
       (type signal)
     )
-    (layer "inner1"
+    (layer "5__Intern"
       (type signal)
     )
-    (layer "inner2"
+    (layer "7__Intern"
       (type signal)
     )
-    (layer "solder1"
+    (layer "10__bottom_copper"
       (type signal)
     )
     (boundary
@@ -47,10 +47,6 @@
     )
   )
   (library
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
-      (attach off)
-    )
   )
   (network
     (class geda_default
Index: ref/poly_hole.dsn
===================================================================
--- ref/poly_hole.dsn	(revision 16943)
+++ ref/poly_hole.dsn	(revision 16944)
@@ -7,16 +7,16 @@
   )
   (resolution mm 1000000)
   (structure
-    (layer "comp1"
+    (layer "3__top_copper"
       (type signal)
     )
-    (layer "inner1"
+    (layer "5__Intern"
       (type signal)
     )
-    (layer "inner2"
+    (layer "7__Intern"
       (type signal)
     )
-    (layer "solder1"
+    (layer "10__bottom_copper"
       (type signal)
     )
     (boundary
@@ -35,10 +35,6 @@
   (placement
   )
   (library
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
-      (attach off)
-    )
   )
   (network
     (class geda_default
Index: ref/poly_rect.dsn
===================================================================
--- ref/poly_rect.dsn	(revision 16943)
+++ ref/poly_rect.dsn	(revision 16944)
@@ -7,16 +7,16 @@
   )
   (resolution mm 1000000)
   (structure
-    (layer "comp1"
+    (layer "3__top_copper"
       (type signal)
     )
-    (layer "inner1"
+    (layer "5__Intern"
       (type signal)
     )
-    (layer "inner2"
+    (layer "7__Intern"
       (type signal)
     )
-    (layer "solder1"
+    (layer "10__bottom_copper"
       (type signal)
     )
     (boundary
@@ -35,10 +35,6 @@
   (placement
   )
   (library
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
-      (attach off)
-    )
   )
   (network
     (class geda_default
Index: ref/poly_triangle.dsn
===================================================================
--- ref/poly_triangle.dsn	(revision 16943)
+++ ref/poly_triangle.dsn	(revision 16944)
@@ -7,16 +7,16 @@
   )
   (resolution mm 1000000)
   (structure
-    (layer "comp1"
+    (layer "3__top_copper"
       (type signal)
     )
-    (layer "inner1"
+    (layer "5__Intern"
       (type signal)
     )
-    (layer "inner2"
+    (layer "7__Intern"
       (type signal)
     )
-    (layer "solder1"
+    (layer "10__bottom_copper"
       (type signal)
     )
     (boundary
@@ -35,10 +35,6 @@
   (placement
   )
   (library
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
-      (attach off)
-    )
   )
   (network
     (class geda_default
Index: ref/text_rot.dsn
===================================================================
--- ref/text_rot.dsn	(revision 16943)
+++ ref/text_rot.dsn	(revision 16944)
@@ -7,16 +7,16 @@
   )
   (resolution mm 1000000)
   (structure
-    (layer "comp1"
+    (layer "3__top_copper"
       (type signal)
     )
-    (layer "inner1"
+    (layer "5__Intern"
       (type signal)
     )
-    (layer "inner2"
+    (layer "7__Intern"
       (type signal)
     )
-    (layer "solder1"
+    (layer "10__bottom_copper"
       (type signal)
     )
     (boundary
@@ -35,10 +35,6 @@
   (placement
   )
   (library
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
-      (attach off)
-    )
   )
   (network
     (class geda_default
Index: ref/text_scale.dsn
===================================================================
--- ref/text_scale.dsn	(revision 16943)
+++ ref/text_scale.dsn	(revision 16944)
@@ -7,16 +7,16 @@
   )
   (resolution mm 1000000)
   (structure
-    (layer "comp1"
+    (layer "3__top_copper"
       (type signal)
     )
-    (layer "inner1"
+    (layer "5__Intern"
       (type signal)
     )
-    (layer "inner2"
+    (layer "7__Intern"
       (type signal)
     )
-    (layer "solder1"
+    (layer "10__bottom_copper"
       (type signal)
     )
     (boundary
@@ -35,10 +35,6 @@
   (placement
   )
   (library
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
-      (attach off)
-    )
   )
   (network
     (class geda_default
Index: ref/text_sides.dsn
===================================================================
--- ref/text_sides.dsn	(revision 16943)
+++ ref/text_sides.dsn	(revision 16944)
@@ -7,16 +7,16 @@
   )
   (resolution mm 1000000)
   (structure
-    (layer "comp1"
+    (layer "3__top_copper"
       (type signal)
     )
-    (layer "inner1"
+    (layer "5__Intern"
       (type signal)
     )
-    (layer "inner2"
+    (layer "7__Intern"
       (type signal)
     )
-    (layer "solder1"
+    (layer "10__bottom_copper"
       (type signal)
     )
     (boundary
@@ -35,10 +35,6 @@
   (placement
   )
   (library
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
-      (attach off)
-    )
   )
   (network
     (class geda_default
Index: ref/thermal_last.dsn
===================================================================
--- ref/thermal_last.dsn	(revision 16943)
+++ ref/thermal_last.dsn	(revision 16944)
@@ -7,16 +7,16 @@
   )
   (resolution mm 1000000)
   (structure
-    (layer "comp1"
+    (layer "3__top_copper"
       (type signal)
     )
-    (layer "inner1"
+    (layer "5__Intern"
       (type signal)
     )
-    (layer "inner2"
+    (layer "7__Intern"
       (type signal)
     )
-    (layer "solder1"
+    (layer "10__bottom_copper"
       (type signal)
     )
     (boundary
@@ -38,10 +38,6 @@
     )
   )
   (library
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
-      (attach off)
-    )
   )
   (network
     (class geda_default
Index: ref/thermal_layer.dsn
===================================================================
--- ref/thermal_layer.dsn	(revision 16943)
+++ ref/thermal_layer.dsn	(revision 16944)
@@ -7,16 +7,16 @@
   )
   (resolution mm 1000000)
   (structure
-    (layer "comp1"
+    (layer "3__top_copper"
       (type signal)
     )
-    (layer "inner1"
+    (layer "5__Intern"
       (type signal)
     )
-    (layer "inner2"
+    (layer "7__Intern"
       (type signal)
     )
-    (layer "solder1"
+    (layer "10__bottom_copper"
       (type signal)
     )
     (boundary
@@ -47,10 +47,6 @@
     )
   )
   (library
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
-      (attach off)
-    )
   )
   (network
     (class geda_default