diff --git a/packages/tamiko/config/index.js b/packages/tamiko/config/index.js
index 721732a8aef..fd6092486ba 100644
--- a/packages/tamiko/config/index.js
+++ b/packages/tamiko/config/index.js
@@ -11,14 +11,9 @@ export default {
   ],
   parts: ["top"],
   options: {
-    shoulderSlope: {
-      deg: 15,
-      min: 0,
-      max: 25
-    },
-    lengthBonus: {
-      pct: 13,
-      min: 0,
+    armholeDepthFactor: {
+      pct: 50,
+      min: 40,
       max: 60
     },
     chestEase: {
@@ -26,9 +21,14 @@ export default {
       min: 1,
       max: 20
     },
-    armholeDepth: {
-      pct: 50,
-      min: 40,
+    flare: {
+      deg: 15,
+      min: -10,
+      max: 30
+    },
+    lengthBonus: {
+      pct: 13,
+      min: 0,
       max: 60
     },
     shoulderseamLength: {
@@ -36,10 +36,10 @@ export default {
       min: 5,
       max: 25
     },
-    flare: {
+    shoulderSlope: {
       deg: 15,
-      min: -10,
-      max: 30
+      min: 0,
+      max: 25
     }
   }
 };
diff --git a/packages/tamiko/src/top.js b/packages/tamiko/src/top.js
index bbd46365985..f3bfe26b131 100644
--- a/packages/tamiko/src/top.js
+++ b/packages/tamiko/src/top.js
@@ -28,7 +28,7 @@ export default function(part) {
     (measurements.centerBackNeckToWaist + measurements.naturalWaistToHip);
 
   // Armhole depth
-  let arm = measurements.shoulderToShoulder * options.armholeDepth;
+  let arm = shoulders * options.armholeDepthFactor;
 
   // Shoulder seam length
   let shoulderseam = shoulders * options.shoulderseamLength;
@@ -42,17 +42,9 @@ export default function(part) {
   // Armhole
   points.bottomLeft = new Point(0, shoulders);
   points.armholeTop = new Point(shoulders / 4, shoulders);
-  points.armholeBottom = points.armholeTop.shift(
-    0,
-    shoulders * options.armholeDepth
-  );
-  points.armholePitch = points.armholeTop
-    .shift(0, (shoulders * options.armholeDepth) / 2)
-    .shift(90, (shoulders * options.armholeDepth) / 5);
-  points.armholePitchCp1 = points.armholePitch.shift(
-    180,
-    (shoulders * options.armholeDepth) / 2.5
-  );
+  points.armholeBottom = points.armholeTop.shift(0, arm);
+  points.armholePitch = points.armholeTop.shift(0, arm / 2).shift(90, arm / 5);
+  points.armholePitchCp1 = points.armholePitch.shift(180, arm / 2.5);
   points.armholePitchCp2 = points.armholePitchCp1.flipX(points.armholePitch);
 
   // Left shoulder seam
@@ -61,10 +53,7 @@ export default function(part) {
     .rotate(options.shoulderSlope, points.armholeTop);
 
   // Side seam
-  points.armgapBottom = points.armgapTop.shift(
-    0,
-    shoulders * options.armholeDepth
-  );
+  points.armgapBottom = points.armgapTop.shift(0, arm);
   points.armgapBottom = points.armholeBottom.shiftTowards(
     points.armgapBottom,
     chest