diff --git a/examples/demo02.yml b/examples/demo02.yml
index 600b135..f572890 100644
--- a/examples/demo02.yml
+++ b/examples/demo02.yml
@@ -23,10 +23,11 @@ connectors:
     <<: *molex_f
     pinout: [GND, +12V, MISO, MOSI, SCK]
   ferrule_crimp:
-    category: ferrule
+    style: simple
     autogenerate: true
     type: Crimp ferrule
     subtype: 0.25 mm²
+    color: YE
 
 cables:
   W1:
@@ -65,6 +66,4 @@ connections:
   -
     - ferrule_crimp
     - W4: [1,2]
-  -
-    - W4: [1,2]
     - X4: [1,2]
diff --git a/examples/ex04.yml b/examples/ex04.yml
index 3fe5bed..74148ec 100644
--- a/examples/ex04.yml
+++ b/examples/ex04.yml
@@ -9,16 +9,12 @@ cables:
 
 connectors:
   ferrule_crimp:
-    category: ferrule
+    style: simple
     autogenerate: true
     type: Crimp ferrule
-    show_name: false
-    show_pincount: false
 
 connections:
   -
     - ferrule_crimp
     - W1: [1-6]
-  -
-    - W1: [6-1]
     - ferrule_crimp
diff --git a/tutorial/tutorial05.yml b/tutorial/tutorial05.yml
index dda905e..449dd84 100644
--- a/tutorial/tutorial05.yml
+++ b/tutorial/tutorial05.yml
@@ -4,9 +4,9 @@ connectors:
     type: Molex 8981
     subtype: female
   F1:
-    category: ferrule
+    style: simple
     autogenerate: true
-    type: Ferrule, crimp
+    type: Crimp ferrule
     subtype: 0.5 mm²
     color: OG # optional color
 
@@ -18,9 +18,7 @@ cables:
     colors: [YE, BK, BK, RD] # custom colors, wirecount is implicit
 
 connections:
-  - # attach ferrules
-    - F1 # no need for list of connections; one ferrule per wire is auto-generated and attached
-    - W1: [1-4] # a new ferrule is auto-generated for each wire
-  - # attach connectors (separately from ferrules)
+  -
+    - F1 # a new ferrule is auto-generated for each of the four wires
     - W1: [1-4]
     - X1: [1-4]
diff --git a/tutorial/tutorial06.yml b/tutorial/tutorial06.yml
index bcf9c8c..3a0b810 100644
--- a/tutorial/tutorial06.yml
+++ b/tutorial/tutorial06.yml
@@ -3,17 +3,18 @@ connectors:
     pinout: [+12V, GND, GND, +5V]
     type: Molex 8981
     subtype: female
-  F_10_1: # manually define a ferrule (with unique designator)
-    category: ferrule
-    type: Ferrule, crimp
+  F_10: # this is a unique ferrule
+    style: simple
+    show_name: false # non-autogenerated connectors show their name by default; override
+    type: Crimp ferrule
     subtype: 1.0 mm²
-    color: YE
-  F_05:
-    category: ferrule
+    color: YE # optional color
+  F_05: # this is a ferrule that will be auto-generated on demand
+    style: simple
     autogenerate: true
-    type: Ferrule, crimp
+    type: Crimp ferrule
     subtype: 0.5 mm²
-    color: OG # optional color
+    color: OG
 
 cables:
   W1:
@@ -23,16 +24,7 @@ cables:
     colors: [YE, BK, BK, RD] # custom colors, wirecount is implicit
 
 connections:
-  - # attach ferrules
-    - F_05
-    - W1: [1,4] # a new ferrule is auto-generated for each wire
-  - # attach connectors (separately from ferrules)
-    - W1: [1-4]
-    - X1: [1-4]
-  -
-    - F_10_1: 1 # manually defined ferrules are treated like regular connectors,
-                # thus requiring a pin number
-    - W1: 2
-  -
-    - F_10_1: 1
-    - W1: 3
+    -
+      - [F_05, F_10, F_10, F_05]
+      - W1: [1-4]
+      - X1: [1-4]