diff --git a/ergogen/config.yaml b/ergogen/config.yaml
index 7790996..4273c56 100644
--- a/ergogen/config.yaml
+++ b/ergogen/config.yaml
@@ -1,16 +1,41 @@
-vars:
-  version: &kb_version 'Corney Island v0.1'
+meta:
+  engine: 4.0.2
+  name: corney-island
+  version: 0.1
+  ref: &kb_ref 'Corney Island v0.1'
+  author: ceoloide
+  url: https://github.com/ceoloide/corney-island
+
+presets:
+    # These presets provide different layout options
+    # Select a preset in the `units` section below
+    # Note: The appropriate switch footprint will still need to be set in the `pcb` section
+    mx:
+        # Key and keycap measures
+        kx: u  # spacing between key centers (X-axis)
+        ky: u  # spacing between key centers (X-axis)
+        ks: 19  # horizontal space between columns (default: 19)
+        kp: 19  # vertical padding between keys (deafult: 19)
+        kcow: 14  # key cutout hole width (cherry: 14, choc: 13.8)
+        kcoh: 14  # key cutout hole height (cherry: 14, choc: 13.8)
+        keycw: 18  # keycap width (cherry: 18, choc: 17.5)
+        keych: 18  # keycap height (cherry: 18, choc: 16.5) 
+    choc:
+        # Key and keycap measures
+        kx: cx  # spacing between key centers (X-axis)
+        ky: cy  # spacing between key centers (X-axis)
+        ks: 18.5  # horizontal space between columns (default: 19)
+        kp: 17.5  # vertical padding between keys (deafult: 19)
+        kcow: 13.8  # key cutout hole width (cherry: 14, choc: 13.8)
+        kcoh: 13.8  # key cutout hole height (cherry: 14, choc: 13.8)
+        keycw: 17.5  # keycap width (cherry: 18, choc: 17.5)
+        keych: 16.5  # keycap height (cherry: 18, choc: 16.5)
 
 units:
-  # Key and keycap measures
-  kx: u  # spacing between key centers (X-axis)
-  ky: u  # spacing between key centers (X-axis)
-  ks: 19  # horizontal space between columns (default: 19)
-  kp: 19  # vertical padding between keys (deafult: 19)
-  kcow: 14  # key cutout hole width (cherry: 14, choc: 13.8)
-  kcoh: 14  # key cutout hole height (cherry: 14, choc: 13.8)
-  keycw: 18  # keycap width (cherry: 18, choc: 17.5)
-  keych: 18  # keycap height (cherry: 18, choc: 16.5)
+  # The following statements will make the content of the preset
+  # available in the units context
+  $extends: presets.mx
+ 
   hand_rotation: 0
 
   # Physical measures
diff --git a/ergogen/output/gerbers/backplate.zip b/ergogen/output/gerbers/backplate.zip
index 8f340b0..dd60c61 100644
Binary files a/ergogen/output/gerbers/backplate.zip and b/ergogen/output/gerbers/backplate.zip differ
diff --git a/ergogen/output/gerbers/controller_overlay.zip b/ergogen/output/gerbers/controller_overlay.zip
index 26164b7..8e67a70 100644
Binary files a/ergogen/output/gerbers/controller_overlay.zip and b/ergogen/output/gerbers/controller_overlay.zip differ
diff --git a/ergogen/output/gerbers/corney_island.zip b/ergogen/output/gerbers/corney_island.zip
index 5b8eb7f..332f980 100644
Binary files a/ergogen/output/gerbers/corney_island.zip and b/ergogen/output/gerbers/corney_island.zip differ
diff --git a/ergogen/output/gerbers/frontplate.zip b/ergogen/output/gerbers/frontplate.zip
index 016dd7c..baa56cb 100644
Binary files a/ergogen/output/gerbers/frontplate.zip and b/ergogen/output/gerbers/frontplate.zip differ
diff --git a/ergogen/output/images/corney_island_back.png b/ergogen/output/images/corney_island_back.png
index dd4664f..bb6dd0f 100644
Binary files a/ergogen/output/images/corney_island_back.png and b/ergogen/output/images/corney_island_back.png differ
diff --git a/ergogen/output/images/corney_island_front.png b/ergogen/output/images/corney_island_front.png
index 00a8115..224812a 100644
Binary files a/ergogen/output/images/corney_island_front.png and b/ergogen/output/images/corney_island_front.png differ
diff --git a/ergogen/output/pcbs/backplate.kicad_pcb b/ergogen/output/pcbs/backplate.kicad_pcb
index a682ef7..b6337a1 100644
--- a/ergogen/output/pcbs/backplate.kicad_pcb
+++ b/ergogen/output/pcbs/backplate.kicad_pcb
@@ -5,8 +5,8 @@
   (page A3)
   (title_block
     (title backplate)
-    (rev v1.0.0)
-    (company Unknown)
+    (rev 0.1)
+    (company ceoloide)
   )
 
   (general
diff --git a/ergogen/output/pcbs/controller_overlay.kicad_pcb b/ergogen/output/pcbs/controller_overlay.kicad_pcb
index 6d3743d..0c02a43 100644
--- a/ergogen/output/pcbs/controller_overlay.kicad_pcb
+++ b/ergogen/output/pcbs/controller_overlay.kicad_pcb
@@ -5,8 +5,8 @@
   (page A3)
   (title_block
     (title controller_overlay)
-    (rev v1.0.0)
-    (company Unknown)
+    (rev 0.1)
+    (company ceoloide)
   )
 
   (general
diff --git a/ergogen/output/pcbs/corney_island.kicad_pcb b/ergogen/output/pcbs/corney_island.kicad_pcb
index 8408a72..d39955f 100644
--- a/ergogen/output/pcbs/corney_island.kicad_pcb
+++ b/ergogen/output/pcbs/corney_island.kicad_pcb
@@ -5,8 +5,8 @@
   (page A3)
   (title_block
     (title corney_island)
-    (rev v1.0.0)
-    (company Unknown)
+    (rev 0.1)
+    (company ceoloide)
   )
 
   (general
diff --git a/ergogen/output/pcbs/corney_island_routed.kicad_pcb b/ergogen/output/pcbs/corney_island_routed.kicad_pcb
index 9b79286..d80dea8 100644
--- a/ergogen/output/pcbs/corney_island_routed.kicad_pcb
+++ b/ergogen/output/pcbs/corney_island_routed.kicad_pcb
@@ -12,8 +12,8 @@
   (page A3)
   (title_block
     (title corney_island)
-    (rev v1.0.0)
-    (company Unknown)
+    (rev 0.1)
+    (company ceoloide)
   )
 
   (layers
diff --git a/ergogen/output/pcbs/frontplate.kicad_pcb b/ergogen/output/pcbs/frontplate.kicad_pcb
index 213211d..3911964 100644
--- a/ergogen/output/pcbs/frontplate.kicad_pcb
+++ b/ergogen/output/pcbs/frontplate.kicad_pcb
@@ -5,8 +5,8 @@
   (page A3)
   (title_block
     (title frontplate)
-    (rev v1.0.0)
-    (company Unknown)
+    (rev 0.1)
+    (company ceoloide)
   )
 
   (general