From d57644053aaea2963dcbef5d38395b4d423e5bad Mon Sep 17 00:00:00 2001
From: Joost De Cock <joost@decock.org>
Date: Sun, 29 Sep 2019 17:14:59 +0200
Subject: [PATCH 01/20] New translations patterns.yml (French)

---
 packages/i18n/src/locales/fr/patterns.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/i18n/src/locales/fr/patterns.yml b/packages/i18n/src/locales/fr/patterns.yml
index 7d98ef4c37c..6b869994c32 100644
--- a/packages/i18n/src/locales/fr/patterns.yml
+++ b/packages/i18n/src/locales/fr/patterns.yml
@@ -47,6 +47,9 @@ shin:
 simon:
   description: Simon est un modèle de chemise pour homme hautement adaptable.
   title: Chemise Simon
+simone:
+  description: Simone is simon, adapted for breasts
+  title: Simone shirt
 sven:
   description: Sven est un pull simple.
   title: Sweatshirt Sven

From 488bb6e34984439fe876681634ba4106471f341d Mon Sep 17 00:00:00 2001
From: Joost De Cock <joost@decock.org>
Date: Sun, 29 Sep 2019 17:15:00 +0200
Subject: [PATCH 02/20] New translations patterns.yml (Spanish)

---
 packages/i18n/src/locales/es/patterns.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/i18n/src/locales/es/patterns.yml b/packages/i18n/src/locales/es/patterns.yml
index 867ee35a8c4..4cc0f7321fe 100644
--- a/packages/i18n/src/locales/es/patterns.yml
+++ b/packages/i18n/src/locales/es/patterns.yml
@@ -47,6 +47,9 @@ shin:
 simon:
   description: Simon es un patrón de camisa de hombre con múltiples opciones.
   title: Simon shirt
+simone:
+  description: Simone is simon, adapted for breasts
+  title: Simone shirt
 sven:
   description: Sven es una sudadera de líneas sencillas.
   title: Sven sweatshirt

From 363062d1ec1fe80064424dcba62fe0269b2fe3ff Mon Sep 17 00:00:00 2001
From: Joost De Cock <joost@decock.org>
Date: Sun, 29 Sep 2019 17:15:01 +0200
Subject: [PATCH 03/20] New translations patterns.yml (German)

---
 packages/i18n/src/locales/de/patterns.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/i18n/src/locales/de/patterns.yml b/packages/i18n/src/locales/de/patterns.yml
index 95a6c6a6cd7..3928b802fe5 100644
--- a/packages/i18n/src/locales/de/patterns.yml
+++ b/packages/i18n/src/locales/de/patterns.yml
@@ -47,6 +47,9 @@ shin:
 simon:
   description: Simon ist ein sehr anpassungsfähiger Hemdenschnitt für Männer.
   title: Hemd Simon
+simone:
+  description: Simone is simon, adapted for breasts
+  title: Simone shirt
 sven:
   description: Sven ist ein geradliniges Sweatshirt.
   title: Sweatshirt Sven

From 292c19709f646c59ac37040e8056895ee68cb5e0 Mon Sep 17 00:00:00 2001
From: Joost De Cock <joost@decock.org>
Date: Sun, 29 Sep 2019 17:15:02 +0200
Subject: [PATCH 04/20] New translations patterns.yml (Dutch)

---
 packages/i18n/src/locales/nl/patterns.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/i18n/src/locales/nl/patterns.yml b/packages/i18n/src/locales/nl/patterns.yml
index 795a8b2a6f3..d7cd226ddfc 100644
--- a/packages/i18n/src/locales/nl/patterns.yml
+++ b/packages/i18n/src/locales/nl/patterns.yml
@@ -47,6 +47,9 @@ shin:
 simon:
   description: Simon is een enorm veelzijdig patroon voor een herenhemd.
   title: Simon hemd
+simone:
+  description: Simone is simon, adapted for breasts
+  title: Simone shirt
 sven:
   description: Sven is een no-nonsense basic trui.
   title: Sven sweater

From e0fa2be0d8d25f62450a410ece695149c6f89591 Mon Sep 17 00:00:00 2001
From: Joost De Cock <joost@decock.org>
Date: Sun, 29 Sep 2019 17:15:04 +0200
Subject: [PATCH 05/20] New translations simon.yml (French)

---
 packages/i18n/src/locales/fr/options/simon.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/i18n/src/locales/fr/options/simon.yml b/packages/i18n/src/locales/fr/options/simon.yml
index d9cf5bc251b..bb97b6fff99 100644
--- a/packages/i18n/src/locales/fr/options/simon.yml
+++ b/packages/i18n/src/locales/fr/options/simon.yml
@@ -1,4 +1,14 @@
 ---
+backDarts:
+  tile: Back darts
+  description: Whether or not to include back darts
+  options:
+    auto: Automatic
+    always: Always
+    never: Never
+backDartShaping:
+  title: Back dart shaping
+  description: The amount of shaping that is done by the back darts
 barrelCuffNarrowButton:
   title: Bouton de manche étroit
   description: Sert à inclure un bouton pour rendre les revers de manche plus étroits. Cette option n'est pertinente que pour les revers de manche classiques.

From 8de83db39eb5cb28d50a2d162020a7a52a366690 Mon Sep 17 00:00:00 2001
From: Joost De Cock <joost@decock.org>
Date: Sun, 29 Sep 2019 17:15:05 +0200
Subject: [PATCH 06/20] New translations simon.yml (Spanish)

---
 packages/i18n/src/locales/es/options/simon.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/i18n/src/locales/es/options/simon.yml b/packages/i18n/src/locales/es/options/simon.yml
index 290fec62eaf..ee08ee8f42d 100644
--- a/packages/i18n/src/locales/es/options/simon.yml
+++ b/packages/i18n/src/locales/es/options/simon.yml
@@ -1,4 +1,14 @@
 ---
+backDarts:
+  tile: Back darts
+  description: Whether or not to include back darts
+  options:
+    auto: Automatic
+    always: Always
+    never: Never
+backDartShaping:
+  title: Back dart shaping
+  description: The amount of shaping that is done by the back darts
 barrelCuffNarrowButton:
   title: Botón de ajuste del puño
   description: Incluír o no un botón extra para ajustar más los puños. Esta opción sólo es relevante para puños de barril.

From db9ecf565d5c13c6910d1e9bb861e33e8015d00f Mon Sep 17 00:00:00 2001
From: Joost De Cock <joost@decock.org>
Date: Sun, 29 Sep 2019 17:15:06 +0200
Subject: [PATCH 07/20] New translations simon.yml (German)

---
 packages/i18n/src/locales/de/options/simon.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/i18n/src/locales/de/options/simon.yml b/packages/i18n/src/locales/de/options/simon.yml
index 07442be2398..876378959c9 100644
--- a/packages/i18n/src/locales/de/options/simon.yml
+++ b/packages/i18n/src/locales/de/options/simon.yml
@@ -1,4 +1,14 @@
 ---
+backDarts:
+  tile: Back darts
+  description: Whether or not to include back darts
+  options:
+    auto: Automatic
+    always: Always
+    never: Never
+backDartShaping:
+  title: Back dart shaping
+  description: The amount of shaping that is done by the back darts
 barrelCuffNarrowButton:
   title: Manschette schmaler Knopf
   description: Gibt an, ob Sie einen Knopf hinzufügen, um die Manschetten enger zu binden. Diese Option ist nur für Fassmanschetten relevant.

From c892d62cd860b2458bda7d9dca532b8be1047c74 Mon Sep 17 00:00:00 2001
From: Joost De Cock <joost@decock.org>
Date: Sun, 29 Sep 2019 17:15:07 +0200
Subject: [PATCH 08/20] New translations simon.yml (Dutch)

---
 packages/i18n/src/locales/nl/options/simon.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/i18n/src/locales/nl/options/simon.yml b/packages/i18n/src/locales/nl/options/simon.yml
index 99dad8f9b80..6855c435a7f 100644
--- a/packages/i18n/src/locales/nl/options/simon.yml
+++ b/packages/i18n/src/locales/nl/options/simon.yml
@@ -1,4 +1,14 @@
 ---
+backDarts:
+  tile: Back darts
+  description: Whether or not to include back darts
+  options:
+    auto: Automatic
+    always: Always
+    never: Never
+backDartShaping:
+  title: Back dart shaping
+  description: The amount of shaping that is done by the back darts
 barrelCuffNarrowButton:
   title: Extra knoop manchet
   description: Of je al dan niet een knoop wil om de manchetten smaller te maken. Deze optie is enkel relevant bij klassieke manchetten (zonder manchetknopen).

From 62f9e14bedeee1b788dbe1c792a0200fa339c470 Mon Sep 17 00:00:00 2001
From: Joost De Cock <joost@decock.org>
Date: Sun, 29 Sep 2019 17:15:07 +0200
Subject: [PATCH 09/20] New translations huey.yml (French)

---
 packages/i18n/src/locales/fr/options/huey.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/i18n/src/locales/fr/options/huey.yml b/packages/i18n/src/locales/fr/options/huey.yml
index 9dfbcd8f0c3..977bd5aede2 100644
--- a/packages/i18n/src/locales/fr/options/huey.yml
+++ b/packages/i18n/src/locales/fr/options/huey.yml
@@ -1,7 +1,7 @@
 ---
 pocket:
   title: Poche
-  description: S'il faut inclure une poche ou non
+  description: Whether to include a front pocket or not
 pocketHeight:
   title: Hauteur de la poche
   description: Contrôle la hauteur de la poche

From 0d791f02a7ce9fa6b2d0bd3e1b92539d1be0e182 Mon Sep 17 00:00:00 2001
From: Joost De Cock <joost@decock.org>
Date: Sun, 29 Sep 2019 17:15:09 +0200
Subject: [PATCH 10/20] New translations huey.yml (Spanish)

---
 packages/i18n/src/locales/es/options/huey.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/i18n/src/locales/es/options/huey.yml b/packages/i18n/src/locales/es/options/huey.yml
index 66c33880ad5..bdeddda2365 100644
--- a/packages/i18n/src/locales/es/options/huey.yml
+++ b/packages/i18n/src/locales/es/options/huey.yml
@@ -1,7 +1,7 @@
 ---
 pocket:
   title: Bolsillo
-  description: Ya sea para incluir un bolsillo o no
+  description: Whether to include a front pocket or not
 pocketHeight:
   title: Altura de bolsillo
   description: Controla la altura del bolsillo

From 090311902ff89b58e935e9505ab0cfafab0db235 Mon Sep 17 00:00:00 2001
From: Joost De Cock <joost@decock.org>
Date: Sun, 29 Sep 2019 17:15:10 +0200
Subject: [PATCH 11/20] New translations huey.yml (German)

---
 packages/i18n/src/locales/de/options/huey.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/i18n/src/locales/de/options/huey.yml b/packages/i18n/src/locales/de/options/huey.yml
index 27cc3d6fc4e..74a2be13147 100644
--- a/packages/i18n/src/locales/de/options/huey.yml
+++ b/packages/i18n/src/locales/de/options/huey.yml
@@ -1,7 +1,7 @@
 ---
 pocket:
   title: Tasche
-  description: Gibt an, ob eine Tasche hinzugefügt werden soll
+  description: Whether to include a front pocket or not
 pocketHeight:
   title: Taschenhöhe
   description: Steuert die Höhe der Tasche

From b181cdebe7ec2b142a83a8d3a2b4b30e6d34815c Mon Sep 17 00:00:00 2001
From: Joost De Cock <joost@decock.org>
Date: Sun, 29 Sep 2019 17:15:11 +0200
Subject: [PATCH 12/20] New translations huey.yml (Dutch)

---
 packages/i18n/src/locales/nl/options/huey.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/i18n/src/locales/nl/options/huey.yml b/packages/i18n/src/locales/nl/options/huey.yml
index 1ee816e2d1c..ceb6d745204 100644
--- a/packages/i18n/src/locales/nl/options/huey.yml
+++ b/packages/i18n/src/locales/nl/options/huey.yml
@@ -1,7 +1,7 @@
 ---
 pocket:
   title: Zak
-  description: Of een zak moet worden toegevoegd of niet
+  description: Whether to include a front pocket or not
 pocketHeight:
   title: Zak hoogte
   description: Bepaalt de hoogte van de zak

From 9688ace6c39f97fb60de5236d7453a9e96093e64 Mon Sep 17 00:00:00 2001
From: Joost De Cock <joost@decock.org>
Date: Sun, 29 Sep 2019 17:24:27 +0200
Subject: [PATCH 13/20] New translations simone.yml (French)

---
 packages/i18n/src/locales/fr/options/simone.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 packages/i18n/src/locales/fr/options/simone.yml

diff --git a/packages/i18n/src/locales/fr/options/simone.yml b/packages/i18n/src/locales/fr/options/simone.yml
new file mode 100644
index 00000000000..2476f69fcc7
--- /dev/null
+++ b/packages/i18n/src/locales/fr/options/simone.yml
@@ -0,0 +1,16 @@
+---
+bustDartAngle:
+  title: Bust dart angle
+  description: Controls the angle by which the (side) bust dart slopes downward
+bustDartLength:
+  title: Bust dart length
+  description: Controls how close the bust dart approaches the bust point
+contour:
+  title: Contour
+  description: Controls how sharply the extra room for breasts is removed again below the chest
+frontDarts:
+  title: Front darts
+  description: Whether to include front darts or not
+frontDartLength:
+  title: Front dart length
+  description: Controls how close the front dart approaches the bust point

From baac959f7fc825d5c78fad998c722238ebe0d7ec Mon Sep 17 00:00:00 2001
From: Joost De Cock <joost@decock.org>
Date: Sun, 29 Sep 2019 17:24:29 +0200
Subject: [PATCH 14/20] New translations simone.yml (Spanish)

---
 packages/i18n/src/locales/es/options/simone.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 packages/i18n/src/locales/es/options/simone.yml

diff --git a/packages/i18n/src/locales/es/options/simone.yml b/packages/i18n/src/locales/es/options/simone.yml
new file mode 100644
index 00000000000..2476f69fcc7
--- /dev/null
+++ b/packages/i18n/src/locales/es/options/simone.yml
@@ -0,0 +1,16 @@
+---
+bustDartAngle:
+  title: Bust dart angle
+  description: Controls the angle by which the (side) bust dart slopes downward
+bustDartLength:
+  title: Bust dart length
+  description: Controls how close the bust dart approaches the bust point
+contour:
+  title: Contour
+  description: Controls how sharply the extra room for breasts is removed again below the chest
+frontDarts:
+  title: Front darts
+  description: Whether to include front darts or not
+frontDartLength:
+  title: Front dart length
+  description: Controls how close the front dart approaches the bust point

From aa1e7d70f8e0780d0d03b5bcf1b144d0b111757c Mon Sep 17 00:00:00 2001
From: Joost De Cock <joost@decock.org>
Date: Sun, 29 Sep 2019 17:24:30 +0200
Subject: [PATCH 15/20] New translations simone.yml (German)

---
 packages/i18n/src/locales/de/options/simone.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 packages/i18n/src/locales/de/options/simone.yml

diff --git a/packages/i18n/src/locales/de/options/simone.yml b/packages/i18n/src/locales/de/options/simone.yml
new file mode 100644
index 00000000000..2476f69fcc7
--- /dev/null
+++ b/packages/i18n/src/locales/de/options/simone.yml
@@ -0,0 +1,16 @@
+---
+bustDartAngle:
+  title: Bust dart angle
+  description: Controls the angle by which the (side) bust dart slopes downward
+bustDartLength:
+  title: Bust dart length
+  description: Controls how close the bust dart approaches the bust point
+contour:
+  title: Contour
+  description: Controls how sharply the extra room for breasts is removed again below the chest
+frontDarts:
+  title: Front darts
+  description: Whether to include front darts or not
+frontDartLength:
+  title: Front dart length
+  description: Controls how close the front dart approaches the bust point

From 2e625a7d382b38357228e76aafd53b7f9c28d4f7 Mon Sep 17 00:00:00 2001
From: Joost De Cock <joost@decock.org>
Date: Sun, 29 Sep 2019 17:24:31 +0200
Subject: [PATCH 16/20] New translations simone.yml (Dutch)

---
 packages/i18n/src/locales/nl/options/simone.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 packages/i18n/src/locales/nl/options/simone.yml

diff --git a/packages/i18n/src/locales/nl/options/simone.yml b/packages/i18n/src/locales/nl/options/simone.yml
new file mode 100644
index 00000000000..2476f69fcc7
--- /dev/null
+++ b/packages/i18n/src/locales/nl/options/simone.yml
@@ -0,0 +1,16 @@
+---
+bustDartAngle:
+  title: Bust dart angle
+  description: Controls the angle by which the (side) bust dart slopes downward
+bustDartLength:
+  title: Bust dart length
+  description: Controls how close the bust dart approaches the bust point
+contour:
+  title: Contour
+  description: Controls how sharply the extra room for breasts is removed again below the chest
+frontDarts:
+  title: Front darts
+  description: Whether to include front darts or not
+frontDartLength:
+  title: Front dart length
+  description: Controls how close the front dart approaches the bust point

From f797812aed8415b3515ef958a4d119049989e98c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 30 Sep 2019 05:11:14 +0000
Subject: [PATCH 17/20] :arrow_up: Bump mocha from 6.2.0 to 6.2.1

Bumps [mocha](https://github.com/mochajs/mocha) from 6.2.0 to 6.2.1.
- [Release notes](https://github.com/mochajs/mocha/releases)
- [Changelog](https://github.com/mochajs/mocha/blob/v6.2.1/CHANGELOG.md)
- [Commits](https://github.com/mochajs/mocha/compare/v6.2.0...v6.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 yarn.lock | 181 +++++++++++++++++++++++-------------------------------
 1 file changed, 78 insertions(+), 103 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 7e183bd63ae..3c141e7dfcd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1314,148 +1314,148 @@
     which "^1.3.1"
 
 "@freesewing/aaron@file:packages/aaron":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@freesewing/bent@file:packages/bent":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@freesewing/brian@file:packages/brian":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@freesewing/bruce@file:packages/bruce":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@freesewing/carlita@file:packages/carlita":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@freesewing/carlton@file:packages/carlton":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@freesewing/cathrin@file:packages/cathrin":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@freesewing/components@file:packages/components":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@freesewing/core@file:packages/core":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
   dependencies:
     bezier-js "^2.2.13"
     bin-pack "1.0.2"
     hooks "^0.3.2"
 
 "@freesewing/css-theme@file:packages/css-theme":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
   dependencies:
     open-color "1.6.3"
 
 "@freesewing/examples@file:packages/examples":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@freesewing/florent@file:packages/florent":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@freesewing/huey@file:packages/huey":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@freesewing/hugo@file:packages/hugo":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@freesewing/i18n@file:packages/i18n":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@freesewing/jaeger@file:packages/jaeger":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@freesewing/models@file:packages/models":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@freesewing/mui-theme@file:packages/mui-theme":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@freesewing/plugin-banner@file:packages/plugin-banner":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@freesewing/plugin-bundle@file:packages/plugin-bundle":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
   dependencies:
-    "@freesewing/plugin-cutonfold" "^2.0.3"
-    "@freesewing/plugin-dimension" "^2.0.3"
-    "@freesewing/plugin-grainline" "^2.0.3"
-    "@freesewing/plugin-logo" "^2.0.3"
-    "@freesewing/plugin-round" "^2.0.3"
-    "@freesewing/plugin-scalebox" "^2.0.3"
-    "@freesewing/plugin-sprinkle" "^2.0.3"
-    "@freesewing/plugin-title" "^2.0.3"
+    "@freesewing/plugin-cutonfold" "^2.1.0-alpha.0"
+    "@freesewing/plugin-dimension" "^2.1.0-alpha.0"
+    "@freesewing/plugin-grainline" "^2.1.0-alpha.0"
+    "@freesewing/plugin-logo" "^2.1.0-alpha.0"
+    "@freesewing/plugin-round" "^2.1.0-alpha.0"
+    "@freesewing/plugin-scalebox" "^2.1.0-alpha.0"
+    "@freesewing/plugin-sprinkle" "^2.1.0-alpha.0"
+    "@freesewing/plugin-title" "^2.1.0-alpha.0"
 
 "@freesewing/plugin-bust@file:packages/plugin-bust":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@freesewing/plugin-buttons@file:packages/plugin-buttons":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@freesewing/plugin-cutonfold@file:packages/plugin-cutonfold":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@freesewing/plugin-debug@file:packages/plugin-debug":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@freesewing/plugin-designer@file:packages/plugin-designer":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@freesewing/plugin-dimension@file:packages/plugin-dimension":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@freesewing/plugin-flip@file:packages/plugin-flip":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@freesewing/plugin-grainline@file:packages/plugin-grainline":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@freesewing/plugin-i18n@file:packages/plugin-i18n":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@freesewing/plugin-logo@file:packages/plugin-logo":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@freesewing/plugin-round@file:packages/plugin-round":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@freesewing/plugin-scalebox@file:packages/plugin-scalebox":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@freesewing/plugin-sprinkle@file:packages/plugin-sprinkle":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@freesewing/plugin-svgattr@file:packages/plugin-svgattr":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@freesewing/plugin-theme@file:packages/plugin-theme":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@freesewing/plugin-title@file:packages/plugin-title":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@freesewing/plugin-validate@file:packages/plugin-validate":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@freesewing/shin@file:packages/shin":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@freesewing/simon@file:packages/simon":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@freesewing/sven@file:packages/sven":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@freesewing/tamiko@file:packages/tamiko":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@freesewing/trayvon@file:packages/trayvon":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@freesewing/wahid@file:packages/wahid":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
 
 "@hapi/address@2.x.x":
   version "2.0.0"
@@ -6666,10 +6666,10 @@ create-error-class@^3.0.0:
     capture-stack-trace "^1.0.0"
 
 "create-freesewing-pattern@file:packages/create-freesewing-pattern":
-  version "2.0.3"
+  version "2.1.0-alpha.0"
   dependencies:
-    "@freesewing/i18n" "^2.0.3"
-    "@freesewing/pattern-info" "^2.0.3"
+    "@freesewing/i18n" "^2.1.0-alpha.0"
+    "@freesewing/pattern-info" "^2.1.0-alpha.0"
     chalk "^2.4.2"
     commander "^2.19.0"
     conf "^2.2.0"
@@ -13269,9 +13269,9 @@ mkpath@^1.0.0:
   integrity sha1-67Opd+evHGg65v2hK1Raa6bFhT0=
 
 mocha@^6.1.4:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-6.2.0.tgz#f896b642843445d1bb8bca60eabd9206b8916e56"
-  integrity sha512-qwfFgY+7EKAAUAdv7VYMZQknI7YJSGesxHyhn6qD52DV8UcSZs5XwCifcZGMVIE4a5fbmhvbotxC0DLQ0oKohQ==
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-6.2.1.tgz#da941c99437da9bac412097859ff99543969f94c"
+  integrity sha512-VCcWkLHwk79NYQc8cxhkmI8IigTIhsCwZ6RTxQsqK6go4UvEhzJkYuHm8B2YtlSxcYq2fY+ucr4JBwoD6ci80A==
   dependencies:
     ansi-colors "3.2.3"
     browser-stdout "1.3.1"
@@ -13293,9 +13293,9 @@ mocha@^6.1.4:
     supports-color "6.0.0"
     which "1.3.1"
     wide-align "1.1.3"
-    yargs "13.2.2"
-    yargs-parser "13.0.0"
-    yargs-unparser "1.5.0"
+    yargs "13.3.0"
+    yargs-parser "13.1.1"
+    yargs-unparser "1.6.0"
 
 modify-values@^1.0.0:
   version "1.0.1"
@@ -14304,7 +14304,7 @@ os-locale@^2.0.0:
     lcid "^1.0.0"
     mem "^1.1.0"
 
-os-locale@^3.0.0, os-locale@^3.1.0:
+os-locale@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
   integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
@@ -20449,10 +20449,10 @@ yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
   integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==
 
-yargs-parser@13.0.0:
-  version "13.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.0.0.tgz#3fc44f3e76a8bdb1cc3602e860108602e5ccde8b"
-  integrity sha512-w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw==
+yargs-parser@13.1.1, yargs-parser@^13.0.0, yargs-parser@^13.1.1:
+  version "13.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0"
+  integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==
   dependencies:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
@@ -20472,14 +20472,6 @@ yargs-parser@^11.1.1:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^13.0.0, yargs-parser@^13.1.1:
-  version "13.1.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0"
-  integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
 yargs-parser@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
@@ -20494,14 +20486,14 @@ yargs-parser@^9.0.2:
   dependencies:
     camelcase "^4.1.0"
 
-yargs-unparser@1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-1.5.0.tgz#f2bb2a7e83cbc87bb95c8e572828a06c9add6e0d"
-  integrity sha512-HK25qidFTCVuj/D1VfNiEndpLIeJN78aqgR23nL3y4N0U/91cOAzqfHlF8n2BvoNDcZmJKin3ddNSvOxSr8flw==
+yargs-unparser@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-1.6.0.tgz#ef25c2c769ff6bd09e4b0f9d7c605fb27846ea9f"
+  integrity sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==
   dependencies:
     flat "^4.1.0"
-    lodash "^4.17.11"
-    yargs "^12.0.5"
+    lodash "^4.17.15"
+    yargs "^13.3.0"
 
 yargs@12.0.2:
   version "12.0.2"
@@ -20521,22 +20513,21 @@ yargs@12.0.2:
     y18n "^3.2.1 || ^4.0.0"
     yargs-parser "^10.1.0"
 
-yargs@13.2.2:
-  version "13.2.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.2.tgz#0c101f580ae95cea7f39d927e7770e3fdc97f993"
-  integrity sha512-WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA==
+yargs@13.3.0, yargs@^13.2.2, yargs@^13.2.4, yargs@^13.3.0:
+  version "13.3.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83"
+  integrity sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==
   dependencies:
-    cliui "^4.0.0"
+    cliui "^5.0.0"
     find-up "^3.0.0"
     get-caller-file "^2.0.1"
-    os-locale "^3.1.0"
     require-directory "^2.1.1"
     require-main-filename "^2.0.0"
     set-blocking "^2.0.0"
     string-width "^3.0.0"
     which-module "^2.0.0"
     y18n "^4.0.0"
-    yargs-parser "^13.0.0"
+    yargs-parser "^13.1.1"
 
 yargs@^11.0.0:
   version "11.1.0"
@@ -20556,7 +20547,7 @@ yargs@^11.0.0:
     y18n "^3.2.1"
     yargs-parser "^9.0.2"
 
-yargs@^12.0.1, yargs@^12.0.5:
+yargs@^12.0.1:
   version "12.0.5"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
   integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
@@ -20574,22 +20565,6 @@ yargs@^12.0.1, yargs@^12.0.5:
     y18n "^3.2.1 || ^4.0.0"
     yargs-parser "^11.1.1"
 
-yargs@^13.2.2, yargs@^13.2.4, yargs@^13.3.0:
-  version "13.3.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83"
-  integrity sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==
-  dependencies:
-    cliui "^5.0.0"
-    find-up "^3.0.0"
-    get-caller-file "^2.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^3.0.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^13.1.1"
-
 yargs@^7.0.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"

From 9fcc21aef49528fab1c7ec13e633683c13814ba6 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 30 Sep 2019 05:38:16 +0000
Subject: [PATCH 18/20] :arrow_up: Bump bezier-js from 2.4.0 to 2.4.4

Bumps [bezier-js](https://github.com/Pomax/bezierjs) from 2.4.0 to 2.4.4.
- [Release notes](https://github.com/Pomax/bezierjs/releases)
- [Commits](https://github.com/Pomax/bezierjs/compare/v2.4.0...v2.4.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 packages/core/package-lock.json | 8 ++++----
 yarn.lock                       | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/core/package-lock.json b/packages/core/package-lock.json
index 7324c4c2655..c0c4d9c4eaf 100644
--- a/packages/core/package-lock.json
+++ b/packages/core/package-lock.json
@@ -1,13 +1,13 @@
 {
   "name": "@freesewing/core",
-  "version": "2.0.0-beta.33",
+  "version": "2.1.0-alpha.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
     "bezier-js": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/bezier-js/-/bezier-js-2.4.0.tgz",
-      "integrity": "sha512-ttwqGL47RtYOoZy10oFJZ1VlEC6w1eJW1xMPBAvEx57cTWgmaJNr/c2ZLMr/O2RD50saR0OaLBIpgyZ7rkHLSw=="
+      "version": "2.4.4",
+      "resolved": "https://registry.npmjs.org/bezier-js/-/bezier-js-2.4.4.tgz",
+      "integrity": "sha512-qYC9FBubdTK4VZe0m+lS7lEpf87w1fnm6g2m1FKsnlz+wfNnJy3gjQt4Y5nnI1NrjJrnQqnZt3S6Z5qjhloDNA=="
     },
     "bin-pack": {
       "version": "1.0.2",
diff --git a/yarn.lock b/yarn.lock
index 3c141e7dfcd..5ce74a01a19 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5086,9 +5086,9 @@ before-after-hook@^2.0.0:
   integrity sha512-IWIbu7pMqyw3EAJHzzHbWa85b6oud/yfKYg5rqB5hNE8CeMi3nX+2C2sj0HswfblST86hpVEOAb9x34NZd6P7A==
 
 bezier-js@^2.2.13:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/bezier-js/-/bezier-js-2.4.0.tgz#8fb65113e01c7d3e443aa9fd66921478befc24a0"
-  integrity sha512-ttwqGL47RtYOoZy10oFJZ1VlEC6w1eJW1xMPBAvEx57cTWgmaJNr/c2ZLMr/O2RD50saR0OaLBIpgyZ7rkHLSw==
+  version "2.4.4"
+  resolved "https://registry.yarnpkg.com/bezier-js/-/bezier-js-2.4.4.tgz#2859edc31e1b1c287ba4788dcccd5d23838c4578"
+  integrity sha512-qYC9FBubdTK4VZe0m+lS7lEpf87w1fnm6g2m1FKsnlz+wfNnJy3gjQt4Y5nnI1NrjJrnQqnZt3S6Z5qjhloDNA==
 
 big.js@^3.1.3:
   version "3.2.0"

From 638e15ed0bebdc63647220ee6b15d45ab264a36d Mon Sep 17 00:00:00 2001
From: woutervdub <wouter.vdub@yahoo.com>
Date: Tue, 1 Oct 2019 12:43:10 -0700
Subject: [PATCH 19/20] Fixed Benjamin issues

---
 packages/benjamin/config/index.js  | 19 +++++----
 packages/benjamin/src/base.js      | 65 +++++++++++++-----------------
 packages/benjamin/src/bow1.js      | 49 ++++++++++++++++++++--
 packages/benjamin/src/bow2.js      | 51 ++++++++++++++++++++---
 packages/benjamin/src/bow3.js      | 51 +++++++++++++++++++++--
 packages/benjamin/src/ribbon.js    | 12 +++---
 packages/penelope/src/waistband.js |  9 ++++-
 packages/waralee/src/facings.js    |  8 ++--
 8 files changed, 194 insertions(+), 70 deletions(-)

diff --git a/packages/benjamin/config/index.js b/packages/benjamin/config/index.js
index 8def710629b..3aca0bad135 100644
--- a/packages/benjamin/config/index.js
+++ b/packages/benjamin/config/index.js
@@ -10,7 +10,7 @@ export default {
   difficulty: 3,
   tags: ['top', 'basics'],
   optionGroups: {
-    fit: ['collarEase', 'adjustmentRibbon', 'bandLength'],
+    fit: ['collarEase', 'adjustmentRibbon'],
     style: ['tipWidth', 'knotWidth', 'bowLength', 'bowStyle', 'endStyle']
   },
   measurements: ['neckCircumference'],
@@ -23,20 +23,16 @@ export default {
   hide: ['base'],
   parts: ['ribbon'],
   options: {
-    transitionLength: 0.7, // 70% of bandLength
-    bandLength: {
-      pct: 17,
-      min: 15,
-      max: 20
-    },
+    transitionLength: 2, //Twice the knot
+    bandLength: 0.17,
     ribbonWidth: {
       pct: 6,
-      min: 4,
+      min: 5,
       max: 8
     },
     tipWidth: {
       pct: 15,
-      min: 10,
+      min: 0,
       max: 20
     },
     knotWidth: {
@@ -62,6 +58,9 @@ export default {
       dflt: 'straight',
       list: ['straight', 'pointed', 'rounded']
     },
-    adjustmentRibbon: { bool: false }
+    adjustmentRibbon: {
+      bool: false
+    },
+    adjustmentRibbonWidth: 20
   }
 }
diff --git a/packages/benjamin/src/base.js b/packages/benjamin/src/base.js
index ebcd4f9b270..77239d24bd4 100644
--- a/packages/benjamin/src/base.js
+++ b/packages/benjamin/src/base.js
@@ -27,12 +27,18 @@ export default function(part) {
   ])
     store.set(option, measurements.neckCircumference * options[option])
 
-  // For easy access
-  const knot = store.get('knotWidth')
+  if (options.adjustmentRibbon) {
+    store.set('ribbonWidth', Math.max(options.adjustmentRibbonWidth, store.get('ribbonWidth')))
+  }
   const ribbon = store.get('ribbonWidth')
+  store.set('knotWidth', Math.max(ribbon, store.get('knotWidth')))
+  const knot = store.get('knotWidth')
+  store.set('tipWidth', Math.max(knot, store.get('tipWidth')))
+
+  // For easy access
   const tip = store.get('tipWidth')
   const band = store.get('bandLength')
-  const transition = band * options.transitionLength
+  const transition = knot * options.transitionLength
   const bow = store.get('bowLength')
 
   // Points
@@ -55,7 +61,6 @@ export default function(part) {
     points.tip = new Point(points.tip2Bottom.x + points.tip2Bottom.y, 0)
   } else points.tip = new Point(points.tip2Bottom.x, 0)
 
-  points.grainlineStart = new Point(0, 0)
   points.titleAnchor = new Point(points.tip1Top.x, 0)
 
   // Paths
@@ -93,6 +98,9 @@ export default function(part) {
       points.transitionBottomRight,
       cpl
     )
+    if (points.transitionBottomRightCp2.y > points.tip1Bottom.y)
+      points.transitionBottomRightCp2.y = points.tip1Bottom.y
+
     points.transitionTopRightCp1 = points.transitionBottomRightCp2.flipY()
     points.tip1TopCp2 = points.tip1Top.shift(180, cpl)
     points.tip1TopCp1 = points.tip1Top.shift(0, cpl)
@@ -105,10 +113,8 @@ export default function(part) {
     points.tip2TopCp2 = points.tip2Top.shift(180, cpl)
     points.tip2BottomCp1 = points.tip2Bottom.shift(180, cpl)
 
-    paths.seam = new Path()
-      .move(points.bandTopLeft)
-      .line(points.bandBottomLeft)
-      .line(points.bandBottomRight)
+    paths.bow = new Path()
+      .move(points.bandBottomRight)
       .line(points.transitionBottomRight)
       .curve(points.transitionBottomRightCp2, points.tip1BottomCp1, points.tip1Bottom)
       .curve(points.tip1BottomCp2, points.knotBottomCp1, points.knotBottom)
@@ -119,46 +125,34 @@ export default function(part) {
       .curve(points.knotTopCp2, points.tip1TopCp1, points.tip1Top)
       .curve(points.tip1TopCp2, points.transitionTopRightCp1, points.transitionTopRight)
       .line(points.bandTopRight)
-      .line(points.bandTopLeft)
-      .close()
+      .setRender(false)
   } else {
-    paths.seam = new Path()
-      .move(points.bandTopLeft)
-      .line(points.bandBottomLeft)
-      .line(points.bandBottomRight)
+    paths.bow = new Path()
+      .move(points.bandBottomRight)
       .line(points.transitionBottomRight)
       .line(points.tip2Bottom)
       .join(paths.cap)
       .line(points.tip2Top)
       .line(points.transitionTopRight)
       .line(points.bandTopRight)
-      .line(points.bandTopLeft)
-      .close()
+      .setRender(false)
   }
 
-  paths.seam.attr('class', 'fabric')
-
   // Complete?
   if (complete) {
-    if (sa) paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa')
-
-    macro('grainline', {
-      from: points.grainlineStart,
-      to: points.tip
-    })
     points.logoAnchor = points.tip.shift(180, 20)
-    snippets.logo = new Snippet('logo', points.logoAnchor).attr('data-scale', 0.5)
+    snippets.logo = new Snippet('logo', points.logoAnchor).attr('data-scale', tip / 120)
 
     // Paperless?
     if (paperless) {
-      let baseY = points.tip2Bottom.y + 15 + sa
+      let baseY = points.tip2Bottom.y + sa
+      macro('hd', {
+        from: points.knotBottom,
+        to: points.tip2Bottom,
+        y: baseY
+      })
+      baseY += 15
       if (options.bowStyle === 'butterfly' || options.bowStyle === 'diamond') {
-        macro('hd', {
-          from: points.knotBottom,
-          to: points.tip2Bottom,
-          y: baseY
-        })
-        baseY += 15
         macro('hd', {
           from: points.tip1Bottom,
           to: points.tip2Bottom,
@@ -182,11 +176,8 @@ export default function(part) {
         y: baseY
       })
       baseY += 15
-      macro('hd', {
-        from: points.bandBottomLeft,
-        to: points.tip2Bottom,
-        y: baseY
-      })
+      store.set('baseY', baseY)
+
       macro('vd', {
         from: points.bandBottomRight,
         to: points.bandTopRight
diff --git a/packages/benjamin/src/bow1.js b/packages/benjamin/src/bow1.js
index 6aef8e6b0da..932756abdd9 100644
--- a/packages/benjamin/src/bow1.js
+++ b/packages/benjamin/src/bow1.js
@@ -1,15 +1,56 @@
 export default function(part) {
-  let { complete, macro, points, paths, sa } = part.shorthand()
+  let {
+    options,
+    Point,
+    points,
+    Path,
+    paths,
+    complete,
+    macro,
+    sa,
+    store,
+    paperless
+  } = part.shorthand()
 
-  paths.seam.render = true
+  points.bandBottomLeft = points.bandBottomLeft.shift(0, 0)
+  points.bandTopLeft = points.bandBottomLeft.flipY()
+
+  points.grainlineStart = new Point(0, 0)
+
+  macro('grainline', {
+    from: points.grainlineStart,
+    to: points.tip.shift(180, 20)
+  })
+
+  paths.seam = new Path()
+    .move(points.bandTopLeft)
+    .line(points.bandBottomLeft)
+    .join(paths.bow)
+    .line(points.bandTopLeft)
+    .close()
+    .attr('class', 'fabric')
+    .setRender(true)
 
   if (complete) {
-    if (sa) paths.sa.render = true
+    // Paperless?
+    if (paperless) {
+      macro('hd', {
+        from: points.bandBottomLeft,
+        to: points.tip2Bottom,
+        y: store.get('baseY')
+      })
+    }
+    if (sa) {
+      paths.sa = paths.seam
+        .offset(sa)
+        .attr('class', 'fabric sa')
+        .setRender(true)
+    }
     macro('title', {
       at: points.titleAnchor,
       nr: 1,
       title: 'bowTie',
-      scale: 0.8
+      scale: (store.get('tipWidth')/75)
     })
     points.scaleboxAnchor = points.bandTopLeft.shift(30, 80)
     macro('scalebox', { at: points.scaleboxAnchor })
diff --git a/packages/benjamin/src/bow2.js b/packages/benjamin/src/bow2.js
index b518dd22587..393769d5948 100644
--- a/packages/benjamin/src/bow2.js
+++ b/packages/benjamin/src/bow2.js
@@ -1,20 +1,61 @@
 export default function(part) {
-  let { options, points, paths, complete, macro, sa } = part.shorthand()
+  let {
+    options,
+    Point,
+    points,
+    Path,
+    paths,
+    complete,
+    macro,
+    sa,
+    store,
+    paperless
+  } = part.shorthand()
 
-  if (options.adjustmentRibbon) {
+  if (!options.adjustmentRibbon) {
     part.render = false
     return part
   }
 
-  paths.seam.render = true
+  points.bandBottomLeft = points.bandBottomLeft.shift(180, 90)
+  points.bandTopLeft = points.bandBottomLeft.flipY()
+
+  points.grainlineStart = new Point(-90, 0)
+
+  macro('grainline', {
+    from: points.grainlineStart,
+    to: points.tip.shift(180, 20)
+  })
+
+  paths.seam = new Path()
+    .move(points.bandTopLeft)
+    .line(points.bandBottomLeft)
+    .join(paths.bow)
+    .line(points.bandTopLeft)
+    .close()
+    .attr('class', 'fabric')
+    .setRender(true)
 
   if (complete) {
-    if (sa) paths.sa.render = true
+    // Paperless?
+    if (paperless) {
+      macro('hd', {
+        from: points.bandBottomLeft,
+        to: points.tip2Bottom,
+        y: store.get('baseY')
+      })
+    }
+    if (sa) {
+      paths.sa = paths.seam
+        .offset(sa)
+        .attr('class', 'fabric sa')
+        .setRender(true)
+    }
     macro('title', {
       at: points.titleAnchor,
       nr: 2,
       title: 'bowTie',
-      scale: 0.8
+      scale: (store.get('tipWidth')/75)
     })
   }
 
diff --git a/packages/benjamin/src/bow3.js b/packages/benjamin/src/bow3.js
index 4a9e7a612ea..2152c339930 100644
--- a/packages/benjamin/src/bow3.js
+++ b/packages/benjamin/src/bow3.js
@@ -1,18 +1,61 @@
 export default function(part) {
-  let { options, points, paths, complete, macro, sa } = part.shorthand()
+  let {
+    options,
+    Point,
+    points,
+    Path,
+    paths,
+    complete,
+    macro,
+    sa,
+    store,
+    paperless
+  } = part.shorthand()
 
-  if (options.adjustmentRibbon) {
+  if (!options.adjustmentRibbon) {
     part.render = false
     return part
   }
 
+  points.bandBottomLeft = points.bandBottomLeft.shift(180, 290)
+  points.bandTopLeft = points.bandBottomLeft.flipY()
+
+  points.grainlineStart = new Point(-290, 0)
+
+  macro('grainline', {
+    from: points.grainlineStart,
+    to: points.tip.shift(180, 20)
+  })
+
+  paths.seam = new Path()
+    .move(points.bandTopLeft)
+    .line(points.bandBottomLeft)
+    .join(paths.bow)
+    .line(points.bandTopLeft)
+    .close()
+    .attr('class', 'fabric')
+    .setRender(true)
+
   if (complete) {
-    if (sa) paths.sa.render = true
+    // Paperless?
+    if (paperless) {
+      macro('hd', {
+        from: points.bandBottomLeft,
+        to: points.tip2Bottom,
+        y: store.get('baseY')
+      })
+    }
+    if (sa) {
+      paths.sa = paths.seam
+        .offset(sa)
+        .attr('class', 'fabric sa')
+        .setRender(true)
+    }
     macro('title', {
       at: points.titleAnchor,
       nr: 3,
       title: 'bowTie',
-      scale: 0.8
+      scale: (store.get('tipWidth')/75)
     })
   }
 
diff --git a/packages/benjamin/src/ribbon.js b/packages/benjamin/src/ribbon.js
index e805b159603..606444d29e4 100644
--- a/packages/benjamin/src/ribbon.js
+++ b/packages/benjamin/src/ribbon.js
@@ -13,7 +13,7 @@ export default function(part) {
     paperless
   } = part.shorthand()
 
-  if (!options.adjustmentRibbon) {
+  if (options.adjustmentRibbon) {
     part.render = false
     return part
   }
@@ -21,8 +21,10 @@ export default function(part) {
   // Points
   points.bottomLeft = new Point(0, 0.5 * store.get('ribbonWidth'))
   points.topLeft = points.bottomLeft.flipY()
-  // FIXME: How long should this adjustment ribbon be?
-  points.bottomRight = points.bottomLeft.shift(0, measurements.neckCircumference)
+  points.bottomRight = points.bottomLeft.shift(
+    0,
+    measurements.neckCircumference * (1 + options.collarEase)
+  )
   points.topRight = points.bottomRight.flipY()
   points.titleAnchor = points.topLeft.shiftFractionTowards(points.bottomRight, 0.5)
 
@@ -40,9 +42,9 @@ export default function(part) {
     if (sa) paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa')
     macro('title', {
       at: points.titleAnchor,
-      nr: 4,
+      nr: 2,
       title: 'ribbon',
-      scale: 0.5
+      scale: 0.3
     })
 
     if (paperless) {
diff --git a/packages/penelope/src/waistband.js b/packages/penelope/src/waistband.js
index 3887ad42e6d..5889dc84e73 100644
--- a/packages/penelope/src/waistband.js
+++ b/packages/penelope/src/waistband.js
@@ -14,6 +14,11 @@ export default function(part) {
     macro
   } = part.shorthand()
 
+  if (!options.waistBand) {
+    part.render = false
+    return part
+  }
+
   let waistEase = options.waistEase
   let waist = measurements.naturalWaist
   waist += waistEase
@@ -50,7 +55,9 @@ export default function(part) {
     macro('title', {
       nr: 3,
       at: points.titleAnchor,
-      title: 'waistband'
+      title: 'waistband',
+      rotation: 90,
+      scale: 0.75
     })
 
     if (sa) {
diff --git a/packages/waralee/src/facings.js b/packages/waralee/src/facings.js
index 1aca35b258d..f926e3c2302 100644
--- a/packages/waralee/src/facings.js
+++ b/packages/waralee/src/facings.js
@@ -45,28 +45,28 @@ export default function(part) {
 
   // Complete?
   if (complete) {
-    points.frontTitle = points.frontTL.shift(270, 15).shift(0, 50)
+    points.frontTitle = points.frontTL.shift(270, 50).shift(0, 50)
     macro('title', {
       nr: 5,
       at: points.frontTitle.shift(0, 30),
       title: 'frontFacing',
       prefix: 'front'
     })
-    points.frontLogo = points.frontTitle.shift(270, 15)
+    points.frontLogo = points.frontTitle.shift(270, 0)
     snippets.frontLogo = new Snippet('logo', points.frontLogo).attr('data-scale', 0.4)
     points.frontText = points.frontLogo
       .shift(-90, 25)
       .attr('data-text', 'Waralee')
       .attr('data-text-class', 'center')
 
-    points.backTitle = points.backTL.shift(270, 15).shift(0, 50)
+    points.backTitle = points.backTL.shift(270, 50).shift(0, 50)
     macro('title', {
       nr: 6,
       at: points.backTitle.shift(0, 30),
       title: 'backFacing',
       prefix: 'back'
     })
-    points.backLogo = points.backTitle.shift(270, 15)
+    points.backLogo = points.backTitle.shift(270, 0)
     snippets.backLogo = new Snippet('logo', points.backLogo).attr('data-scale', 0.4)
     points.backText = points.backLogo
       .shift(-90, 25)

From 38d66808fad934434d290cc0ce86731af9d8b09b Mon Sep 17 00:00:00 2001
From: woutervdub <wouter.vdub@yahoo.com>
Date: Tue, 1 Oct 2019 14:47:25 -0700
Subject: [PATCH 20/20] Removed unused variable

---
 packages/benjamin/src/bow1.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/benjamin/src/bow1.js b/packages/benjamin/src/bow1.js
index 932756abdd9..4365259800a 100644
--- a/packages/benjamin/src/bow1.js
+++ b/packages/benjamin/src/bow1.js
@@ -1,6 +1,5 @@
 export default function(part) {
   let {
-    options,
     Point,
     points,
     Path,