diff --git a/data/deprecated.json b/data/deprecated.json
index bfcfd4da1f..690ba62b3e 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -1651,6 +1651,18 @@
     "old": {"townhall:village": "yes"},
     "replace": {"amenity": "townhall", "townhall:type": "village"}
   },
+  {
+    "old": {"transformer": "auto"},
+    "replace": {"transformer": "yes", "windings:auto": "yes"}
+  },
+  {
+    "old": {"transformer": "minor_distribution"},
+    "replace": {"transformer": "distribution"}
+  },
+  {
+    "old": {"transformer": "traction"},
+    "replace": {"transformer": "main"}
+  },
   {
     "old": {"tunnel": "1"},
     "replace": {"tunnel": "yes"}
@@ -1743,6 +1755,22 @@
     "old": {"volcano": "extinct"},
     "replace": {"volcano:status": "extinct"}
   },
+  {
+    "old": {"voltage-high": "*", "transformer":"generator"},
+    "replace": {"voltage:secondary":"$1", "transformer":"generator"}
+  },
+  {
+    "old": {"voltage-low": "*", "transformer":"generator"},
+    "replace": {"voltage:primary":"$1", "transformer":"generator"}
+  },
+  {
+    "old": {"voltage-high": "*"},
+    "replace": {"voltage:primary":"$1"}
+  },
+  {
+    "old": {"voltage-low": "*"},
+    "replace": {"voltage:secondary":"$1"}
+  },
   {
     "old": {"wall_type": "noise_barrier"},
     "replace": {"wall": "noise_barrier"}
diff --git a/data/fields/transformer.json b/data/fields/transformer.json
index 59f92c408b..b5a873669b 100644
--- a/data/fields/transformer.json
+++ b/data/fields/transformer.json
@@ -4,14 +4,13 @@
     "label": "Type",
     "strings": {
         "options": {
-            "distribution": "Distribution",
-            "generator": "Generator",
-            "converter": "Converter",
-            "traction": "Traction",
-            "auto": "Autotransformer",
-            "phase_angle_regulator": "Phase Angle Regulator",
-            "auxiliary": "Auxiliary",
-            "yes": "Unknown"
+            "main": "Forwards power",
+            "distribution": "Feeds final consumers, installed outside substations",
+            "generator": "Steps-up voltage in power plants",
+            "converter": "Feeds power converters",
+            "phase_angle_regulator": "Regulates phase angle",
+            "auxiliary": "Feeds internal systems in substations",
+            "yes": "Unknown role"
         }
     },
     "autoSuggestions": false,
diff --git a/data/fields/windings/auto.json b/data/fields/windings/auto.json
new file mode 100644
index 0000000000..1d187008f2
--- /dev/null
+++ b/data/fields/windings/auto.json
@@ -0,0 +1,12 @@
+{
+    "key": "windings:auto",
+    "type": "check",
+    "label": "Autotransformer",
+    "strings": {
+        "options": {
+            "undefined": "Assumed to be No",
+            "yes": "Yes",
+            "no": "No"
+        }
+    }
+}
diff --git a/data/preset_categories/utility.json b/data/preset_categories/utility.json
index 215e331fb4..c8636a3f34 100644
--- a/data/preset_categories/utility.json
+++ b/data/preset_categories/utility.json
@@ -5,6 +5,10 @@
         "power/line",
         "power/minor_line",
         "man_made/pipeline",
-        "power/cable/underground"
+        "power/cable",
+        "power/generator",
+        "power/plant",
+        "power/switch",
+        "power/transformer"
     ]
 }
diff --git a/data/presets/_power.json b/data/presets/_power.json
index 8804d576aa..c656b86177 100644
--- a/data/presets/_power.json
+++ b/data/presets/_power.json
@@ -10,10 +10,8 @@
         "power": "*"
     },
     "fields": [
-        "power"
-    ],
-    "moreFields": [
-        "material"
+        "power",
+        "operator"
     ],
     "searchable": false,
     "name": "Power Feature"
diff --git a/data/presets/power/transformer.json b/data/presets/power/transformer.json
index bc7ca590a7..f5dabf8142 100644
--- a/data/presets/power/transformer.json
+++ b/data/presets/power/transformer.json
@@ -16,7 +16,8 @@
         "voltage/secondary",
         "voltage/tertiary",
         "windings",
-        "windings/configuration"
+        "windings/configuration",
+        "windings/auto"
     ],
     "geometry": [
         "point",
diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml
index 8428846c27..5a36950d3d 100644
--- a/interim/source_strings.yaml
+++ b/interim/source_strings.yaml
@@ -3187,20 +3187,20 @@ en:
         # transformer=*
         label: Type
         options:
-          # transformer=auto
-          auto: Autotransformer
           # transformer=auxiliary
           auxiliary: Auxiliary
+          # transformer=compensator
+          compensator: Compensation feed
           # transformer=converter
           converter: Converter
           # transformer=distribution
           distribution: Distribution
           # transformer=generator
           generator: Generator
+          # transformer=main
+          main: Main
           # transformer=phase_angle_regulator
           phase_angle_regulator: Phase Angle Regulator
-          # transformer=traction
-          traction: Traction
           # transformer=yes
           'yes': Unknown
       trees:
@@ -3438,6 +3438,17 @@ en:
         # windings field placeholder
         placeholder: 1, 2, 3...
         terms: '[translate with synonyms or related terms for ''Windings'', separated by commas]'
+      windings/auto:
+        # windings:auto=*
+        label: Auto-transformer
+        options:
+          # windings:auto=no
+          'no': 'No'
+          # windings:auto=undefined
+          undefined: Assumed to be No
+          # windings:auto=yes
+          'yes': 'Yes'
+        terms: '[translate with synonyms or related terms for ''Auto-transformer'', separated by commas]'
       windings/configuration:
         # windings:configuration=*
         label: Windings Configuration
@@ -7217,6 +7228,11 @@ en:
         name: Television Broadcast Mast
         # 'terms: antenna,broadcast tower,communication mast,communication tower,guyed tower,television mast,television tower,transmission mast,transmission tower,tv mast,tv tower'
         terms: <translate with synonyms or related terms for 'Television Broadcast Mast', separated by commas>
+      man_made/mast/lighting:
+        # man_made=mast + tower:type=lighting | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Lighting Mast
+        # 'terms: flood light,lighting,stadium lights,stadium lighting,headlight'
+        terms: <translate with synonyms or related terms for 'Lighting Mast', separated by commas>
       man_made/mineshaft:
         # man_made=mineshaft | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Mineshaft