diff --git a/ergogen/config.yaml b/ergogen/config.yaml
index a2205a4..75232ed 100644
--- a/ergogen/config.yaml
+++ b/ergogen/config.yaml
@@ -36,17 +36,17 @@ points:
       # Key rows (from bottom to top)
       rows:
         one:
-          row_net: P9
+          row_net: P5
         two:
-          row_net: P8
+          row_net: P6
           tags: [ is_key, flip_led ]
         three:
           row_net: P7
         four:
-          row_net: P6
+          row_net: P8
           tags: [ is_key, flip_led ]
         five:
-          row_net: P5
+          row_net: P9
 
       # Key columns (from left to right)
       columns:
@@ -168,8 +168,8 @@ pcbs:
         params:
           keycaps: true
           hotswap: true
-          from: "{{column_net}}"
-          to: "{{colrow}}"
+          from: "{{colrow}}"
+          to: "{{row_net}}"
 
       # TODO: Check if the position of the rotary encoder fits with the controller board
       rotary_encoder:
@@ -177,29 +177,30 @@ pcbs:
         where: is_rotary_encoder
         adjust.rotate: 90
         params:
-          from: "{{column_net}}"
-          to: "{{colrow}}"
           # TODO: Set these to GPIO pins
           A: "rotary_encoder_a"
           B: "rotary_encoder_b"
           C: "rotary_encoder_c"
+          from: "{{colrow}}"
+          to: "{{row_net}}"
 
       diode:
         what: diode_smd
         where: is_key
-        # TODO: Is this a good position? Might be a bit too close to the hotswap sockets...
         adjust:
-          shift: [ -8.28, -8.5 ]
-          rotate: 90
+          shift: [ 5, -2.5 ]
+          rotate: 180
         params:
           side: B
           from: "{{colrow}}"
-          to: "{{row_net}}"
+          to: "{{column_net}}"
 
       diode_rotary_encoder:
         $extends: pcbs.eepypad.footprints.diode
         where: is_rotary_encoder
-        adjust.shift: [ 0, 0 ]
+        adjust:
+          shift: [ 0, 0 ]
+          rotate: 90
 
       led_pixel:
         what: sk6812_mini_e