diff --git a/assets/themes/street_lighting/street_lighting.json b/assets/themes/street_lighting/street_lighting.json
index 8e2f66c84f..0b0ca23898 100644
--- a/assets/themes/street_lighting/street_lighting.json
+++ b/assets/themes/street_lighting/street_lighting.json
@@ -238,6 +238,128 @@
               }
             }
           ]
+        },
+        {
+          "id": "colour",
+          "question": {
+            "en": "What colour light does this lamp emit?",
+            "nl": "Wat voor kleur licht geeft deze lantaarn?"
+          },
+          "render": {
+            "en": "This lamp emits {light:colour} light",
+            "nl": "Deze lantaarn geeft {light:colour} licht"
+          },
+          "freeform": {
+            "key": "light:colour"
+          },
+          "mappings": [
+            {
+              "if": "light:colour=white",
+              "then": {
+                "en": "This lamp emits white light",
+                "nl": "Deze lantaarn geeft wit licht"
+              }
+            },
+            {
+              "if": "light:colour=green",
+              "then": {
+                "en": "This lamp emits green light",
+                "nl": "Deze lantaarn geeft groen licht"
+              }
+            },
+            {
+              "if": "light:colour=orange",
+              "then": {
+                "en": "This lamp emits orange light",
+                "nl": "Deze lantaarn geeft oranje licht"
+              }
+            }
+          ]
+        },
+        {
+          "id": "count",
+          "render": {
+            "en": "This lamp has {light:count} fixtures",
+            "nl": "Deze lantaarn heeft {light:count} lampen"
+          },
+          "question": {
+            "en": "How many fixtures does this light have?",
+            "nl": "Hoeveel lampen heeft deze lantaarn?"
+          },
+          "condition": "support=pole",
+          "freeform": {
+            "key": "light:count",
+            "type": "pnat"
+          },
+          "mappings": [
+            {
+              "if": "light:count=1",
+              "then": {
+                "en": "This lamp has 1 fixture",
+                "nl": "Deze lantaarn heeft 1 lamp"
+              }
+            },
+            {
+              "if": "light:count=2",
+              "then": {
+                "en": "This lamp has 2 fixtures",
+                "nl": "Deze lantaarn heeft 2 lampen"
+              }
+            }
+          ]
+        },
+        {
+          "id": "lit",
+          "question": {
+            "en": "When is this lamp lit?",
+            "nl": "Wanneer is deze lantaarn verlicht?"
+          },
+          "mappings": [
+            {
+              "if": "light:lit=dusk-dawn",
+              "then": {
+                "en": "This lamp is lit at night",
+                "nl": "Deze lantaarn is 's nachts verlicht"
+              }
+            },
+            {
+              "if": "light:lit=24/7",
+              "then": {
+                "en": "This lamp is lit 24/7",
+                "nl": "Deze lantaarn is 24/7 verlicht"
+              }
+            },
+            {
+              "if": "light:lit=motion",
+              "then": {
+                "en": "This lamp is lit based on motion",
+                "nl": "Deze lantaarn is verlicht op basis van beweging"
+              }
+            },
+            {
+              "if": "light:lit=demand",
+              "then": {
+                "en": "This lamp is lit based on demand (e.g. with a pushbutton)",
+                "nl": "Deze lantaarn is verlicht op verzoek (bijv. met een drukknop)"
+              }
+            }
+          ]
+        },
+        {
+          "id": "direction",
+          "render": {
+            "en": "This lamp points towards {light:direction}",
+            "nl": "Deze lantaarn is gericht naar {light:direction}"
+          },
+          "question": {
+            "en": "Where does this lamp point to?",
+            "nl": "Waar is deze lamp heengericht?"
+          },
+          "condition": "light:count=1",
+          "freeform": {
+            "key": "light:direction",
+            "type": "direction"
+          }
         }
       ]
     },
@@ -288,7 +410,7 @@
             {
               "if": "lit=no",
               "then": {
-                "en": "This street is not lit",
+                "en": "This road is not lit",
                 "nl": "Deze straat is niet verlicht"
               }
             },
@@ -353,7 +475,7 @@
             {
               "if": "lit=no",
               "then": {
-                "en": "This street is not lit",
+                "en": "This road is not lit",
                 "nl": "Deze straat is niet verlicht"
               }
             },
diff --git a/langs/themes/en.json b/langs/themes/en.json
index 9874ca47aa..2bb027ecb4 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -1238,6 +1238,37 @@
                     }
                 },
                 "tagRenderings": {
+                    "colour": {
+                        "mappings": {
+                            "0": {
+                                "then": "This lamp emits white light"
+                            },
+                            "1": {
+                                "then": "This lamp emits green light"
+                            },
+                            "2": {
+                                "then": "This lamp emits orange light"
+                            }
+                        },
+                        "question": "What colour light does this lamp emit?",
+                        "render": "This lamp emits {light:colour} light"
+                    },
+                    "count": {
+                        "mappings": {
+                            "0": {
+                                "then": "This lamp has 1 fixture"
+                            },
+                            "1": {
+                                "then": "This lamp has 2 fixtures"
+                            }
+                        },
+                        "question": "How many fixtures does this light have?",
+                        "render": "This lamp has {light:count} fixtures"
+                    },
+                    "direction": {
+                        "question": "Where does this lamp point to?",
+                        "render": "This lamp points towards {light:direction}"
+                    },
                     "lamp_mount": {
                         "mappings": {
                             "0": {
@@ -1249,6 +1280,23 @@
                         },
                         "question": "How is this lamp mounted to the pole?"
                     },
+                    "lit": {
+                        "mappings": {
+                            "0": {
+                                "then": "This lamp is lit at night"
+                            },
+                            "1": {
+                                "then": "This lamp is lit 24/7"
+                            },
+                            "2": {
+                                "then": "This lamp is lit based on motion"
+                            },
+                            "3": {
+                                "then": "This lamp is lit based on demand (e.g. with a pushbutton)"
+                            }
+                        },
+                        "question": "When is this lamp lit?"
+                    },
                     "method": {
                         "mappings": {
                             "0": {
@@ -1337,10 +1385,10 @@
                                 "then": "This road is not lit"
                             },
                             "2": {
-                                "then": "This road is lit at night"
+                                "then": "This street is lit at night"
                             },
                             "3": {
-                                "then": "This road is lit 24/7"
+                                "then": "This street is lit 24/7"
                             }
                         },
                         "question": "Is this street lit?"
@@ -1362,10 +1410,10 @@
                                 "then": "This road is not lit"
                             },
                             "2": {
-                                "then": "This road is lit at night"
+                                "then": "This street is lit at night"
                             },
                             "3": {
-                                "then": "This road is lit 24/7"
+                                "then": "This street is lit 24/7"
                             }
                         },
                         "question": "Is this street lit?"
diff --git a/langs/themes/nl.json b/langs/themes/nl.json
index 7045a2658b..edd490c727 100644
--- a/langs/themes/nl.json
+++ b/langs/themes/nl.json
@@ -908,6 +908,37 @@
                     }
                 },
                 "tagRenderings": {
+                    "colour": {
+                        "mappings": {
+                            "0": {
+                                "then": "Deze lantaarn geeft wit licht"
+                            },
+                            "1": {
+                                "then": "Deze lantaarn geeft groen licht"
+                            },
+                            "2": {
+                                "then": "Deze lantaarn geeft oranje licht"
+                            }
+                        },
+                        "question": "Wat voor kleur licht geeft deze lantaarn?",
+                        "render": "Deze lantaarn geeft {light:colour} licht"
+                    },
+                    "count": {
+                        "mappings": {
+                            "0": {
+                                "then": "Deze lantaarn heeft 1 lamp"
+                            },
+                            "1": {
+                                "then": "Deze lantaarn heeft 2 lampen"
+                            }
+                        },
+                        "question": "Hoeveel lampen heeft deze lantaarn?",
+                        "render": "Deze lantaarn heeft {light:count} lampen"
+                    },
+                    "direction": {
+                        "question": "Waar is deze lamp heengericht?",
+                        "render": "Deze lantaarn is gericht naar {light:direction}"
+                    },
                     "lamp_mount": {
                         "mappings": {
                             "0": {
@@ -919,6 +950,23 @@
                         },
                         "question": "Hoe zit deze lantaarn aan de paal?"
                     },
+                    "lit": {
+                        "mappings": {
+                            "0": {
+                                "then": "Deze lantaarn is 's nachts verlicht"
+                            },
+                            "1": {
+                                "then": "Deze lantaarn is 24/7 verlicht"
+                            },
+                            "2": {
+                                "then": "Deze lantaarn is verlicht op basis van beweging"
+                            },
+                            "3": {
+                                "then": "Deze lantaarn is verlicht op verzoek (bijv. met een drukknop)"
+                            }
+                        },
+                        "question": "Wanneer is deze lantaarn verlicht?"
+                    },
                     "method": {
                         "mappings": {
                             "0": {
@@ -1001,16 +1049,16 @@
                     "lit": {
                         "mappings": {
                             "0": {
-                                "then": "Deze weg is verlicht"
+                                "then": "Deze straat is verlicht"
                             },
                             "1": {
-                                "then": "Deze weg is niet verlicht"
+                                "then": "Deze straat is niet verlicht"
                             },
                             "2": {
-                                "then": "Deze weg is 's nachts verlicht"
+                                "then": "Deze straat is 's nachts verlicht"
                             },
                             "3": {
-                                "then": "Deze weg is 24/7 verlicht"
+                                "then": "Deze straat is 24/7 verlicht"
                             }
                         },
                         "question": "Is deze straat verlicht?"
@@ -1026,16 +1074,16 @@
                     "lit": {
                         "mappings": {
                             "0": {
-                                "then": "Deze weg is verlicht"
+                                "then": "Deze straat is verlicht"
                             },
                             "1": {
-                                "then": "Deze weg is niet verlicht"
+                                "then": "Deze straat is niet verlicht"
                             },
                             "2": {
-                                "then": "Deze weg is 's nachts verlicht"
+                                "then": "Deze straat is 's nachts verlicht"
                             },
                             "3": {
-                                "then": "Deze weg is 24/7 verlicht"
+                                "then": "Deze straat is 24/7 verlicht"
                             }
                         },
                         "question": "Is deze straat verlicht?"