diff --git a/template/stm32f100-discovery-shield/stm32f100-discovery-shield.kicad_pcb b/template/stm32f100-discovery-shield/stm32f100-discovery-shield.kicad_pcb
index 13ed13a4..cdb33af7 100644
--- a/template/stm32f100-discovery-shield/stm32f100-discovery-shield.kicad_pcb
+++ b/template/stm32f100-discovery-shield/stm32f100-discovery-shield.kicad_pcb
@@ -19,21 +19,21 @@
   )
 
   (layers
-    (15 Front signal)
-    (0 Back signal)
-    (16 Dessous.Adhes user)
-    (17 Dessus.Adhes user)
-    (18 Dessous.Pate user)
-    (19 Dessus.Pate user)
-    (20 Dessous.SilkS user)
-    (21 Dessus.SilkS user)
-    (22 Dessous.Masque user)
-    (23 Dessus.Masque user)
-    (24 Dessin.User user)
+    (15 F.Cu signal)
+    (0 B.Cu signal)
+    (16 B.Adhes user)
+    (17 F.Adhes user)
+    (18 B.Paste user)
+    (19 F.Paste user)
+    (20 B.SilkS user)
+    (21 F.SilkS user)
+    (22 B.Mask user)
+    (23 F.Mask user)
+    (24 Dwgs.User user)
     (25 Cmts.User user)
     (26 Eco1.User user)
     (27 Eco2.User user)
-    (28 Contours.Ci user)
+    (28 Edge.Cuts user)
   )
 
   (setup
@@ -109,258 +109,258 @@
     (add_net GND)
   )
 
-  (module PIN_ARRAY_6X1   locked (layer Front) (tedit 50827C81) (tstamp 50827C60)
+  (module PIN_ARRAY_6X1   locked (layer F.Cu) (tedit 50827C81) (tstamp 50827C60)
     (at 55.88 113.03)
     (descr "Single rangee contacts 1 x 6 pins")
     (tags CONN)
     (path /50827295)
-    (fp_text reference P3 (at -8.89 0) (layer Dessus.SilkS)
+    (fp_text reference P3 (at -8.89 0) (layer F.SilkS)
       (effects (font (size 0.63246 0.63246) (thickness 0.15748)))
     )
-    (fp_text value CONN6 (at -8.89 0) (layer Dessus.SilkS) hide
+    (fp_text value CONN6 (at -8.89 0) (layer F.SilkS) hide
       (effects (font (size 0.63246 0.63246) (thickness 0.15748)))
     )
-    (fp_line (start -7.62 -1.27) (end 7.62 -1.27) (layer Dessus.SilkS) (width 0.14986))
-    (fp_line (start 7.62 -1.27) (end 7.62 1.27) (layer Dessus.SilkS) (width 0.14986))
-    (fp_line (start 7.62 1.27) (end -7.62 1.27) (layer Dessus.SilkS) (width 0.14986))
-    (fp_line (start -7.62 1.27) (end -7.62 -1.27) (layer Dessus.SilkS) (width 0.14986))
+    (fp_line (start -7.62 -1.27) (end 7.62 -1.27) (layer F.SilkS) (width 0.14986))
+    (fp_line (start 7.62 -1.27) (end 7.62 1.27) (layer F.SilkS) (width 0.14986))
+    (fp_line (start 7.62 1.27) (end -7.62 1.27) (layer F.SilkS) (width 0.14986))
+    (fp_line (start -7.62 1.27) (end -7.62 -1.27) (layer F.SilkS) (width 0.14986))
     (pad 1 thru_hole rect (at -6.35 0) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 2 thru_hole circle (at -3.81 0) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 4 thru_hole circle (at 1.27 0) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 6 thru_hole circle (at 6.35 0) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 3 thru_hole circle (at -1.27 0) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 5 thru_hole circle (at 3.81 0) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
   )
 
-  (module PIN_ARRAY_28X1   locked (layer Front) (tedit 50827C6F) (tstamp 50827C84)
+  (module PIN_ARRAY_28X1   locked (layer F.Cu) (tedit 50827C6F) (tstamp 50827C84)
     (at 39.37 73.66 270)
     (descr "Single rangee contacts 1 x 28 pins")
     (tags CONN)
     (path /50827277)
-    (fp_text reference P1 (at -36.195 0 360) (layer Dessus.SilkS)
+    (fp_text reference P1 (at -36.195 0 360) (layer F.SilkS)
       (effects (font (size 0.63246 0.63246) (thickness 0.15748)))
     )
-    (fp_text value CONN28 (at -36.195 0 360) (layer Dessus.SilkS) hide
+    (fp_text value CONN28 (at -36.195 0 360) (layer F.SilkS) hide
       (effects (font (size 0.63246 0.63246) (thickness 0.15748)))
     )
-    (fp_line (start -35.56 -1.27) (end 35.56 -1.27) (layer Dessus.SilkS) (width 0.14986))
-    (fp_line (start 35.56 -1.27) (end 35.56 1.27) (layer Dessus.SilkS) (width 0.14986))
-    (fp_line (start 35.56 1.27) (end -35.56 1.27) (layer Dessus.SilkS) (width 0.14986))
-    (fp_line (start -35.56 1.27) (end -35.56 -1.27) (layer Dessus.SilkS) (width 0.14986))
+    (fp_line (start -35.56 -1.27) (end 35.56 -1.27) (layer F.SilkS) (width 0.14986))
+    (fp_line (start 35.56 -1.27) (end 35.56 1.27) (layer F.SilkS) (width 0.14986))
+    (fp_line (start 35.56 1.27) (end -35.56 1.27) (layer F.SilkS) (width 0.14986))
+    (fp_line (start -35.56 1.27) (end -35.56 -1.27) (layer F.SilkS) (width 0.14986))
     (pad 1 thru_hole rect (at -34.29 0 270) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
       (net 3 GND)
     )
     (pad 2 thru_hole circle (at -31.75 0 270) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 11 thru_hole circle (at -8.89 0 270) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 4 thru_hole circle (at -26.67 0 270) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 13 thru_hole circle (at -3.81 0 270) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 6 thru_hole circle (at -21.59 0 270) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 15 thru_hole circle (at 1.27 0 270) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 8 thru_hole circle (at -16.51 0 270) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 17 thru_hole circle (at 6.35 0 270) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 10 thru_hole circle (at -11.43 0 270) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 19 thru_hole circle (at 11.43 0 270) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 12 thru_hole circle (at -6.35 0 270) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 21 thru_hole circle (at 16.51 0 270) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 14 thru_hole circle (at -1.27 0 270) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 23 thru_hole circle (at 21.59 0 270) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 16 thru_hole circle (at 3.81 0 270) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 25 thru_hole circle (at 26.67 0 270) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 18 thru_hole circle (at 8.89 0 270) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 27 thru_hole circle (at 31.75 0 270) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 20 thru_hole circle (at 13.97 0 270) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 22 thru_hole circle (at 19.05 0 270) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 24 thru_hole circle (at 24.13 0 270) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 26 thru_hole circle (at 29.21 0 270) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 28 thru_hole circle (at 34.29 0 270) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
       (net 3 GND)
     )
     (pad 3 thru_hole circle (at -29.21 0 270) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
       (net 1 +3.3V)
     )
     (pad 5 thru_hole circle (at -24.13 0 270) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 7 thru_hole circle (at -19.05 0 270) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 9 thru_hole circle (at -13.97 0 270) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
   )
 
-  (module PIN_ARRAY_28X1   locked (layer Front) (tedit 50827C8E) (tstamp 50827CA8)
+  (module PIN_ARRAY_28X1   locked (layer F.Cu) (tedit 50827C8E) (tstamp 50827CA8)
     (at 69.85 73.66 90)
     (descr "Single rangee contacts 1 x 28 pins")
     (tags CONN)
     (path /50827286)
-    (fp_text reference P2 (at -36.195 0 180) (layer Dessus.SilkS)
+    (fp_text reference P2 (at -36.195 0 180) (layer F.SilkS)
       (effects (font (size 0.63246 0.63246) (thickness 0.15748)))
     )
-    (fp_text value CONN28 (at -36.195 0 180) (layer Dessus.SilkS) hide
+    (fp_text value CONN28 (at -36.195 0 180) (layer F.SilkS) hide
       (effects (font (size 0.63246 0.63246) (thickness 0.15748)))
     )
-    (fp_line (start -35.56 -1.27) (end 35.56 -1.27) (layer Dessus.SilkS) (width 0.14986))
-    (fp_line (start 35.56 -1.27) (end 35.56 1.27) (layer Dessus.SilkS) (width 0.14986))
-    (fp_line (start 35.56 1.27) (end -35.56 1.27) (layer Dessus.SilkS) (width 0.14986))
-    (fp_line (start -35.56 1.27) (end -35.56 -1.27) (layer Dessus.SilkS) (width 0.14986))
+    (fp_line (start -35.56 -1.27) (end 35.56 -1.27) (layer F.SilkS) (width 0.14986))
+    (fp_line (start 35.56 -1.27) (end 35.56 1.27) (layer F.SilkS) (width 0.14986))
+    (fp_line (start 35.56 1.27) (end -35.56 1.27) (layer F.SilkS) (width 0.14986))
+    (fp_line (start -35.56 1.27) (end -35.56 -1.27) (layer F.SilkS) (width 0.14986))
     (pad 1 thru_hole rect (at -34.29 0 90) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
       (net 3 GND)
     )
     (pad 2 thru_hole circle (at -31.75 0 90) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 11 thru_hole circle (at -8.89 0 90) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 4 thru_hole circle (at -26.67 0 90) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 13 thru_hole circle (at -3.81 0 90) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 6 thru_hole circle (at -21.59 0 90) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 15 thru_hole circle (at 1.27 0 90) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 8 thru_hole circle (at -16.51 0 90) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 17 thru_hole circle (at 6.35 0 90) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 10 thru_hole circle (at -11.43 0 90) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 19 thru_hole circle (at 11.43 0 90) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 12 thru_hole circle (at -6.35 0 90) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 21 thru_hole circle (at 16.51 0 90) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 14 thru_hole circle (at -1.27 0 90) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 23 thru_hole circle (at 21.59 0 90) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 16 thru_hole circle (at 3.81 0 90) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 25 thru_hole circle (at 26.67 0 90) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 18 thru_hole circle (at 8.89 0 90) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 27 thru_hole circle (at 31.75 0 90) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 20 thru_hole circle (at 13.97 0 90) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 22 thru_hole circle (at 19.05 0 90) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 24 thru_hole circle (at 24.13 0 90) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 26 thru_hole circle (at 29.21 0 90) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
       (net 2 +5V)
     )
     (pad 28 thru_hole circle (at 34.29 0 90) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
       (net 3 GND)
     )
     (pad 3 thru_hole circle (at -29.21 0 90) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 5 thru_hole circle (at -24.13 0 90) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 7 thru_hole circle (at -19.05 0 90) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 9 thru_hole circle (at -13.97 0 90) (size 1.524 1.524) (drill 1.016)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
   )
 
-  (gr_text "STM32 Value Line Discovery - Shield" (at 48.133 117.475) (layer Dessus.SilkS)
+  (gr_text "STM32 Value Line Discovery - Shield" (at 48.133 117.475) (layer F.SilkS)
     (effects (font (size 1.00076 1.00076) (thickness 0.25146)))
   )
-  (gr_line (start 33.02 34.29) (end 33.02 118.745) (angle 90) (layer Contours.Ci) (width 0.14986))
-  (gr_line (start 76.2 118.745) (end 76.2 34.29) (angle 90) (layer Contours.Ci) (width 0.14986))
-  (gr_line (start 76.2 118.745) (end 33.02 118.745) (angle 90) (layer Contours.Ci) (width 0.14986))
-  (gr_line (start 33.02 34.29) (end 76.2 34.29) (angle 90) (layer Contours.Ci) (width 0.14986))
+  (gr_line (start 33.02 34.29) (end 33.02 118.745) (angle 90) (layer Edge.Cuts) (width 0.14986))
+  (gr_line (start 76.2 118.745) (end 76.2 34.29) (angle 90) (layer Edge.Cuts) (width 0.14986))
+  (gr_line (start 76.2 118.745) (end 33.02 118.745) (angle 90) (layer Edge.Cuts) (width 0.14986))
+  (gr_line (start 33.02 34.29) (end 76.2 34.29) (angle 90) (layer Edge.Cuts) (width 0.14986))
 
-  (zone (net 3) (net_name GND) (layer Back) (tstamp 50827DC8) (hatch edge 0.508)
+  (zone (net 3) (net_name GND) (layer B.Cu) (tstamp 50827DC8) (hatch edge 0.508)
     (connect_pads (clearance 0.508))
     (min_thickness 0.254)
     (fill (arc_segments 16) (thermal_gap 0.508) (thermal_bridge_width 0.889))
diff --git a/template/ti-stellaris-boosterpack40/boosterpack40_min.kicad_pcb b/template/ti-stellaris-boosterpack40/boosterpack40_min.kicad_pcb
index 95cc979d..21b568c1 100644
--- a/template/ti-stellaris-boosterpack40/boosterpack40_min.kicad_pcb
+++ b/template/ti-stellaris-boosterpack40/boosterpack40_min.kicad_pcb
@@ -14,21 +14,21 @@
 
   (page A3)
   (layers
-    (15 Front signal)
-    (0 Back signal)
-    (16 Dessous.Adhes user)
-    (17 Dessus.Adhes user)
-    (18 Dessous.Pate user)
-    (19 Dessus.Pate user)
-    (20 Dessous.SilkS user)
-    (21 Dessus.SilkS user)
-    (22 Dessous.Masque user)
-    (23 Dessus.Masque user)
-    (24 Dessin.User user)
+    (15 F.Cu signal)
+    (0 B.Cu signal)
+    (16 B.Adhes user)
+    (17 F.Adhes user)
+    (18 B.Paste user)
+    (19 F.Paste user)
+    (20 B.SilkS user)
+    (21 F.SilkS user)
+    (22 B.Mask user)
+    (23 F.Mask user)
+    (24 Dwgs.User user)
     (25 Cmts.User user)
     (26 Eco1.User user)
     (27 Eco2.User user)
-    (28 Contours.Ci user)
+    (28 Edge.Cuts user)
   )
 
   (setup
@@ -104,204 +104,204 @@
     (add_net VCC)
   )
 
-  (module SIL-10 (layer Front) (tedit 5080DEE6) (tstamp 5080DE37)
+  (module SIL-10 (layer F.Cu) (tedit 5080DEE6) (tstamp 5080DE37)
     (at 231.14 133.35 270)
     (descr "Connecteur 10 pins")
     (tags "CONN DEV")
     (path /5080DBF4)
-    (fp_text reference J2 (at -13.97 0 360) (layer Dessus.SilkS)
+    (fp_text reference J2 (at -13.97 0 360) (layer F.SilkS)
       (effects (font (size 1.72974 1.08712) (thickness 0.3048)))
     )
-    (fp_text value TI_BOOSTER_40_J2 (at 6.35 -2.54 270) (layer Dessus.SilkS)
+    (fp_text value TI_BOOSTER_40_J2 (at 6.35 -2.54 270) (layer F.SilkS)
       (effects (font (size 1.524 1.016) (thickness 0.3048)))
     )
-    (fp_line (start -12.7 1.27) (end -12.7 -1.27) (layer Dessus.SilkS) (width 0.3048))
-    (fp_line (start -12.7 -1.27) (end 12.7 -1.27) (layer Dessus.SilkS) (width 0.3048))
-    (fp_line (start 12.7 -1.27) (end 12.7 1.27) (layer Dessus.SilkS) (width 0.3048))
-    (fp_line (start 12.7 1.27) (end -12.7 1.27) (layer Dessus.SilkS) (width 0.3048))
-    (fp_line (start -10.16 1.27) (end -10.16 -1.27) (layer Dessus.SilkS) (width 0.3048))
+    (fp_line (start -12.7 1.27) (end -12.7 -1.27) (layer F.SilkS) (width 0.3048))
+    (fp_line (start -12.7 -1.27) (end 12.7 -1.27) (layer F.SilkS) (width 0.3048))
+    (fp_line (start 12.7 -1.27) (end 12.7 1.27) (layer F.SilkS) (width 0.3048))
+    (fp_line (start 12.7 1.27) (end -12.7 1.27) (layer F.SilkS) (width 0.3048))
+    (fp_line (start -10.16 1.27) (end -10.16 -1.27) (layer F.SilkS) (width 0.3048))
     (pad 1 thru_hole rect (at -11.43 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
       (net 2 GND)
     )
     (pad 2 thru_hole circle (at -8.89 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 3 thru_hole circle (at -6.35 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 4 thru_hole circle (at -3.81 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 5 thru_hole circle (at -1.27 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 6 thru_hole circle (at 1.27 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 7 thru_hole circle (at 3.81 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 8 thru_hole circle (at 6.35 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 9 thru_hole circle (at 8.89 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 10 thru_hole circle (at 11.43 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
   )
 
-  (module SIL-10 (layer Front) (tedit 5080DEED) (tstamp 5080DE4A)
+  (module SIL-10 (layer F.Cu) (tedit 5080DEED) (tstamp 5080DE4A)
     (at 228.6 133.35 270)
     (descr "Connecteur 10 pins")
     (tags "CONN DEV")
     (path /5080DC12)
-    (fp_text reference J4 (at -13.97 0 360) (layer Dessus.SilkS)
+    (fp_text reference J4 (at -13.97 0 360) (layer F.SilkS)
       (effects (font (size 1.72974 1.08712) (thickness 0.3048)))
     )
-    (fp_text value TI_BOOSTER_40_J4 (at 6.35 -2.54 270) (layer Dessus.SilkS)
+    (fp_text value TI_BOOSTER_40_J4 (at 6.35 -2.54 270) (layer F.SilkS)
       (effects (font (size 1.524 1.016) (thickness 0.3048)))
     )
-    (fp_line (start -12.7 1.27) (end -12.7 -1.27) (layer Dessus.SilkS) (width 0.3048))
-    (fp_line (start -12.7 -1.27) (end 12.7 -1.27) (layer Dessus.SilkS) (width 0.3048))
-    (fp_line (start 12.7 -1.27) (end 12.7 1.27) (layer Dessus.SilkS) (width 0.3048))
-    (fp_line (start 12.7 1.27) (end -12.7 1.27) (layer Dessus.SilkS) (width 0.3048))
-    (fp_line (start -10.16 1.27) (end -10.16 -1.27) (layer Dessus.SilkS) (width 0.3048))
+    (fp_line (start -12.7 1.27) (end -12.7 -1.27) (layer F.SilkS) (width 0.3048))
+    (fp_line (start -12.7 -1.27) (end 12.7 -1.27) (layer F.SilkS) (width 0.3048))
+    (fp_line (start 12.7 -1.27) (end 12.7 1.27) (layer F.SilkS) (width 0.3048))
+    (fp_line (start 12.7 1.27) (end -12.7 1.27) (layer F.SilkS) (width 0.3048))
+    (fp_line (start -10.16 1.27) (end -10.16 -1.27) (layer F.SilkS) (width 0.3048))
     (pad 1 thru_hole rect (at -11.43 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 2 thru_hole circle (at -8.89 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 3 thru_hole circle (at -6.35 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 4 thru_hole circle (at -3.81 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 5 thru_hole circle (at -1.27 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 6 thru_hole circle (at 1.27 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 7 thru_hole circle (at 3.81 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 8 thru_hole circle (at 6.35 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 9 thru_hole circle (at 8.89 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 10 thru_hole circle (at 11.43 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
   )
 
-  (module SIL-10 (layer Front) (tedit 5080DEE0) (tstamp 5080AB71)
+  (module SIL-10 (layer F.Cu) (tedit 5080DEE0) (tstamp 5080AB71)
     (at 187.96 133.35 270)
     (descr "Connecteur 10 pins")
     (tags "CONN DEV")
     (path /5080DC03)
-    (fp_text reference J3 (at -13.97 0 360) (layer Dessus.SilkS)
+    (fp_text reference J3 (at -13.97 0 360) (layer F.SilkS)
       (effects (font (size 1.72974 1.08712) (thickness 0.3048)))
     )
-    (fp_text value TI_BOOSTER_40_J3 (at 6.35 -2.54 270) (layer Dessus.SilkS)
+    (fp_text value TI_BOOSTER_40_J3 (at 6.35 -2.54 270) (layer F.SilkS)
       (effects (font (size 1.524 1.016) (thickness 0.3048)))
     )
-    (fp_line (start -12.7 1.27) (end -12.7 -1.27) (layer Dessus.SilkS) (width 0.3048))
-    (fp_line (start -12.7 -1.27) (end 12.7 -1.27) (layer Dessus.SilkS) (width 0.3048))
-    (fp_line (start 12.7 -1.27) (end 12.7 1.27) (layer Dessus.SilkS) (width 0.3048))
-    (fp_line (start 12.7 1.27) (end -12.7 1.27) (layer Dessus.SilkS) (width 0.3048))
-    (fp_line (start -10.16 1.27) (end -10.16 -1.27) (layer Dessus.SilkS) (width 0.3048))
+    (fp_line (start -12.7 1.27) (end -12.7 -1.27) (layer F.SilkS) (width 0.3048))
+    (fp_line (start -12.7 -1.27) (end 12.7 -1.27) (layer F.SilkS) (width 0.3048))
+    (fp_line (start 12.7 -1.27) (end 12.7 1.27) (layer F.SilkS) (width 0.3048))
+    (fp_line (start 12.7 1.27) (end -12.7 1.27) (layer F.SilkS) (width 0.3048))
+    (fp_line (start -10.16 1.27) (end -10.16 -1.27) (layer F.SilkS) (width 0.3048))
     (pad 1 thru_hole rect (at -11.43 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
       (net 1 +5V)
     )
     (pad 2 thru_hole circle (at -8.89 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
       (net 2 GND)
     )
     (pad 3 thru_hole circle (at -6.35 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 4 thru_hole circle (at -3.81 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 5 thru_hole circle (at -1.27 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 6 thru_hole circle (at 1.27 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 7 thru_hole circle (at 3.81 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 8 thru_hole circle (at 6.35 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 9 thru_hole circle (at 8.89 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 10 thru_hole circle (at 11.43 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
   )
 
-  (module SIL-10 (layer Front) (tedit 5080DEDC) (tstamp 5080AB8D)
+  (module SIL-10 (layer F.Cu) (tedit 5080DEDC) (tstamp 5080AB8D)
     (at 185.42 133.35 270)
     (descr "Connecteur 10 pins")
     (tags "CONN DEV")
     (path /5080DB5C)
-    (fp_text reference J1 (at -13.97 0 360) (layer Dessus.SilkS)
+    (fp_text reference J1 (at -13.97 0 360) (layer F.SilkS)
       (effects (font (size 1.72974 1.08712) (thickness 0.3048)))
     )
-    (fp_text value TI_BOOSTER_40_J1 (at 6.35 -2.54 270) (layer Dessus.SilkS)
+    (fp_text value TI_BOOSTER_40_J1 (at 6.35 -2.54 270) (layer F.SilkS)
       (effects (font (size 1.524 1.016) (thickness 0.3048)))
     )
-    (fp_line (start -12.7 1.27) (end -12.7 -1.27) (layer Dessus.SilkS) (width 0.3048))
-    (fp_line (start -12.7 -1.27) (end 12.7 -1.27) (layer Dessus.SilkS) (width 0.3048))
-    (fp_line (start 12.7 -1.27) (end 12.7 1.27) (layer Dessus.SilkS) (width 0.3048))
-    (fp_line (start 12.7 1.27) (end -12.7 1.27) (layer Dessus.SilkS) (width 0.3048))
-    (fp_line (start -10.16 1.27) (end -10.16 -1.27) (layer Dessus.SilkS) (width 0.3048))
+    (fp_line (start -12.7 1.27) (end -12.7 -1.27) (layer F.SilkS) (width 0.3048))
+    (fp_line (start -12.7 -1.27) (end 12.7 -1.27) (layer F.SilkS) (width 0.3048))
+    (fp_line (start 12.7 -1.27) (end 12.7 1.27) (layer F.SilkS) (width 0.3048))
+    (fp_line (start 12.7 1.27) (end -12.7 1.27) (layer F.SilkS) (width 0.3048))
+    (fp_line (start -10.16 1.27) (end -10.16 -1.27) (layer F.SilkS) (width 0.3048))
     (pad 1 thru_hole rect (at -11.43 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
       (net 3 VCC)
     )
     (pad 2 thru_hole circle (at -8.89 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 3 thru_hole circle (at -6.35 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 4 thru_hole circle (at -3.81 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 5 thru_hole circle (at -1.27 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 6 thru_hole circle (at 1.27 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 7 thru_hole circle (at 3.81 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 8 thru_hole circle (at 6.35 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 9 thru_hole circle (at 8.89 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 10 thru_hole circle (at 11.43 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
   )
 
-  (dimension 34.29 (width 0.25) (layer Dessin.User)
-    (gr_text "1.3500 in" (at 176.800001 130.175 270) (layer Dessin.User)
+  (dimension 34.29 (width 0.25) (layer Dwgs.User)
+    (gr_text "1.3500 in" (at 176.800001 130.175 270) (layer Dwgs.User)
       (effects (font (size 1 1) (thickness 0.25)))
     )
     (feature1 (pts (xy 182.88 147.32) (xy 175.800001 147.32)))
@@ -312,8 +312,8 @@
     (arrow2a (pts (xy 177.800001 113.03) (xy 177.213581 114.156503)))
     (arrow2b (pts (xy 177.800001 113.03) (xy 178.386421 114.156503)))
   )
-  (dimension 8.89 (width 0.25) (layer Dessin.User)
-    (gr_text "0.3500 in" (at 238.49 117.475 90) (layer Dessin.User)
+  (dimension 8.89 (width 0.25) (layer Dwgs.User)
+    (gr_text "0.3500 in" (at 238.49 117.475 90) (layer Dwgs.User)
       (effects (font (size 1 1) (thickness 0.25)))
     )
     (feature1 (pts (xy 231.14 113.03) (xy 239.49 113.03)))
@@ -324,9 +324,9 @@
     (arrow2a (pts (xy 237.49 121.92) (xy 238.07642 120.793497)))
     (arrow2b (pts (xy 237.49 121.92) (xy 236.90358 120.793497)))
   )
-  (gr_line (start 233.68 147.32) (end 182.88 147.32) (angle 90) (layer Contours.Ci) (width 0.15))
-  (dimension 50.8 (width 0.25) (layer Dessin.User)
-    (gr_text "2.0000 in" (at 208.28 105.680002) (layer Dessin.User)
+  (gr_line (start 233.68 147.32) (end 182.88 147.32) (angle 90) (layer Edge.Cuts) (width 0.15))
+  (dimension 50.8 (width 0.25) (layer Dwgs.User)
+    (gr_text "2.0000 in" (at 208.28 105.680002) (layer Dwgs.User)
       (effects (font (size 1 1) (thickness 0.25)))
     )
     (feature1 (pts (xy 233.68 113.03) (xy 233.68 104.680002)))
@@ -337,8 +337,8 @@
     (arrow2a (pts (xy 182.88 106.680002) (xy 184.006503 107.266422)))
     (arrow2b (pts (xy 182.88 106.680002) (xy 184.006503 106.093582)))
   )
-  (gr_line (start 182.88 147.32) (end 182.88 113.03) (angle 90) (layer Contours.Ci) (width 0.14986))
-  (gr_line (start 233.68 113.03) (end 233.68 147.32) (angle 90) (layer Contours.Ci) (width 0.14986))
-  (gr_line (start 182.88 113.03) (end 233.68 113.03) (angle 90) (layer Contours.Ci) (width 0.15))
+  (gr_line (start 182.88 147.32) (end 182.88 113.03) (angle 90) (layer Edge.Cuts) (width 0.14986))
+  (gr_line (start 233.68 113.03) (end 233.68 147.32) (angle 90) (layer Edge.Cuts) (width 0.14986))
+  (gr_line (start 182.88 113.03) (end 233.68 113.03) (angle 90) (layer Edge.Cuts) (width 0.15))
 
 )
diff --git a/template/ti-stellaris-boosterpack40_min/boosterpack40_min.kicad_pcb b/template/ti-stellaris-boosterpack40_min/boosterpack40_min.kicad_pcb
index 95cc979d..21b568c1 100644
--- a/template/ti-stellaris-boosterpack40_min/boosterpack40_min.kicad_pcb
+++ b/template/ti-stellaris-boosterpack40_min/boosterpack40_min.kicad_pcb
@@ -14,21 +14,21 @@
 
   (page A3)
   (layers
-    (15 Front signal)
-    (0 Back signal)
-    (16 Dessous.Adhes user)
-    (17 Dessus.Adhes user)
-    (18 Dessous.Pate user)
-    (19 Dessus.Pate user)
-    (20 Dessous.SilkS user)
-    (21 Dessus.SilkS user)
-    (22 Dessous.Masque user)
-    (23 Dessus.Masque user)
-    (24 Dessin.User user)
+    (15 F.Cu signal)
+    (0 B.Cu signal)
+    (16 B.Adhes user)
+    (17 F.Adhes user)
+    (18 B.Paste user)
+    (19 F.Paste user)
+    (20 B.SilkS user)
+    (21 F.SilkS user)
+    (22 B.Mask user)
+    (23 F.Mask user)
+    (24 Dwgs.User user)
     (25 Cmts.User user)
     (26 Eco1.User user)
     (27 Eco2.User user)
-    (28 Contours.Ci user)
+    (28 Edge.Cuts user)
   )
 
   (setup
@@ -104,204 +104,204 @@
     (add_net VCC)
   )
 
-  (module SIL-10 (layer Front) (tedit 5080DEE6) (tstamp 5080DE37)
+  (module SIL-10 (layer F.Cu) (tedit 5080DEE6) (tstamp 5080DE37)
     (at 231.14 133.35 270)
     (descr "Connecteur 10 pins")
     (tags "CONN DEV")
     (path /5080DBF4)
-    (fp_text reference J2 (at -13.97 0 360) (layer Dessus.SilkS)
+    (fp_text reference J2 (at -13.97 0 360) (layer F.SilkS)
       (effects (font (size 1.72974 1.08712) (thickness 0.3048)))
     )
-    (fp_text value TI_BOOSTER_40_J2 (at 6.35 -2.54 270) (layer Dessus.SilkS)
+    (fp_text value TI_BOOSTER_40_J2 (at 6.35 -2.54 270) (layer F.SilkS)
       (effects (font (size 1.524 1.016) (thickness 0.3048)))
     )
-    (fp_line (start -12.7 1.27) (end -12.7 -1.27) (layer Dessus.SilkS) (width 0.3048))
-    (fp_line (start -12.7 -1.27) (end 12.7 -1.27) (layer Dessus.SilkS) (width 0.3048))
-    (fp_line (start 12.7 -1.27) (end 12.7 1.27) (layer Dessus.SilkS) (width 0.3048))
-    (fp_line (start 12.7 1.27) (end -12.7 1.27) (layer Dessus.SilkS) (width 0.3048))
-    (fp_line (start -10.16 1.27) (end -10.16 -1.27) (layer Dessus.SilkS) (width 0.3048))
+    (fp_line (start -12.7 1.27) (end -12.7 -1.27) (layer F.SilkS) (width 0.3048))
+    (fp_line (start -12.7 -1.27) (end 12.7 -1.27) (layer F.SilkS) (width 0.3048))
+    (fp_line (start 12.7 -1.27) (end 12.7 1.27) (layer F.SilkS) (width 0.3048))
+    (fp_line (start 12.7 1.27) (end -12.7 1.27) (layer F.SilkS) (width 0.3048))
+    (fp_line (start -10.16 1.27) (end -10.16 -1.27) (layer F.SilkS) (width 0.3048))
     (pad 1 thru_hole rect (at -11.43 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
       (net 2 GND)
     )
     (pad 2 thru_hole circle (at -8.89 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 3 thru_hole circle (at -6.35 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 4 thru_hole circle (at -3.81 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 5 thru_hole circle (at -1.27 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 6 thru_hole circle (at 1.27 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 7 thru_hole circle (at 3.81 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 8 thru_hole circle (at 6.35 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 9 thru_hole circle (at 8.89 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 10 thru_hole circle (at 11.43 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
   )
 
-  (module SIL-10 (layer Front) (tedit 5080DEED) (tstamp 5080DE4A)
+  (module SIL-10 (layer F.Cu) (tedit 5080DEED) (tstamp 5080DE4A)
     (at 228.6 133.35 270)
     (descr "Connecteur 10 pins")
     (tags "CONN DEV")
     (path /5080DC12)
-    (fp_text reference J4 (at -13.97 0 360) (layer Dessus.SilkS)
+    (fp_text reference J4 (at -13.97 0 360) (layer F.SilkS)
       (effects (font (size 1.72974 1.08712) (thickness 0.3048)))
     )
-    (fp_text value TI_BOOSTER_40_J4 (at 6.35 -2.54 270) (layer Dessus.SilkS)
+    (fp_text value TI_BOOSTER_40_J4 (at 6.35 -2.54 270) (layer F.SilkS)
       (effects (font (size 1.524 1.016) (thickness 0.3048)))
     )
-    (fp_line (start -12.7 1.27) (end -12.7 -1.27) (layer Dessus.SilkS) (width 0.3048))
-    (fp_line (start -12.7 -1.27) (end 12.7 -1.27) (layer Dessus.SilkS) (width 0.3048))
-    (fp_line (start 12.7 -1.27) (end 12.7 1.27) (layer Dessus.SilkS) (width 0.3048))
-    (fp_line (start 12.7 1.27) (end -12.7 1.27) (layer Dessus.SilkS) (width 0.3048))
-    (fp_line (start -10.16 1.27) (end -10.16 -1.27) (layer Dessus.SilkS) (width 0.3048))
+    (fp_line (start -12.7 1.27) (end -12.7 -1.27) (layer F.SilkS) (width 0.3048))
+    (fp_line (start -12.7 -1.27) (end 12.7 -1.27) (layer F.SilkS) (width 0.3048))
+    (fp_line (start 12.7 -1.27) (end 12.7 1.27) (layer F.SilkS) (width 0.3048))
+    (fp_line (start 12.7 1.27) (end -12.7 1.27) (layer F.SilkS) (width 0.3048))
+    (fp_line (start -10.16 1.27) (end -10.16 -1.27) (layer F.SilkS) (width 0.3048))
     (pad 1 thru_hole rect (at -11.43 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 2 thru_hole circle (at -8.89 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 3 thru_hole circle (at -6.35 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 4 thru_hole circle (at -3.81 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 5 thru_hole circle (at -1.27 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 6 thru_hole circle (at 1.27 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 7 thru_hole circle (at 3.81 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 8 thru_hole circle (at 6.35 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 9 thru_hole circle (at 8.89 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 10 thru_hole circle (at 11.43 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
   )
 
-  (module SIL-10 (layer Front) (tedit 5080DEE0) (tstamp 5080AB71)
+  (module SIL-10 (layer F.Cu) (tedit 5080DEE0) (tstamp 5080AB71)
     (at 187.96 133.35 270)
     (descr "Connecteur 10 pins")
     (tags "CONN DEV")
     (path /5080DC03)
-    (fp_text reference J3 (at -13.97 0 360) (layer Dessus.SilkS)
+    (fp_text reference J3 (at -13.97 0 360) (layer F.SilkS)
       (effects (font (size 1.72974 1.08712) (thickness 0.3048)))
     )
-    (fp_text value TI_BOOSTER_40_J3 (at 6.35 -2.54 270) (layer Dessus.SilkS)
+    (fp_text value TI_BOOSTER_40_J3 (at 6.35 -2.54 270) (layer F.SilkS)
       (effects (font (size 1.524 1.016) (thickness 0.3048)))
     )
-    (fp_line (start -12.7 1.27) (end -12.7 -1.27) (layer Dessus.SilkS) (width 0.3048))
-    (fp_line (start -12.7 -1.27) (end 12.7 -1.27) (layer Dessus.SilkS) (width 0.3048))
-    (fp_line (start 12.7 -1.27) (end 12.7 1.27) (layer Dessus.SilkS) (width 0.3048))
-    (fp_line (start 12.7 1.27) (end -12.7 1.27) (layer Dessus.SilkS) (width 0.3048))
-    (fp_line (start -10.16 1.27) (end -10.16 -1.27) (layer Dessus.SilkS) (width 0.3048))
+    (fp_line (start -12.7 1.27) (end -12.7 -1.27) (layer F.SilkS) (width 0.3048))
+    (fp_line (start -12.7 -1.27) (end 12.7 -1.27) (layer F.SilkS) (width 0.3048))
+    (fp_line (start 12.7 -1.27) (end 12.7 1.27) (layer F.SilkS) (width 0.3048))
+    (fp_line (start 12.7 1.27) (end -12.7 1.27) (layer F.SilkS) (width 0.3048))
+    (fp_line (start -10.16 1.27) (end -10.16 -1.27) (layer F.SilkS) (width 0.3048))
     (pad 1 thru_hole rect (at -11.43 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
       (net 1 +5V)
     )
     (pad 2 thru_hole circle (at -8.89 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
       (net 2 GND)
     )
     (pad 3 thru_hole circle (at -6.35 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 4 thru_hole circle (at -3.81 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 5 thru_hole circle (at -1.27 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 6 thru_hole circle (at 1.27 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 7 thru_hole circle (at 3.81 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 8 thru_hole circle (at 6.35 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 9 thru_hole circle (at 8.89 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 10 thru_hole circle (at 11.43 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
   )
 
-  (module SIL-10 (layer Front) (tedit 5080DEDC) (tstamp 5080AB8D)
+  (module SIL-10 (layer F.Cu) (tedit 5080DEDC) (tstamp 5080AB8D)
     (at 185.42 133.35 270)
     (descr "Connecteur 10 pins")
     (tags "CONN DEV")
     (path /5080DB5C)
-    (fp_text reference J1 (at -13.97 0 360) (layer Dessus.SilkS)
+    (fp_text reference J1 (at -13.97 0 360) (layer F.SilkS)
       (effects (font (size 1.72974 1.08712) (thickness 0.3048)))
     )
-    (fp_text value TI_BOOSTER_40_J1 (at 6.35 -2.54 270) (layer Dessus.SilkS)
+    (fp_text value TI_BOOSTER_40_J1 (at 6.35 -2.54 270) (layer F.SilkS)
       (effects (font (size 1.524 1.016) (thickness 0.3048)))
     )
-    (fp_line (start -12.7 1.27) (end -12.7 -1.27) (layer Dessus.SilkS) (width 0.3048))
-    (fp_line (start -12.7 -1.27) (end 12.7 -1.27) (layer Dessus.SilkS) (width 0.3048))
-    (fp_line (start 12.7 -1.27) (end 12.7 1.27) (layer Dessus.SilkS) (width 0.3048))
-    (fp_line (start 12.7 1.27) (end -12.7 1.27) (layer Dessus.SilkS) (width 0.3048))
-    (fp_line (start -10.16 1.27) (end -10.16 -1.27) (layer Dessus.SilkS) (width 0.3048))
+    (fp_line (start -12.7 1.27) (end -12.7 -1.27) (layer F.SilkS) (width 0.3048))
+    (fp_line (start -12.7 -1.27) (end 12.7 -1.27) (layer F.SilkS) (width 0.3048))
+    (fp_line (start 12.7 -1.27) (end 12.7 1.27) (layer F.SilkS) (width 0.3048))
+    (fp_line (start 12.7 1.27) (end -12.7 1.27) (layer F.SilkS) (width 0.3048))
+    (fp_line (start -10.16 1.27) (end -10.16 -1.27) (layer F.SilkS) (width 0.3048))
     (pad 1 thru_hole rect (at -11.43 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
       (net 3 VCC)
     )
     (pad 2 thru_hole circle (at -8.89 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 3 thru_hole circle (at -6.35 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 4 thru_hole circle (at -3.81 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 5 thru_hole circle (at -1.27 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 6 thru_hole circle (at 1.27 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 7 thru_hole circle (at 3.81 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 8 thru_hole circle (at 6.35 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 9 thru_hole circle (at 8.89 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
     (pad 10 thru_hole circle (at 11.43 0 270) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask Dessus.SilkS)
+      (layers *.Cu *.Mask F.SilkS)
     )
   )
 
-  (dimension 34.29 (width 0.25) (layer Dessin.User)
-    (gr_text "1.3500 in" (at 176.800001 130.175 270) (layer Dessin.User)
+  (dimension 34.29 (width 0.25) (layer Dwgs.User)
+    (gr_text "1.3500 in" (at 176.800001 130.175 270) (layer Dwgs.User)
       (effects (font (size 1 1) (thickness 0.25)))
     )
     (feature1 (pts (xy 182.88 147.32) (xy 175.800001 147.32)))
@@ -312,8 +312,8 @@
     (arrow2a (pts (xy 177.800001 113.03) (xy 177.213581 114.156503)))
     (arrow2b (pts (xy 177.800001 113.03) (xy 178.386421 114.156503)))
   )
-  (dimension 8.89 (width 0.25) (layer Dessin.User)
-    (gr_text "0.3500 in" (at 238.49 117.475 90) (layer Dessin.User)
+  (dimension 8.89 (width 0.25) (layer Dwgs.User)
+    (gr_text "0.3500 in" (at 238.49 117.475 90) (layer Dwgs.User)
       (effects (font (size 1 1) (thickness 0.25)))
     )
     (feature1 (pts (xy 231.14 113.03) (xy 239.49 113.03)))
@@ -324,9 +324,9 @@
     (arrow2a (pts (xy 237.49 121.92) (xy 238.07642 120.793497)))
     (arrow2b (pts (xy 237.49 121.92) (xy 236.90358 120.793497)))
   )
-  (gr_line (start 233.68 147.32) (end 182.88 147.32) (angle 90) (layer Contours.Ci) (width 0.15))
-  (dimension 50.8 (width 0.25) (layer Dessin.User)
-    (gr_text "2.0000 in" (at 208.28 105.680002) (layer Dessin.User)
+  (gr_line (start 233.68 147.32) (end 182.88 147.32) (angle 90) (layer Edge.Cuts) (width 0.15))
+  (dimension 50.8 (width 0.25) (layer Dwgs.User)
+    (gr_text "2.0000 in" (at 208.28 105.680002) (layer Dwgs.User)
       (effects (font (size 1 1) (thickness 0.25)))
     )
     (feature1 (pts (xy 233.68 113.03) (xy 233.68 104.680002)))
@@ -337,8 +337,8 @@
     (arrow2a (pts (xy 182.88 106.680002) (xy 184.006503 107.266422)))
     (arrow2b (pts (xy 182.88 106.680002) (xy 184.006503 106.093582)))
   )
-  (gr_line (start 182.88 147.32) (end 182.88 113.03) (angle 90) (layer Contours.Ci) (width 0.14986))
-  (gr_line (start 233.68 113.03) (end 233.68 147.32) (angle 90) (layer Contours.Ci) (width 0.14986))
-  (gr_line (start 182.88 113.03) (end 233.68 113.03) (angle 90) (layer Contours.Ci) (width 0.15))
+  (gr_line (start 182.88 147.32) (end 182.88 113.03) (angle 90) (layer Edge.Cuts) (width 0.14986))
+  (gr_line (start 233.68 113.03) (end 233.68 147.32) (angle 90) (layer Edge.Cuts) (width 0.14986))
+  (gr_line (start 182.88 113.03) (end 233.68 113.03) (angle 90) (layer Edge.Cuts) (width 0.15))
 
 )