diff --git a/assets/themes/artwork/artwork.json b/assets/themes/artwork/artwork.json
index 454ff9eac1..feb957abc9 100644
--- a/assets/themes/artwork/artwork.json
+++ b/assets/themes/artwork/artwork.json
@@ -429,4 +429,4 @@
       ]
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/assets/themes/cycle_infra/cycle_infra.json b/assets/themes/cycle_infra/cycle_infra.json
index 6f1222ccf8..9efe7442d9 100644
--- a/assets/themes/cycle_infra/cycle_infra.json
+++ b/assets/themes/cycle_infra/cycle_infra.json
@@ -340,18 +340,67 @@
               }
             },
             {
-              "if": "cycleway:surface=asphalt",
+              "if": "cycleway:surface=unhewn_cobblestone",
               "then": {
                 "en": "This cycleway is made of asphalt",
                 "nl": "Dit fietspad is gemaakt van asfalt"
               }
             },
             {
-              "if": "cycleway:surface=paved",
+              "if": "cycleway:surface=sett",
               "then": {
                 "en": "This cycleway is paved",
                 "nl": "Dit fietspad is geplaveid"
               }
+            },
+            {
+              "if": "cycleway:surface=asphalt",
+              "then": {
+                "en": "This cycleway is paved with stones with a flat top",
+                "nl": "Dit fietspad is geplaveid met stenen"
+              }
+            },
+            {
+              "if": "cycleway:surface=paved",
+              "then": {
+                "en": "This cycleway is made of gravel",
+                "nl": "Dit fietspad is gemaakt van grind"
+              }
+            },
+            {
+              "if": "cycleway:surface=paving_stones",
+              "then": {
+                "en": "This cycleway is unhardened",
+                "nl": "Dit fietspad is onverhard"
+              }
+            },
+            {
+              "if": "cycleway:surface=gravel",
+              "then": {
+                "en": "This cycleway is made of gravel",
+                "nl": "Dit fietspad is gemaakt van grind"
+              }
+            },
+            {
+              "if": "cycleway:surface=fine_gravel",
+              "then": {
+                "en": "This cycleway is made of fine gravel",
+                "nl": "Dit fietspad is gemaakt van fijn grind"
+              }
+            },
+            {
+              "if": "cycleway:surface=pebblestone",
+              "then": {
+                "en": "This cycleway is made of pebblestone",
+                "nl": "Dit fietspad is gemaakt van kiezelsteentjes"
+              }
+            },
+            {
+              "if": "cycleway:surface=ground",
+              "then": {
+                "en": "This cycleway is made from raw ground",
+                "nl": "Dit fietspad is gemaakt van aarde"
+              }
             }
           ],
           "question": {
@@ -447,7 +496,7 @@
               }
             },
             {
-              "if": "surface=cobblestone",
+              "if": "surface=sett",
               "then": {
                 "en": "This street is made of cobblestone",
                 "nl": "Deze straat is gemaakt van kasseien"
diff --git a/assets/themes/cyclestreets/cyclestreets.json b/assets/themes/cyclestreets/cyclestreets.json
index a09314b9d3..a5a56c7cce 100644
--- a/assets/themes/cyclestreets/cyclestreets.json
+++ b/assets/themes/cyclestreets/cyclestreets.json
@@ -279,4 +279,4 @@
       ]
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/assets/themes/fruit_trees/fruit_trees.json b/assets/themes/fruit_trees/fruit_trees.json
index bf12bbeca2..60d6e8a234 100644
--- a/assets/themes/fruit_trees/fruit_trees.json
+++ b/assets/themes/fruit_trees/fruit_trees.json
@@ -170,4 +170,4 @@
     }
   ],
   "roamingRenderings": []
-}
+}
\ No newline at end of file
diff --git a/langs/themes/en.json b/langs/themes/en.json
index 04300ef69f..9f17306cd0 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -812,6 +812,27 @@
                             },
                             "4": {
                                 "then": "This cycleway is paved"
+                            },
+                            "5": {
+                                "then": "This cycleway is paved with stones with a flat top"
+                            },
+                            "6": {
+                                "then": "This cycleway is made of gravel"
+                            },
+                            "7": {
+                                "then": "This cycleway is unhardened"
+                            },
+                            "8": {
+                                "then": "This cycleway is made of gravel"
+                            },
+                            "9": {
+                                "then": "This cycleway is made of fine gravel"
+                            },
+                            "10": {
+                                "then": "This cycleway is made of pebblestone"
+                            },
+                            "11": {
+                                "then": "This cycleway is made from raw ground"
                             }
                         },
                         "question": "What is the surface of the cycleway made from?"
diff --git a/langs/themes/nl.json b/langs/themes/nl.json
index 0a42fb2cb5..888016ee4b 100644
--- a/langs/themes/nl.json
+++ b/langs/themes/nl.json
@@ -700,6 +700,27 @@
                             },
                             "4": {
                                 "then": "Dit fietspad is geplaveid"
+                            },
+                            "5": {
+                                "then": "Dit fietspad is geplaveid met stenen"
+                            },
+                            "6": {
+                                "then": "Dit fietspad is gemaakt van grind"
+                            },
+                            "7": {
+                                "then": "Dit fietspad is onverhard"
+                            },
+                            "8": {
+                                "then": "Dit fietspad is gemaakt van grind"
+                            },
+                            "9": {
+                                "then": "Dit fietspad is gemaakt van fijn grind"
+                            },
+                            "10": {
+                                "then": "Dit fietspad is gemaakt van kiezelsteentjes"
+                            },
+                            "11": {
+                                "then": "Dit fietspad is gemaakt van aarde"
                             }
                         },
                         "question": "Waaruit is het oppervlak van het fietspad van gemaakt?"