diff --git a/modular-recipes/recipes/peristaltic-pump/bearing_roller.toml b/modular-recipes/recipes/peristaltic-pump/bearing_roller.toml
index 99ff4f6..47e8c63 100644
--- a/modular-recipes/recipes/peristaltic-pump/bearing_roller.toml
+++ b/modular-recipes/recipes/peristaltic-pump/bearing_roller.toml
@@ -1,46 +1,44 @@
-[[outputs]]
+[outputs]
 bearing_roller = {quantity=1}
 
 # inputs list, similar to a cargo.toml file
-[[inputs]]
+[inputs]
 bearing_hub_top = {version=0.1, type="printed"}
 bearing_hub = {version=0.1, type="printed"}
 
 # alternate representation of an element of the inputs list
-[[inputs.m4_20_shcs]]
+[inputs.m4_20_shcs]
 type = "M4x20 SHCS"
 quantity = 3
 comment = """These will hold the bearing rollers.  Possibly Button Heads
 Cap Screws would be better?  Probably either will work fine."""
 
-[[inputs.m4_washer]]
+[inputs.m4_washer]
 type = "M4 washer"
 quantity = 6
 dimensions = "12 mm OD, 4.4 mm ID, 1 mm thick"
 comment = """The upstream repo calls for 12 mm OD but i think that's
 too big, it hits the outer race of the bearings.  Use 8mm OD instead."""
 
-[[inputs.624_bearing]]
+[inputs.624_bearing]
 type = "624 bearing"
 quantity = 6
 comments = "13mm OD, 4mm ID, 5mm wide"
 
-[[inputs.m4_nuts]]
+[inputs.m4_nuts]
 type = "M4 nuts"
 quantity = 3
 
-[[dependencies]]
+[dependencies]
 tools = [
     "3 mm hex driver",
     "7 mm nut driver",
 ]
-operator = {skill="assembly"}
+operator = {skills=["assembly"]}
 
 
-[[action]]
+[action]
 process = """Assemble the bearing roller.  Each of the three roller
 stacks will consist of: washer, bearing, bearing, washer.  All three
 roller stacks are clamped between the bearing hub top and bottom, and
 fixed by a screw and nut."""
-
-
diff --git a/modular-recipes/recipes/peristaltic-pump/print/bearing_hub.toml b/modular-recipes/recipes/peristaltic-pump/print/bearing_hub.toml
index ddabb45..ae94262 100644
--- a/modular-recipes/recipes/peristaltic-pump/print/bearing_hub.toml
+++ b/modular-recipes/recipes/peristaltic-pump/print/bearing_hub.toml
@@ -1,14 +1,14 @@
-[[outputs]]
+[outputs]
 bearing_hub={version=0.1, quantity=1, type="printed"}
 
-[[inputs]]
+[inputs]
 filament={}
 
-[[dependencies]]
-printer={type="fdm"}
+[dependencies]
+tools=["fdm-printer"]
 
-[[config]]
+[config]
 model="https://github.com/DerSchultze/Peristaltic-Controller@92a4d9b:stl/bearing-hub.STL"
 
-[[action]]
+[action]
 print={}
\ No newline at end of file
diff --git a/modular-recipes/recipes/peristaltic-pump/print/bearing_hub_top.toml b/modular-recipes/recipes/peristaltic-pump/print/bearing_hub_top.toml
index 3e76ada..8b12431 100644
--- a/modular-recipes/recipes/peristaltic-pump/print/bearing_hub_top.toml
+++ b/modular-recipes/recipes/peristaltic-pump/print/bearing_hub_top.toml
@@ -1,14 +1,14 @@
-[[outputs]]
+[outputs]
 bearing_hub_top={version=0.1, quantity=1, type="printed"}
 
-[[inputs]]
+[inputs]
 filament={}
 
-[[dependencies]]
-printer={type="fdm"}
+[dependencies]
+tools=["fdm-printer"]
 
-[[config]]
+[config]
 model="https://github.com/DerSchultze/Peristaltic-Controller@92a4d9b:stl/bearing-hub-top.STL"
 
-[[action]]
+[action]
 print={}
\ No newline at end of file
diff --git a/modular-recipes/recipes/peristaltic-pump/print/pump_housing_front_untapped.toml b/modular-recipes/recipes/peristaltic-pump/print/pump_housing_front_untapped.toml
index 9eac7da..7ae6b11 100644
--- a/modular-recipes/recipes/peristaltic-pump/print/pump_housing_front_untapped.toml
+++ b/modular-recipes/recipes/peristaltic-pump/print/pump_housing_front_untapped.toml
@@ -1,14 +1,14 @@
-[[outputs]]
+[outputs]
 pump_housing_front_untapped={version=0.1, quantity=1, type="printed"}
 
-[[inputs]]
+[inputs]
 filament={}
 
-[[dependencies]]
-printer={type="fdm"}
+[dependencies]
+tools=["fdm-printer"]
 
-[[config]]
+[config]
 model="https://github.com/DerSchultze/Peristaltic-Controller@92a4d9b:stl/pump-top.STL"
 
-[[action]]
+[action]
 print={}
\ No newline at end of file
diff --git a/modular-recipes/recipes/peristaltic-pump/print/tube_support.toml b/modular-recipes/recipes/peristaltic-pump/print/tube_support.toml
index 4b1aaec..57c7440 100644
--- a/modular-recipes/recipes/peristaltic-pump/print/tube_support.toml
+++ b/modular-recipes/recipes/peristaltic-pump/print/tube_support.toml
@@ -1,14 +1,14 @@
-[[outputs]]
+[outputs]
 tube_support={version=0.1, quantity=1, type="printed"}
 
-[[inputs]]
+[inputs]
 filament={}
 
-[[dependencies]]
-printer={type="fdm"}
+[dependencies]
+tools=["fdm-printer"]
 
-[[config]]
+[config]
 model="https://github.com/DerSchultze/Peristaltic-Controller@92a4d9b:stl/tube-support.STL"
 
-[[action]]
+[action]
 print={}
\ No newline at end of file
diff --git a/modular-recipes/recipes/peristaltic-pump/pump_housing_front.toml b/modular-recipes/recipes/peristaltic-pump/pump_housing_front.toml
index 1db87a3..853d3ce 100644
--- a/modular-recipes/recipes/peristaltic-pump/pump_housing_front.toml
+++ b/modular-recipes/recipes/peristaltic-pump/pump_housing_front.toml
@@ -1,14 +1,13 @@
-
-[[outputs]]
+[outputs]
 pump_housing_front={quantity=1}
 
-[[inputs]]
+[inputs]
 pump_housing_front_untapped={version=0.1, type="printed"}
 
-[[dependencies]]
+[dependencies]
 tools = [ "M4 tap" ]
-operator = {skill="assembly"}
+operator = {skills=["tapping"]}
 
-[[action]]
+[action]
 process = """Tap the two motor mounting holes."""
 
diff --git a/modular-recipes/recipes/peristaltic-pump/pump_housing_front_with_stepper.toml b/modular-recipes/recipes/peristaltic-pump/pump_housing_front_with_stepper.toml
index 3ff9850..e59780b 100644
--- a/modular-recipes/recipes/peristaltic-pump/pump_housing_front_with_stepper.toml
+++ b/modular-recipes/recipes/peristaltic-pump/pump_housing_front_with_stepper.toml
@@ -1,14 +1,14 @@
-[[outputs]]
+[outputs]
 pump_housing_front_with_stepper={quantity=1}
 
-[[inputs]]
+[inputs]
 pump_housing_front={version=0.1, quantity=1}
 m4_5_shcs={quantity=2, description="M4x5 SHCS"}
 stepper={quantity=1, type="J8ByJ-48"}
 
-[[dependencies]]
+[dependencies]
 tools = [ "3 mm hex driver" ]
-operator = {skill="assembly"}
+operator = {skills=["assembly"]}
 
-[[action]]
+[action]
 process = """Screw the stepper to the printed front housing."""
\ No newline at end of file
diff --git a/modular-recipes/recipes/peristaltic-pump/pump_housing_rear.toml b/modular-recipes/recipes/peristaltic-pump/pump_housing_rear.toml
index d5bee00..055addf 100644
--- a/modular-recipes/recipes/peristaltic-pump/pump_housing_rear.toml
+++ b/modular-recipes/recipes/peristaltic-pump/pump_housing_rear.toml
@@ -1,12 +1,12 @@
-
-[[outputs]]
+[outputs]
 pump_housing_rear = {quantity=1}
 
-[[inputs]]
+[inputs]
 pump_housing_rear_untapped = {version=0.1, type="printed", quantity=1, model="https://github.com/DerSchultze/Peristaltic-Controller@92a4d9b:stl/CheapPump.STL"}
 
-[[dependencies]]
+[dependencies]
 tools = [ "M4 tap" ]
+operator = { skills=["tapping"] }
 
-[[action]]
+[action]
 process = """Tap the two motor mounting holes."""
diff --git a/modular-recipes/recipes/peristaltic-pump/pump_housing_rear_with_stepper.toml.toml b/modular-recipes/recipes/peristaltic-pump/pump_housing_rear_with_stepper.toml.toml
index 3dcc50e..c41f528 100644
--- a/modular-recipes/recipes/peristaltic-pump/pump_housing_rear_with_stepper.toml.toml
+++ b/modular-recipes/recipes/peristaltic-pump/pump_housing_rear_with_stepper.toml.toml
@@ -1,15 +1,14 @@
-[[outputs]]
+[outputs]
 pump_housing_rear_with_stepper = {quantity=1}
 
-[[inputs]]
+[inputs]
 pump_housing_rear = {version=0.1, quantity=1}
 m4_5_shcs = {quantity=2}
 stepper = {type="J8BYJ-48", quantity=1}
 
-[[dependencies]]
+[dependencies]
 tools = [ "3 mm hex driver" ]
-operator = {skill="assembly"}
+operator = {skills=["assembly"]}
 
-[[action]]
+[action]
 process = """Screw the stepper to the printed rear housing."""
-