diff --git a/resources/groundobject_templates.p b/resources/groundobject_templates.p
index 8d1d77e0..5e409190 100644
Binary files a/resources/groundobject_templates.p and b/resources/groundobject_templates.p differ
diff --git a/resources/tools/groundobject_templates.miz b/resources/tools/groundobject_templates.miz
index 2ea96ae3..a6eb0bbd 100644
Binary files a/resources/tools/groundobject_templates.miz and b/resources/tools/groundobject_templates.miz differ
diff --git a/theater/theatergroundobject.py b/theater/theatergroundobject.py
index 1fdef903..05d0aa72 100644
--- a/theater/theatergroundobject.py
+++ b/theater/theatergroundobject.py
@@ -30,9 +30,11 @@ ABBREV_NAME = {
 }
 
 CATEGORY_MAP = {
+    # Special cases
     "CARRIER": ["CARRIER"],
     "LHA": ["LHA"],
     "aa": ["AA"],
+    # Buildings
     "power": ["Workshop A", "Electric power box", "Garage small A", "Farm B", "Repair workshop", "Garage B"],
     "warehouse": ["Warehouse", "Hangar A"],
     "fuel": ["Tank", "Tank 2", "Tank 3", "Fuel tank"],
@@ -42,6 +44,7 @@ CATEGORY_MAP = {
     "factory": ["Tech combine", "Tech hangar A"],
     "comms": ["TV tower", "Comms tower M"],
     "oil": ["Oil platform"],
+    "derrick": ["Oil derrick", "Pump station", "Subsidiary structure 2"],
 }