diff --git a/examples/demo02.yml b/examples/demo02.yml
index 00ee5546..600b1359 100644
--- a/examples/demo02.yml
+++ b/examples/demo02.yml
@@ -9,11 +9,6 @@ templates: # defining templates to be used later on
     gauge: 0.14 mm2
     colors: [BK, RD, YE, GN]
 
-ferrules:
-  ferrule_crimp:
-    type: Crimp ferrule
-    subtype: 0.25 mm²
-
 connectors:
   X1:
     <<: *molex_f # copying items from the template
@@ -27,6 +22,11 @@ connectors:
   X4:
     <<: *molex_f
     pinout: [GND, +12V, MISO, MOSI, SCK]
+  ferrule_crimp:
+    category: ferrule
+    autogenerate: true
+    type: Crimp ferrule
+    subtype: 0.25 mm²
 
 cables:
   W1:
diff --git a/examples/ex04.yml b/examples/ex04.yml
index b9eb7079..3fe5beda 100644
--- a/examples/ex04.yml
+++ b/examples/ex04.yml
@@ -1,13 +1,3 @@
-# connectors:
-#   X1:
-#     type: D-Sub
-#     subtype: female
-#     pincount: 4
-#   X2:
-#     type: Molex KK 254
-#     subtype: female
-#     pincount: 3
-
 cables:
   W1:
     gauge: 0.25 mm2
@@ -17,8 +7,10 @@ cables:
     wirecount: 6
     category: bundle
 
-ferrules:
+connectors:
   ferrule_crimp:
+    category: ferrule
+    autogenerate: true
     type: Crimp ferrule
     show_name: false
     show_pincount: false
diff --git a/tutorial/readme.md b/tutorial/readme.md
index c46011c2..b82d7cb9 100644
--- a/tutorial/readme.md
+++ b/tutorial/readme.md
@@ -203,9 +203,9 @@ connectors:
     pinout: [+12V, GND, GND, +5V]
     type: Molex 8981
     subtype: female
-
-ferrules: # ferrules
   F1:
+    category: ferrule
+    autogenerate: true
     type: Ferrule, crimp
     subtype: 0.5 mm²
     color: OG # optional color
@@ -253,9 +253,9 @@ connectors:
     type: Ferrule, crimp
     subtype: 1.0 mm²
     color: YE
-
-ferrules: # ferrules
   F_05:
+    category: ferrule
+    autogenerate: true
     type: Ferrule, crimp
     subtype: 0.5 mm²
     color: OG # optional color
diff --git a/tutorial/tutorial05.yml b/tutorial/tutorial05.yml
index e238f309..dda905ed 100644
--- a/tutorial/tutorial05.yml
+++ b/tutorial/tutorial05.yml
@@ -3,9 +3,9 @@ connectors:
     pinout: [+12V, GND, GND, +5V]
     type: Molex 8981
     subtype: female
-
-ferrules: # ferrules
   F1:
+    category: ferrule
+    autogenerate: true
     type: Ferrule, crimp
     subtype: 0.5 mm²
     color: OG # optional color
diff --git a/tutorial/tutorial06.yml b/tutorial/tutorial06.yml
index f69499c3..bcf9c8c4 100644
--- a/tutorial/tutorial06.yml
+++ b/tutorial/tutorial06.yml
@@ -8,9 +8,9 @@ connectors:
     type: Ferrule, crimp
     subtype: 1.0 mm²
     color: YE
-
-ferrules: # ferrules
   F_05:
+    category: ferrule
+    autogenerate: true
     type: Ferrule, crimp
     subtype: 0.5 mm²
     color: OG # optional color