diff --git a/assets/themes/openwindpowermap/license_info.json b/assets/themes/openwindpowermap/license_info.json
new file mode 100644
index 000000000..1ca28a091
--- /dev/null
+++ b/assets/themes/openwindpowermap/license_info.json
@@ -0,0 +1,12 @@
+[
+  {
+    "authors": [
+      "Iconathon"
+    ],
+    "path": "wind_turbine.svg",
+    "license": "CC0",
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:Wind_Turbine_(2076)_-_The_Noun_Project.svg"
+    ]
+  }
+]
\ No newline at end of file
diff --git a/assets/themes/openwindpowermap/openwindpowermap.json b/assets/themes/openwindpowermap/openwindpowermap.json
new file mode 100644
index 000000000..39c2baa41
--- /dev/null
+++ b/assets/themes/openwindpowermap/openwindpowermap.json
@@ -0,0 +1,165 @@
+{
+	"id": "openwindpowermap",
+	"title": {
+		"en": "OpenWindPowerMap"
+	},
+	"maintainer": "Seppe Santens",
+	"icon": "./assets/themes/openwindpowermap/wind_turbine.svg",
+	"description": {
+		"en": "A map for showing and editing wind turbines."
+	},
+	"language": [
+		"en"
+	],
+	"version": "2021-06-18",
+	"startLat": 50.520,
+	"startLon": 4.643,
+	"startZoom": 8,
+	"clustering": {
+    "maxZoom": 8
+  },
+	"layers": [
+		{
+			"id": "windturbine",
+			"name": {
+				"en": "wind turbine"
+			},
+			"source": {
+				"osmTags": "generator:source=wind"
+			},
+			"minzoom": 10,
+			"wayHandling": 1,
+			"title": {
+				"render": {
+					"en": "wind turbine"
+				},
+				"mappings": [
+					{
+						"if": "name~*",
+						"then": {
+							"en": "{name}"
+						}
+					}
+				]
+			},
+			"icon": "./assets/themes/openwindpowermap/wind_turbine.svg",
+			"iconSize": "40, 40, bottom",
+			"label": {
+				"mappings": [
+					{
+						"if": "generator:output:electricity~^[0-9]+.*[W]$",
+						"then": "<div style='background-color: rgba(0,0,0,0.3); color: white; font-size: 8px; padding: 0.25em; border-radius:0.5em'>{generator:output:electricity}</div>"
+					}
+				]
+			},
+			"tagRenderings": [
+				{
+					"render": {
+						"en": "The power output of this wind turbine is {generator:output:electricity}."
+					},
+					"question": {
+						"en": "What is the power output of this wind turbine? (e.g. 2.3 MW)"
+					},
+					"freeform": {
+						"key": "generator:output:electricity"
+					}
+				},
+				{
+					"render": {
+						"en": "This wind turbine is operated by {operator}."
+					},
+					"question": {
+						"en": "Who operates this wind turbine?"
+					},
+					"freeform": {
+						"key": "operator"
+					}
+				},
+				{
+					"render": {
+						"en": "The total height (including rotor radius) of this wind turbine is {height} metres."
+					},
+					"question": {
+						"en": "What is the total height of this wind turbine (including rotor radius), in metres?"
+					},
+					"freeform": {
+						"key": "height",
+						"type": "float"
+					}
+				},
+				{
+					"render": {
+						"en": "The rotor diameter of this wind turbine is {rotor:diameter} metres."
+					},
+					"question": {
+						"en": "What is the rotor diameter of this wind turbine, in metres?"
+					},
+					"freeform": {
+						"key": "rotor:diameter",
+						"type": "float"
+					}
+				},
+				{
+					"render": {
+						"en": "This wind turbine went into operation on/in {start_date}."
+					},
+					"question": {
+						"en": "When did this wind turbine go into operation?"
+					},
+					"freeform": {
+						"key": "start_date",
+						"type": "date"
+					}
+				},
+				"images"
+			],
+			"presets": [
+				{
+					"tags": [
+						"power=generator",
+						"generator:source=wind"
+					],
+					"title": {
+						"en": "wind turbine"
+					}
+				}
+			]
+		}
+	],
+	"units": [
+		{
+			"appliesToKey": ["generator:output:electricity"],
+			"applicableUnits": [{
+				"canonicalDenomination": "MW",
+				"alternativeDenomination": ["megawatts","megawatt"],
+				"human": {
+					"en": " megawatts",
+					"nl": " megawatt"
+				}
+			},{
+				"canonicalDenomination": "kW",
+				"alternativeDenomination": ["kilowatts","kilowatt"],
+				"human": {
+					"en": " kilowatts",
+					"nl": " kilowatt"
+				}
+			},{
+				"canonicalDenomination": "W",
+				"alternativeDenomination": ["watts","watt"],
+				"human": {
+					"en": " watts",
+					"nl": " watt"
+				}
+			},{
+				"canonicalDenomination": "GW",
+				"alternativeDenomination": ["gigawatts","gigawatt"],
+				"human": {
+					"en": " gigawatts",
+					"nl": " gigawatt"
+				}
+			}],
+			"eraseInvalidValues": true
+		}
+	],
+	"defaultBackgroundId": "CartoDB.Voyager"
+}
diff --git a/assets/themes/openwindpowermap/wind_turbine.svg b/assets/themes/openwindpowermap/wind_turbine.svg
new file mode 100644
index 000000000..a388b8fae
--- /dev/null
+++ b/assets/themes/openwindpowermap/wind_turbine.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 58.391 100" enable-background="new 0 0 58.391 100" xml:space="preserve"><circle cx="38.721" cy="33.621" r="4.148"></circle><path d="M45.875,29.436C57.268,8.877,59.217,0.677,58.122,0.045c-1.091-0.631-7.217,5.15-19.313,25.282
+	C41.822,25.359,44.447,27.003,45.875,29.436z"></path><path d="M30.424,33.621c0-1.486,0.397-2.879,1.083-4.087C8.059,29.949,0,32.359,0,33.621c0,1.261,8.058,3.672,31.505,4.086
+	C30.821,36.5,30.424,35.108,30.424,33.621z"></path><path d="M45.884,37.794c-1.424,2.436-4.046,4.083-7.061,4.119C50.911,62.021,57.03,67.798,58.124,67.167
+	C59.217,66.535,57.271,58.34,45.884,37.794z"></path><path d="M34.573,42.889v1.795V100h8.297V56.07C40.49,52.552,37.745,48.22,34.573,42.889z"></path></svg>
\ No newline at end of file