diff --git a/data/presets.yaml b/data/presets.yaml
index d2cea1354..e50b8b0a2 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -450,6 +450,11 @@ en:
       description:
         # description=*
         label: Description
+      devices:
+        # devices=*
+        label: Number of Devices
+        # devices field placeholder
+        placeholder: '2'
       diaper:
         # diaper=*
         label: Diaper Changing Available
@@ -546,6 +551,11 @@ en:
         label: Type
         # ford field placeholder
         placeholder: Default
+      frequency:
+        # frequency=*
+        label: Operating Frequency
+        # frequency field placeholder
+        placeholder: '50'
       fuel:
         # fuel=*
         label: Fuel
@@ -977,6 +987,11 @@ en:
       payment_multi:
         # 'payment:=*'
         label: Payment Types
+      phases:
+        # phases=*
+        label: Number of Phases
+        # phases field placeholder
+        placeholder: '3'
       phone:
         # phone=*
         label: Phone
@@ -1078,6 +1093,11 @@ en:
       railway:
         # railway=*
         label: Type
+      rating:
+        # rating=*
+        label: VA Rating
+        # rating field placeholder
+        placeholder: '32000'
       recycling_accepts:
         # 'recycling:=*'
         label: Accepts
@@ -1443,6 +1463,26 @@ en:
           'no': 'No: pathless, excellent orientation skills required'
         # trail_visibility field placeholder
         placeholder: 'Excellent, Good, Bad...'
+      transformer:
+        # transformer=*
+        label: Type of Transformer
+        options:
+          # transformer=auto
+          auto: Autotransformer
+          # transformer=auxiliary
+          auxiliary: Auxiliarty
+          # transformer=converter
+          converter: Converter
+          # transformer=distribution
+          distribution: Distribution
+          # transformer=generator
+          generator: Generator
+          # transformer=phase_angle_regulator
+          phase_angle_regulator: Phase Angle Regulator
+          # transformer=traction
+          traction: Traction
+          # transformer=yes
+          'yes': Unknown
       trees:
         # trees=*
         label: Trees
@@ -1484,6 +1524,21 @@ en:
           shield: Shield
           # 'volcano:type=stratovolcano'
           stratovolcano: Stratovolcano
+      voltage/primary:
+        # 'voltage:primary=*'
+        label: Primary Voltage
+        # voltage/primary field placeholder
+        placeholder: '225000'
+      voltage/secondary:
+        # 'voltage:secondary=*'
+        label: Secondary Voltage
+        # voltage/secondary field placeholder
+        placeholder: '400'
+      voltage/tertiary:
+        # 'voltage:tertiary=*'
+        label: Tertiary Voltage
+        # voltage/tertiary field placeholder
+        placeholder: '20000'
       wall:
         # wall=*
         label: Type
@@ -1513,6 +1568,29 @@ en:
       wikipedia:
         # 'wikipedia=*, wikidata=*'
         label: Wikipedia
+      windings:
+        # windings=*
+        label: Number of Windings
+        # windings field placeholder
+        placeholder: '3'
+      windings/configuration:
+        # 'windings:configuration=*'
+        label: Windings Configuration
+        options:
+          # 'windings:configuration=delta'
+          delta: Delta
+          # 'windings:configuration=leblanc'
+          leblanc: Leblanc
+          # 'windings:configuration=open'
+          open: Open
+          # 'windings:configuration=open-delta'
+          open-delta: Open Delta
+          # 'windings:configuration=scott'
+          scott: Scott
+          # 'windings:configuration=star'
+          star: Star
+          # 'windings:configuration=zigzag'
+          zigzag: Zig Zag
     presets:
       address:
         # 'addr:*=*'
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 5ed5f7172..0948c1ad5 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -594,6 +594,12 @@
             "label": "Description",
             "universal": true
         },
+        "devices": {
+            "key": "devices",
+            "type": "number",
+            "label": "Number of Devices",
+            "placeholder": "2"
+        },
         "diaper": {
             "key": "diaper",
             "type": "combo",
@@ -740,6 +746,12 @@
             "label": "Type",
             "placeholder": "Default"
         },
+        "frequency": {
+            "key": "frequency",
+            "type": "number",
+            "label": "Operating Frequency",
+            "placeholder": "50"
+        },
         "fuel_multi": {
             "key": "fuel:",
             "type": "multiCombo",
@@ -1316,6 +1328,12 @@
             "type": "multiCombo",
             "label": "Payment Types"
         },
+        "phases": {
+            "key": "phases",
+            "type": "number",
+            "label": "Number of Phases",
+            "placeholder": "3"
+        },
         "phone": {
             "key": "phone",
             "type": "tel",
@@ -1435,6 +1453,12 @@
             "type": "typeCombo",
             "label": "Type"
         },
+        "rating": {
+            "key": "rating",
+            "type": "number",
+            "label": "VA Rating",
+            "placeholder": "32000"
+        },
         "recycling_accepts": {
             "key": "recycling:",
             "type": "multiCombo",
@@ -1964,6 +1988,23 @@
                 }
             }
         },
+        "transformer": {
+            "key": "transformer",
+            "type": "combo",
+            "label": "Type of Transformer",
+            "strings": {
+                "options": {
+                    "distribution": "Distribution",
+                    "generator": "Generator",
+                    "converter": "Converter",
+                    "traction": "Traction",
+                    "auto": "Autotransformer",
+                    "phase_angle_regulator": "Phase Angle Regulator",
+                    "auxiliary": "Auxiliarty",
+                    "yes": "Unknown"
+                }
+            }
+        },
         "trees": {
             "key": "trees",
             "type": "semiCombo",
@@ -2016,6 +2057,24 @@
                 }
             }
         },
+        "voltage/primary": {
+            "key": "voltage:primary",
+            "type": "number",
+            "label": "Primary Voltage",
+            "placeholder": "225000"
+        },
+        "voltage/secondary": {
+            "key": "voltage:secondary",
+            "type": "number",
+            "label": "Secondary Voltage",
+            "placeholder": "400"
+        },
+        "voltage/tertiary": {
+            "key": "voltage:tertiary",
+            "type": "number",
+            "label": "Tertiary Voltage",
+            "placeholder": "20000"
+        },
         "wall": {
             "key": "wall",
             "type": "combo",
@@ -2076,6 +2135,28 @@
             "icon": "wikipedia",
             "universal": true,
             "label": "Wikipedia"
+        },
+        "windings": {
+            "key": "windings",
+            "type": "number",
+            "label": "Number of Windings",
+            "placeholder": "3"
+        },
+        "windings/configuration": {
+            "key": "windings:configuration",
+            "type": "combo",
+            "label": "Windings Configuration",
+            "strings": {
+                "options": {
+                    "star": "Star",
+                    "delta": "Delta",
+                    "open-delta": "Open Delta",
+                    "zigzag": "Zig Zag",
+                    "open": "Open",
+                    "scott": "Scott",
+                    "leblanc": "Leblanc"
+                }
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/data/presets/fields/devices.json b/data/presets/fields/devices.json
new file mode 100644
index 000000000..95f33fa9e
--- /dev/null
+++ b/data/presets/fields/devices.json
@@ -0,0 +1,6 @@
+{
+    "key": "devices",
+    "type": "number",
+    "label": "Number of Devices",
+    "placeholder": "2"
+}
diff --git a/data/presets/fields/frequency.json b/data/presets/fields/frequency.json
new file mode 100644
index 000000000..a5460f8dc
--- /dev/null
+++ b/data/presets/fields/frequency.json
@@ -0,0 +1,6 @@
+{
+    "key": "frequency",
+    "type": "number",
+    "label": "Operating Frequency",
+    "placeholder": "50"
+}
diff --git a/data/presets/fields/phases.json b/data/presets/fields/phases.json
new file mode 100644
index 000000000..0c7ae5c6b
--- /dev/null
+++ b/data/presets/fields/phases.json
@@ -0,0 +1,6 @@
+{
+    "key": "phases",
+    "type": "number",
+    "label": "Number of Phases",
+    "placeholder": "3"
+}
diff --git a/data/presets/fields/rating.json b/data/presets/fields/rating.json
new file mode 100644
index 000000000..b6122b52b
--- /dev/null
+++ b/data/presets/fields/rating.json
@@ -0,0 +1,6 @@
+{
+    "key": "rating",
+    "type": "number",
+    "label": "VA Rating",
+    "placeholder": "32000"
+}
diff --git a/data/presets/fields/transformer.json b/data/presets/fields/transformer.json
new file mode 100644
index 000000000..b4f877ffc
--- /dev/null
+++ b/data/presets/fields/transformer.json
@@ -0,0 +1,17 @@
+{
+    "key": "transformer",
+    "type": "combo",
+    "label": "Type of Transformer",
+    "strings": {
+        "options": {
+            "distribution": "Distribution",
+            "generator": "Generator",
+            "converter": "Converter",
+            "traction": "Traction",
+            "auto": "Autotransformer",
+            "phase_angle_regulator": "Phase Angle Regulator",
+            "auxiliary": "Auxiliarty",
+            "yes": "Unknown"
+        }
+    }
+}
diff --git a/data/presets/fields/voltage/primary.json b/data/presets/fields/voltage/primary.json
new file mode 100644
index 000000000..6c5396682
--- /dev/null
+++ b/data/presets/fields/voltage/primary.json
@@ -0,0 +1,6 @@
+{
+    "key": "voltage:primary",
+    "type": "number",
+    "label": "Primary Voltage",
+    "placeholder": "225000"
+}
\ No newline at end of file
diff --git a/data/presets/fields/voltage/secondary.json b/data/presets/fields/voltage/secondary.json
new file mode 100644
index 000000000..f0cf632e3
--- /dev/null
+++ b/data/presets/fields/voltage/secondary.json
@@ -0,0 +1,6 @@
+{
+    "key": "voltage:secondary",
+    "type": "number",
+    "label": "Secondary Voltage",
+    "placeholder": "400"
+}
\ No newline at end of file
diff --git a/data/presets/fields/voltage/tertiary.json b/data/presets/fields/voltage/tertiary.json
new file mode 100644
index 000000000..8e733d541
--- /dev/null
+++ b/data/presets/fields/voltage/tertiary.json
@@ -0,0 +1,6 @@
+{
+    "key": "voltage:tertiary",
+    "type": "number",
+    "label": "Tertiary Voltage",
+    "placeholder": "20000"
+}
\ No newline at end of file
diff --git a/data/presets/fields/windings.json b/data/presets/fields/windings.json
new file mode 100644
index 000000000..7de9817dd
--- /dev/null
+++ b/data/presets/fields/windings.json
@@ -0,0 +1,6 @@
+{
+    "key": "windings",
+    "type": "number",
+    "label": "Number of Windings",
+    "placeholder": "3"
+}
diff --git a/data/presets/fields/windings/configuration.json b/data/presets/fields/windings/configuration.json
new file mode 100644
index 000000000..7b682d4b7
--- /dev/null
+++ b/data/presets/fields/windings/configuration.json
@@ -0,0 +1,16 @@
+{
+    "key": "windings:configuration",
+    "type": "combo",
+    "label": "Windings Configuration",
+    "strings": {
+        "options": {
+            "star": "Star",
+            "delta": "Delta",
+            "open-delta": "Open Delta",
+            "zigzag": "Zig Zag",
+            "open": "Open",
+            "scott": "Scott",
+            "leblanc": "Leblanc"
+        }
+    }
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 705374de7..5686e8dde 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -12002,6 +12002,19 @@
         },
         "power/transformer": {
             "icon": "poi-power",
+            "fields": [
+                "transformer",
+                "location",
+                "phases",
+                "frequency",
+                "voltage/primary",
+                "voltage/secondary",
+                "voltage/tertiary",
+                "windings",
+                "windings/configuration",
+                "rating",
+                "devices"
+            ],
             "geometry": [
                 "point",
                 "vertex",
diff --git a/data/presets/presets/power/transformer.json b/data/presets/presets/power/transformer.json
index aa1bb5104..303eeb10a 100644
--- a/data/presets/presets/power/transformer.json
+++ b/data/presets/presets/power/transformer.json
@@ -1,5 +1,18 @@
 {
     "icon": "poi-power",
+    "fields": [
+        "transformer",
+        "location",
+        "phases",
+        "frequency",
+        "voltage/primary",
+        "voltage/secondary",
+        "voltage/tertiary",
+        "windings",
+        "windings/configuration",
+        "rating",
+        "devices"
+    ],
     "geometry": [
         "point",
         "vertex",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 6a10bd562..40a3b10ad 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1472,6 +1472,10 @@
                 "description": {
                     "label": "Description"
                 },
+                "devices": {
+                    "label": "Number of Devices",
+                    "placeholder": "2"
+                },
                 "diaper": {
                     "label": "Diaper Changing Available"
                 },
@@ -1553,6 +1557,10 @@
                     "label": "Type",
                     "placeholder": "Default"
                 },
+                "frequency": {
+                    "label": "Operating Frequency",
+                    "placeholder": "50"
+                },
                 "fuel_multi": {
                     "label": "Fuel Types"
                 },
@@ -1911,6 +1919,10 @@
                 "payment_multi": {
                     "label": "Payment Types"
                 },
+                "phases": {
+                    "label": "Number of Phases",
+                    "placeholder": "3"
+                },
                 "phone": {
                     "label": "Phone",
                     "placeholder": "+31 42 123 4567"
@@ -1990,6 +2002,10 @@
                 "railway": {
                     "label": "Type"
                 },
+                "rating": {
+                    "label": "VA Rating",
+                    "placeholder": "32000"
+                },
                 "recycling_accepts": {
                     "label": "Accepts"
                 },
@@ -2299,6 +2315,19 @@
                         "no": "No: pathless, excellent orientation skills required"
                     }
                 },
+                "transformer": {
+                    "label": "Type of Transformer",
+                    "options": {
+                        "distribution": "Distribution",
+                        "generator": "Generator",
+                        "converter": "Converter",
+                        "traction": "Traction",
+                        "auto": "Autotransformer",
+                        "phase_angle_regulator": "Phase Angle Regulator",
+                        "auxiliary": "Auxiliarty",
+                        "yes": "Unknown"
+                    }
+                },
                 "trees": {
                     "label": "Trees"
                 },
@@ -2333,6 +2362,18 @@
                         "scoria": "Scoria"
                     }
                 },
+                "voltage/primary": {
+                    "label": "Primary Voltage",
+                    "placeholder": "225000"
+                },
+                "voltage/secondary": {
+                    "label": "Secondary Voltage",
+                    "placeholder": "400"
+                },
+                "voltage/tertiary": {
+                    "label": "Tertiary Voltage",
+                    "placeholder": "20000"
+                },
                 "wall": {
                     "label": "Type"
                 },
@@ -2360,6 +2401,22 @@
                 },
                 "wikipedia": {
                     "label": "Wikipedia"
+                },
+                "windings": {
+                    "label": "Number of Windings",
+                    "placeholder": "3"
+                },
+                "windings/configuration": {
+                    "label": "Windings Configuration",
+                    "options": {
+                        "star": "Star",
+                        "delta": "Delta",
+                        "open-delta": "Open Delta",
+                        "zigzag": "Zig Zag",
+                        "open": "Open",
+                        "scott": "Scott",
+                        "leblanc": "Leblanc"
+                    }
                 }
             },
             "presets": {