diff --git a/src/lib/assets/layouts/one.yml b/src/lib/assets/layouts/one.yml
index 097c2a6c..219e121b 100644
--- a/src/lib/assets/layouts/one.yml
+++ b/src/lib/assets/layouts/one.yml
@@ -1,11 +1,12 @@
 name: CC1
 col:
+  # Ring / Middle
   - offset: [2, 0]
     row:
       - switch: { d: 25, e: 26, n: 27, w: 28, s: 29 }
       - switch: { d: 20, e: 21, n: 22, w: 23, s: 24 }
       - offset: [4, 0]
-        switch: { d: 60, w: 61, n: 62, e: 63, s: 64 }
+        switch: { d: 65, w: 66, n: 67, e: 68, s: 69 }
       - switch: { d: 70, w: 71, n: 72, e: 73, s: 74 }
   - offset: [2, 0]
     row:
@@ -14,19 +15,21 @@ col:
       - offset: [4, 0]
         switch: { d: 80, w: 81, n: 82, e: 83, s: 84 }
       - switch: { d: 85, w: 86, n: 87, e: 88, s: 89 }
+  # Pinkie / Index
   - offset: [0, -3]
     row:
       - switch: { d: 30, e: 31, n: 32, w: 33, s: 34 }
       - offset: [4, 0]
-        switch: { d: 10, e: 11, n: 12, w: 13, s: 14 }
-      - switch: { d: 55, w: 56, n: 57, e: 58, s: 59 }
+        switch: { d: 15, e: 16, n: 17, w: 18, s: 19 }
+      - switch: { d: 60, w: 61, n: 62, e: 63, s: 64 }
       - offset: [4, 0]
         switch: { d: 75, w: 76, n: 77, e: 78, s: 79 }
+  # Thumbs
   - row:
       - offset: [5.5, 0.5]
-        switch: { d: 15, e: 16, n: 17, w: 18, s: 19 }
+        switch: { d: 10, e: 11, n: 12, w: 13, s: 14 }
       - offset: [1, 0.5]
-        switch: { d: 65, w: 66, n: 67, e: 68, s: 69 }
+        switch: { d: 55, w: 56, n: 57, e: 58, s: 59 }
   - row:
       - offset: [4.5, -0.25]
         switch: { d: 5, e: 6, n: 7, w: 8, s: 9 }
diff --git a/src/lib/serialization/visual-layout.ts b/src/lib/serialization/visual-layout.ts
index e447b07d..21f0e7ad 100644
--- a/src/lib/serialization/visual-layout.ts
+++ b/src/lib/serialization/visual-layout.ts
@@ -74,7 +74,7 @@ export function compileLayout(layout: VisualLayout): CompiledLayout {
       } else if ("switch" in info) {
         const cx = x + ox + 1
         const cy = y + oy + 1
-        for (const [i, id] of [info.switch.n, info.switch.e, info.switch.s, info.switch.w].entries()) {
+        for (const [i, id] of [info.switch.s, info.switch.w, info.switch.n, info.switch.e].entries()) {
           compiled.keys.push({
             id,
             shape: "quarter-circle",