diff --git a/ergogen/config.yaml b/ergogen/config.yaml
index 15275ef..6e42f4f 100644
--- a/ergogen/config.yaml
+++ b/ergogen/config.yaml
@@ -120,7 +120,7 @@ outlines:
   keys:
     - what: rectangle
       where: is_key
-      size: [ cx-1, cy-1 ]
+      size: [ cx - 1, cy - 1 ]
 
   # Outline for the PCB
   board:
@@ -129,13 +129,23 @@ outlines:
         - ref: primary_outer_num
           shift: [ -0.5cx, 0.75cy ]
         - ref: primary_five_num
-          shift: [ 1.5cx + 0, 1.0cy ]
-        - ref: primary_five_num
-          shift: [ 1.5cx + 0, 1.0cy - 32 ]
+          shift: [ 0.5cx + 0, cy ]
+        - ref: primary_five_bottom
+          shift: [ 0.5cx + 0, -cy - 6 ]
         - ref: thumb_four
           shift: [ 0.5cx, 0.5cy ]
         - ref: thumb_four
           shift: [ 0.5cx, -0.5cy ]
+        - ref: thumb_three
+          shift: [ 0.5cx, -0.5cy ]
+        - ref: thumb_two
+          shift: [ 0.5cx, -0.5cy ]
+        - ref: thumb_one
+          shift: [ 0.5cx, -0.5cy ]
+        - ref: thumb_one
+          shift: [ -0.5cx, -0.5cy ]
+        - ref: primary_one_mod
+          shift: [ 0.5cx, -0.75cy ]
         - ref: primary_outer_mod
           shift: [ -0.5cx, -0.5cy ]
       expand: 4
@@ -204,13 +214,26 @@ pcbs:
           shift: [ 0 - 6.35, cy - 2 - 1.27 ]
 
       # Mounting holes
-      # TODO: Place these
-      # mounting_hole_top_left:
-      #   what: mountinghole_m2
-      #   where:
-      #     ref: pad_one_five
-      #     shift: [ -8, 15 ]
+      mounting_hole_top_left:
+        what: mountinghole_m2
+        where:
+          ref: primary_outer_num
+          shift: [ 0cx, 0.5cy + 4 ]
 
-# TODO: Route all unused pins (+ VCC and GND) to a pin header on the board for potential future use
+      mounting_hole_top_right:
+        what: mountinghole_m2
+        where:
+          ref: primary_five_num
+          shift: [ 0.5cx + 1.5, 0.5cy + 2 ]
 
-# TODO: Buy fitting pin sockets and/or pin headers :/
+      mounting_hole_bottom_left:
+        what: mountinghole_m2
+        where:
+          ref: primary_one_mod
+          shift: [ -0.25cx, -0.5cy - 4 ]
+
+      mounting_hole_bottom_right:
+        what: mountinghole_m2
+        where:
+          ref: primary_five_bottom
+          shift: [ 0.25cx, -0.75cy - 2 ]