24 files changed, 146 insertions, 146 deletions
diff --git a/data/maps/5star.yaml b/data/maps/5star.yaml
index a46f6810..3427f8b1 100644
--- a/data/maps/5star.yaml
+++ b/data/maps/5star.yaml
@@ -64,18 +64,18 @@ tiles:
     "e": cutting-board
     "X": trash -x
 
-    "A": steak-crate -x
-    "B": coconut-crate -x
-    "C": strawberry-crate -x
-    "D": fish-crate -x
-    "E": rice-crate -x
-    "F": tomato-crate -x
-    "G": flour-crate -x
-    "H": leek-crate -x
-    "I": lettuce-crate -x
-    "J": cheese-crate -x
-    "K": mushroom-crate -x
-    "L": potato-crate -x
+    "A": crate:steak -x
+    "B": crate:coconut -x
+    "C": crate:strawberry -x
+    "D": crate:fish -x
+    "E": crate:rice -x
+    "F": crate:tomato -x
+    "G": crate:flour -x
+    "H": crate:leek -x
+    "I": crate:lettuce -x
+    "J": crate:cheese -x
+    "K": crate:mushroom -x
+    "L": crate:potato -x
 
     ".": floor -w
     ",": floor -w --chef-spawn
diff --git a/data/maps/anticurry.yaml b/data/maps/anticurry.yaml
index 321a8ba5..00d7c0de 100644
--- a/data/maps/anticurry.yaml
+++ b/data/maps/anticurry.yaml
@@ -40,18 +40,18 @@ tiles:
     "P": stove -i=pan
     "C": cutting-board
     "Z": rolling-board
-    "M": mushroom-crate -x
-    "Ä": potato-crate -x
-    "R": steak-crate -x
-    "D": coconut-crate -x
-    "V": strawberry-crate -x
-    "F": fish-crate -x
-    "U": rice-crate -x
-    "T": tomato-crate -x
-    "G": flour-crate -x
-    "L": leek-crate -x
-    "A": lettuce-crate -x
-    "E": cheese-crate -x
+    "M": crate:mushroom -x
+    "Ä": crate:potato -x
+    "R": crate:steak -x
+    "D": crate:coconut -x
+    "V": crate:strawberry -x
+    "F": crate:fish -x
+    "U": crate:rice -x
+    "T": crate:tomato -x
+    "G": crate:flour -x
+    "L": crate:leek -x
+    "A": crate:lettuce -x
+    "E": crate:cheese -x
     "X": trash -x
 
     "c": chair -w
diff --git a/data/maps/auto_sushi.yaml b/data/maps/auto_sushi.yaml
index 8dc4ba84..90a92066 100644
--- a/data/maps/auto_sushi.yaml
+++ b/data/maps/auto_sushi.yaml
@@ -51,12 +51,12 @@ tiles:
     "s": sink
     "S": stove -i=pot
     "C": cutting-board
-    "R": fish-crate -x
-    "T": tomato-crate -x
-    "M": mushroom-crate -x
-    "F": rice-crate -x
-    "Y": coconut-crate -x
-    "L": leek-crate -x
+    "R": crate:fish -x
+    "T": crate:tomato -x
+    "M": crate:mushroom -x
+    "F": crate:rice -x
+    "Y": crate:coconut -x
+    "L": crate:leek -x
     "X": trash -x --conveyor=0,-1
     "z": book --book
 
diff --git a/data/maps/bar.yaml b/data/maps/bar.yaml
index 9c4d0a99..378f4920 100644
--- a/data/maps/bar.yaml
+++ b/data/maps/bar.yaml
@@ -43,13 +43,13 @@ tiles:
     "P": stove -i=pan
     "b": book --book
     "C": cutting-board
-    "R": steak-crate -x
-    "T": tomato-crate -x
-    "F": flour-crate -x
-    "L": leek-crate -x
-    "Y": rice-crate -x
-    "Z": coconut-crate -x
-    "V": cheese-crate -x
+    "R": crate:steak -x
+    "T": crate:tomato -x
+    "F": crate:flour -x
+    "L": crate:leek -x
+    "Y": crate:rice -x
+    "Z": crate:coconut -x
+    "V": crate:cheese -x
     "X": trash -x
 
     "c": chair -w
diff --git a/data/maps/bbq.yaml b/data/maps/bbq.yaml
index 8106020c..7291f874 100644
--- a/data/maps/bbq.yaml
+++ b/data/maps/bbq.yaml
@@ -39,11 +39,11 @@ tiles:
     "o": oven -x
     "S": stove -i=pan
     "C": cutting-board
-    "R": steak-crate -x
-    "T": tomato-crate -x
-    "F": flour-crate -x
-    "L": lettuce-crate -x
-    "W": cheese-crate -x
+    "R": crate:steak -x
+    "T": crate:tomato -x
+    "F": crate:flour -x
+    "L": crate:lettuce -x
+    "W": crate:cheese -x
     "X": trash -x
     "b": book --book
 
diff --git a/data/maps/burgers_inc.yaml b/data/maps/burgers_inc.yaml
index d158385c..dcb8b6eb 100644
--- a/data/maps/burgers_inc.yaml
+++ b/data/maps/burgers_inc.yaml
@@ -51,14 +51,14 @@ tiles:
     "P": stove -i=pan
     "F": deep-fryer -xi=basket
     "C": cutting-board
-    "B": bun-crate -x
-    "H": cheese-crate -x
-    "A": lettuce-crate -x
-    "R": steak-crate -x
-    "T": tomato-crate -x
-    "D": coconut-crate -x
-    "V": strawberry-crate -x
-    "U": potato-crate -x
+    "B": crate:bun -x
+    "H": crate:cheese -x
+    "A": crate:lettuce -x
+    "R": crate:steak -x
+    "T": crate:tomato -x
+    "D": crate:coconut -x
+    "V": crate:strawberry -x
+    "U": crate:potato -x
     "X": trash -x
     "b": book --book
 
diff --git a/data/maps/bus.yaml b/data/maps/bus.yaml
index 4776fbb5..fa1cf605 100644
--- a/data/maps/bus.yaml
+++ b/data/maps/bus.yaml
@@ -57,13 +57,13 @@ tiles:
     "S": stove -i=pot
     "Y": stove -i=pan
     "C": cutting-board
-    "R": steak-crate -x
-    "T": tomato-crate -x
-    "F": flour-crate -x
-    "L": leek-crate -x
-    "Z": lettuce-crate -x
-    "W": cheese-crate -x
-    "U": strawberry-crate -x
+    "R": crate:steak -x
+    "T": crate:tomato -x
+    "F": crate:flour -x
+    "L": crate:leek -x
+    "Z": crate:lettuce -x
+    "W": crate:cheese -x
+    "U": crate:strawberry -x
     "X": trash -x
     "b": book --book
 
diff --git a/data/maps/campaign/01.yaml b/data/maps/campaign/01.yaml
index 0541846e..780c6d57 100644
--- a/data/maps/campaign/01.yaml
+++ b/data/maps/campaign/01.yaml
@@ -34,7 +34,7 @@ tiles:
     "t": table
     "s": sink
     "C": cutting-board
-    "L": lettuce-crate
+    "L": crate:lettuce
     "X": trash
 
     "c": chair
diff --git a/data/maps/campaign/02.yaml b/data/maps/campaign/02.yaml
index b2027087..9df7b3f7 100644
--- a/data/maps/campaign/02.yaml
+++ b/data/maps/campaign/02.yaml
@@ -35,7 +35,7 @@ tiles:
     "t": table
     "s": sink
     "S": stove
-    "C": steak-crate
+    "C": crate:steak
     "X": trash
 
     "c": chair
diff --git a/data/maps/debug.yaml b/data/maps/debug.yaml
index 5b5c939c..7856641d 100644
--- a/data/maps/debug.yaml
+++ b/data/maps/debug.yaml
@@ -53,19 +53,19 @@ tiles:
     "z": counter -i=plate
     "Z": counter -i=glass
 
-    "0": rice-crate -x
-    "1": steak-crate -x
-    "2": tomato-crate -x
-    "3": leek-crate -x
-    "4": coconut-crate -x
-    "5": strawberry-crate -x
-    "6": flour-crate -x
-    "7": fish-crate -x
-    "8": cheese-crate -x
-    "9": lettuce-crate -x
-    "¹": mushroom-crate -x
-    "²": potato-crate -x
-    "³": bun-crate -x
+    "0": crate:rice -x
+    "1": crate:steak -x
+    "2": crate:tomato -x
+    "3": crate:leek -x
+    "4": crate:coconut -x
+    "5": crate:strawberry -x
+    "6": crate:flour -x
+    "7": crate:fish -x
+    "8": crate:cheese -x
+    "9": crate:lettuce -x
+    "¹": crate:mushroom -x
+    "²": crate:potato -x
+    "³": crate:bun -x
     "¼": noodles-crate -x
     "°": crate:tomato -x
     "½": trash -x
diff --git a/data/maps/duplex.yaml b/data/maps/duplex.yaml
index 92836a5a..e35bd80e 100644
--- a/data/maps/duplex.yaml
+++ b/data/maps/duplex.yaml
@@ -51,11 +51,11 @@ tiles:
     "o": oven -x
     "S": stove -i=pot
     "C": cutting-board
-    "R": rice-crate -x
-    "D": coconut-crate -x
-    "T": tomato-crate -x
-    "F": flour-crate -x
-    "L": leek-crate -x
+    "R": crate:rice -x
+    "D": crate:coconut -x
+    "T": crate:tomato -x
+    "F": crate:flour -x
+    "L": crate:leek -x
     "X": trash -x
     "b": book --book
 
diff --git a/data/maps/junior.yaml b/data/maps/junior.yaml
index 7633c446..f166e30b 100644
--- a/data/maps/junior.yaml
+++ b/data/maps/junior.yaml
@@ -43,10 +43,10 @@ tiles:
     "S": stove -i=pan
     "b": book --book
     "C": cutting-board
-    "R": steak-crate -x
-    "T": tomato-crate -x
-    "F": flour-crate -x
-    "L": lettuce-crate -x
+    "R": crate:steak -x
+    "T": crate:tomato -x
+    "F": crate:flour -x
+    "L": crate:lettuce -x
     "X": trash -x
 
     "c": chair -w
diff --git a/data/maps/line.yaml b/data/maps/line.yaml
index 77f56fac..71ef6866 100644
--- a/data/maps/line.yaml
+++ b/data/maps/line.yaml
@@ -34,11 +34,11 @@ tiles:
     "S": stove -i=pot
     "P": stove -i=pan
     "C": cutting-board
-    "R": steak-crate -x
-    "T": tomato-crate -x
-    "F": flour-crate -x
-    "L": leek-crate -x
-    "K": cheese-crate -x
+    "R": crate:steak -x
+    "T": crate:tomato -x
+    "F": crate:flour -x
+    "L": crate:leek -x
+    "K": crate:cheese -x
     "X": trash -x
 
     "c": chair -w
diff --git a/data/maps/paris.yaml b/data/maps/paris.yaml
index 619b34be..2005382d 100644
--- a/data/maps/paris.yaml
+++ b/data/maps/paris.yaml
@@ -47,12 +47,12 @@ tiles:
     "S": stove -i=pot
     "Y": stove -i=pan
     "C": cutting-board
-    "R": steak-crate -x
-    "T": tomato-crate -x
-    "F": flour-crate -x
-    "L": leek-crate -x
-    "B": lettuce-crate -x
-    "D": cheese-crate -x
+    "R": crate:steak -x
+    "T": crate:tomato -x
+    "F": crate:flour -x
+    "L": crate:leek -x
+    "B": crate:lettuce -x
+    "D": crate:cheese -x
     "X": trash -x
     "b": book --book
 
diff --git a/data/maps/ring.yaml b/data/maps/ring.yaml
index 212a576f..d7ed5b61 100644
--- a/data/maps/ring.yaml
+++ b/data/maps/ring.yaml
@@ -48,14 +48,14 @@ tiles:
     "r": rolling-board
     "X": trash -x
 
-    "A": steak-crate -x
-    "B": coconut-crate -x
-    "C": cheese-crate -x
-    "D": lettuce-crate -x
-    "E": rice-crate -x
-    "F": tomato-crate -x
-    "G": flour-crate -x
-    "H": leek-crate -x
+    "A": crate:steak -x
+    "B": crate:coconut -x
+    "C": crate:cheese -x
+    "D": crate:lettuce -x
+    "E": crate:rice -x
+    "F": crate:tomato -x
+    "G": crate:flour -x
+    "H": crate:leek -x
 
     ".": floor -w
     ",": floor -w --chef-spawn
diff --git a/data/maps/salad.yaml b/data/maps/salad.yaml
index bb3e4611..a7deb171 100644
--- a/data/maps/salad.yaml
+++ b/data/maps/salad.yaml
@@ -41,8 +41,8 @@ tiles:
     "t": table
     "s": sink
     "C": cutting-board
-    "T": tomato-crate -x
-    "L": lettuce-crate -x
+    "T": crate:tomato -x
+    "L": crate:lettuce -x
     "X": trash -x
     "b": book --book
 
diff --git a/data/maps/scattered.yaml b/data/maps/scattered.yaml
index 1cebd7ef..088dd868 100644
--- a/data/maps/scattered.yaml
+++ b/data/maps/scattered.yaml
@@ -53,15 +53,15 @@ tiles:
     "g": book --book
     "h": sink
     "i": trash -x
-    "A": fish-crate -x
-    "B": mushroom-crate -x
-    "C": flour-crate -x
-    "D": rice-crate -x
-    "E": leek-crate -x
-    "F": tomato-crate -x
-    "G": coconut-crate -x
-    "H": cheese-crate -x
-    "I": strawberry-crate -x
+    "A": crate:fish -x
+    "B": crate:mushroom -x
+    "C": crate:flour -x
+    "D": crate:rice -x
+    "E": crate:leek -x
+    "F": crate:tomato -x
+    "G": crate:coconut -x
+    "H": crate:cheese -x
+    "I": crate:strawberry -x
 
     "^": chair -w
     "'": grass -w
diff --git a/data/maps/senior.yaml b/data/maps/senior.yaml
index 92e0e041..94f5a860 100644
--- a/data/maps/senior.yaml
+++ b/data/maps/senior.yaml
@@ -45,14 +45,14 @@ tiles:
     "f": cutting-board
     "e": rolling-board
 
-    "A": rice-crate -x
-    "B": coconut-crate -x
-    "C": tomato-crate -x
-    "D": flour-crate -x
-    "E": leek-crate -x
-    "F": cheese-crate -x
-    "G": lettuce-crate -x
-    "H": mushroom-crate -x
+    "A": crate:rice -x
+    "B": crate:coconut -x
+    "C": crate:tomato -x
+    "D": crate:flour -x
+    "E": crate:leek -x
+    "F": crate:cheese -x
+    "G": crate:lettuce -x
+    "H": crate:mushroom -x
     "X": trash -x
 
     "c": chair -w
diff --git a/data/maps/sophomore.yaml b/data/maps/sophomore.yaml
index 879d57f8..7a86abb3 100644
--- a/data/maps/sophomore.yaml
+++ b/data/maps/sophomore.yaml
@@ -40,10 +40,10 @@ tiles:
     "B": book --book
     "P": stove -i=pan
     "C": cutting-board
-    "R": steak-crate -x
-    "T": tomato-crate -x
-    "F": bun-crate -x
-    "L": lettuce-crate -x
+    "R": crate:steak -x
+    "T": crate:tomato -x
+    "F": crate:bun -x
+    "L": crate:lettuce -x
     "X": trash -x
 
     "c": chair -w
diff --git a/data/maps/station.yaml b/data/maps/station.yaml
index 551c3970..fcd257b2 100644
--- a/data/maps/station.yaml
+++ b/data/maps/station.yaml
@@ -41,12 +41,12 @@ tiles:
     "o": oven -x
     "P": stove -i=pan
     "C": cutting-board
-    "A": lettuce-crate -x
-    "R": steak-crate -x
-    "D": cheese-crate -x
-    "T": tomato-crate -x
-    "F": flour-crate -x
-    "L": leek-crate -x
+    "A": crate:lettuce -x
+    "R": crate:steak -x
+    "D": crate:cheese -x
+    "T": crate:tomato -x
+    "F": crate:flour -x
+    "L": crate:leek -x
     "X": trash -x
 
     "c": chair -w
diff --git a/data/maps/streetfood.yaml b/data/maps/streetfood.yaml
index f3c71442..36ba3ee3 100644
--- a/data/maps/streetfood.yaml
+++ b/data/maps/streetfood.yaml
@@ -38,9 +38,9 @@ tiles:
     "s": sink
     "Y": stove -i=pan
     "C": cutting-board
-    "R": steak-crate -x
-    "T": tomato-crate -x
-    "B": lettuce-crate -x
+    "R": crate:steak -x
+    "T": crate:tomato -x
+    "B": crate:lettuce -x
     "X": trash -x
     "l": lamp -c
     "8": chandelier -w
diff --git a/data/maps/sushibar.yaml b/data/maps/sushibar.yaml
index a9b1fb63..b746e1c7 100644
--- a/data/maps/sushibar.yaml
+++ b/data/maps/sushibar.yaml
@@ -40,10 +40,10 @@ tiles:
     "s": sink
     "S": stove -i=pot
     "C": cutting-board
-    "R": rice-crate -x
-    "T": coconut-crate -x
-    "F": fish-crate -x
-    "L": strawberry-crate -x
+    "R": crate:rice -x
+    "T": crate:coconut -x
+    "F": crate:fish -x
+    "L": crate:strawberry -x
     "X": trash -x
     "Z": freezer -x
     "b": book --book
diff --git a/data/maps/teeny.yaml b/data/maps/teeny.yaml
index a57e955f..4443bc3c 100644
--- a/data/maps/teeny.yaml
+++ b/data/maps/teeny.yaml
@@ -42,10 +42,10 @@ tiles:
     "o": oven -x
     "P": stove -i=pan
     "C": cutting-board
-    "R": steak-crate -x
-    "T": tomato-crate -x
-    "F": flour-crate -x
-    "L": lettuce-crate -x
+    "R": crate:steak -x
+    "T": crate:tomato -x
+    "F": crate:flour -x
+    "L": crate:lettuce -x
     "X": trash -x
     "b": book --book
 
diff --git a/data/maps/zigzag.yaml b/data/maps/zigzag.yaml
index ec34c3c4..b75aa562 100644
--- a/data/maps/zigzag.yaml
+++ b/data/maps/zigzag.yaml
@@ -42,12 +42,12 @@ tiles:
     "S": stove -i=pot
     "P": stove -i=pan
     "C": cutting-board
-    "R": steak-crate -x
-    "T": tomato-crate -x
-    "F": flour-crate -x
-    "L": leek-crate -x
-    "M": lettuce-crate -x
-    "N": coconut-crate -x
+    "R": crate:steak -x
+    "T": crate:tomato -x
+    "F": crate:flour -x
+    "L": crate:leek -x
+    "M": crate:lettuce -x
+    "N": crate:coconut -x
     "X": trash -x
     "b": book --book