diff --git a/assets/themes/street_lighting/street_lighting.json b/assets/themes/street_lighting/street_lighting.json
index 0b0ca2389..318c7c781 100644
--- a/assets/themes/street_lighting/street_lighting.json
+++ b/assets/themes/street_lighting/street_lighting.json
@@ -1,7 +1,7 @@
 {
   "id": "street_lighting",
   "maintainer": "Robin van der Linde",
-  "version": "20211018",
+  "version": "20211019",
   "language": [
     "en",
     "nl"
@@ -33,9 +33,35 @@
         "render": {
           "en": "Street Lamp",
           "nl": "Straatlantaarn"
-        }
+        },
+        "mappings": [
+          {
+            "if": "ref~*",
+            "then": {
+              "en": "Street Lamp {ref}",
+              "nl": "Straatlantaarn {ref}"
+            }
+          }
+        ]
       },
       "icon": "./assets/themes/street_lighting/street_lamp.svg",
+      "iconOverlays": [
+        {
+          "if": "light:colour=white",
+          "then": "circle:white",
+          "badge": true
+        },
+        {
+          "if": "light:colour=orange",
+          "then": "circle:#FFB000",
+          "badge": true
+        },
+        {
+          "if": "light:colour=green",
+          "then": "circle:#55FF55",
+          "badge": true
+        }
+      ],
       "presets": [
         {
           "title": {
diff --git a/langs/themes/en.json b/langs/themes/en.json
index 2bb027ecb..c48072aa6 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -1370,6 +1370,11 @@
                     }
                 },
                 "title": {
+                    "mappings": {
+                        "0": {
+                            "then": "Street Lamp {ref}"
+                        }
+                    },
                     "render": "Street Lamp"
                 }
             },
diff --git a/langs/themes/nl.json b/langs/themes/nl.json
index edd490c72..e4f9fae6f 100644
--- a/langs/themes/nl.json
+++ b/langs/themes/nl.json
@@ -1040,6 +1040,11 @@
                     }
                 },
                 "title": {
+                    "mappings": {
+                        "0": {
+                            "then": "Straatlantaarn {ref}"
+                        }
+                    },
                     "render": "Straatlantaarn"
                 }
             },