diff --git a/assets/themes/cycle_infra/cycle_infra.json b/assets/themes/cycle_infra/cycle_infra.json
index 37d9c97235..907505cd88 100644
--- a/assets/themes/cycle_infra/cycle_infra.json
+++ b/assets/themes/cycle_infra/cycle_infra.json
@@ -322,10 +322,33 @@
           },
           "mappings": [
             {
-              "if": "cycleway:surface=wood",
+              "if": "cycleway:surface=unpaved",
               "then": {
-                "en": "This cycleway is made of wood",
-                "nl": "Dit fietspad is gemaakt van hout"
+                "en": "This cycleway is unhardened",
+                "nl": "Dit fietspad is onverhard"
+              },
+              "hideInAnswer": true
+            },
+            {
+              "if": "cycleway:surface=paved",
+              "then": {
+                "en": "This cycleway is paved",
+                "nl": "Dit fietspad is geplaveid"
+              },
+              "hideInAnswer": true
+            },
+            {
+              "if": "cycleway:surface=asphalt",
+              "then": {
+                "en": "This cycleway is made of asphalt",
+                "nl": "Dit fietspad is gemaakt van asfalt"
+              }
+            },
+            {
+              "if": "cycleway:surface=paving_stones",
+              "then": {
+                "en": "This cycleway is made of smooth paving stones",
+                "nl": "Dit fietspad is gemaakt van straatstenen"
               }
             },
             {
@@ -338,43 +361,30 @@
             {
               "if": "cycleway:surface=cobblestone",
               "then": {
-                "en": "This cycleway is made of cobblestone",
-                "nl": "Dit fietspad is gemaakt van kasseien"
-              }
+                "en": "This cycleway is made of cobblestone (unhewn or sett)",
+                "nl": "Dit fietspad is gemaakt van kasseien (natuurlijk of verwerkt)"
+              },
+              "hideInAnswer": true
             },
             {
               "if": "cycleway:surface=unhewn_cobblestone",
               "then": {
-                "en": "This cycleway is made of asphalt",
-                "nl": "Dit fietspad is gemaakt van asfalt"
+                "en": "This cycleway is made of raw, natural cobblestone",
+                "nl": "Dit fietspad is gemaakt van ruwe, natuurlijke kasseien"
               }
             },
             {
               "if": "cycleway:surface=sett",
               "then": {
-                "en": "This cycleway is paved",
-                "nl": "Dit fietspad is geplaveid"
+                "en": "This cycleway is made of flat, square cobblestone",
+                "nl": "Dit fietspad is gemaakt van vlakke, rechthoekige kasseien"
               }
             },
             {
-              "if": "cycleway:surface=asphalt",
+              "if": "cycleway:surface=wood",
               "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"
+                "en": "This cycleway is made of wood",
+                "nl": "Dit fietspad is gemaakt van hout"
               }
             },
             {
@@ -493,63 +503,98 @@
           },
           "mappings": [
             {
-              "if": "surface=wood",
+              "if": "surface=unpaved",
               "then": {
-                "en": "This street is made of wood",
-                "nl": "Deze straat is gemaakt van hout"
+                "en": "This cycleway is unhardened",
+                "nl": "Dit fietspad is onverhard"
+              },
+              "hideInAnswer": true
+            },
+            {
+              "if": "surface=paved",
+              "then": {
+                "en": "This cycleway is paved",
+                "nl": "Dit fietspad is geplaveid"
+              },
+              "hideInAnswer": true
+            },
+            {
+              "if": "surface=asphalt",
+              "then": {
+                "en": "This cycleway is made of asphalt",
+                "nl": "Dit fietspad is gemaakt van asfalt"
+              }
+            },
+            {
+              "if": "surface=paving_stones",
+              "then": {
+                "en": "This cycleway is made of smooth paving stones",
+                "nl": "Dit fietspad is gemaakt van straatstenen"
               }
             },
             {
               "if": "surface=concrete",
               "then": {
-                "en": "This street is made of concrete",
-                "nl": "Deze straat is gemaakt van beton"
+                "en": "This cycleway is made of concrete",
+                "nl": "Dit fietspad is gemaakt van beton"
+              }
+            },
+            {
+              "if": "surface=cobblestone",
+              "then": {
+                "en": "This cycleway is made of cobblestone (unhewn or sett)",
+                "nl": "Dit fietspad is gemaakt van kasseien (natuurlijk of verwerkt)"
+              },
+              "hideInAnswer": true
+            },
+            {
+              "if": "surface=unhewn_cobblestone",
+              "then": {
+                "en": "This cycleway is made of raw, natural cobblestone",
+                "nl": "Dit fietspad is gemaakt van ruwe, natuurlijke kasseien"
               }
             },
             {
               "if": "surface=sett",
               "then": {
-                "en": "This street is made of cobblestone",
-                "nl": "Deze straat is gemaakt van kasseien"
+                "en": "This cycleway is made of flat, square cobblestone",
+                "nl": "Dit fietspad is gemaakt van vlakke, rechthoekige kasseien"
               }
             },
             {
-              "if": "surface=asphalt",
+              "if": "surface=wood",
               "then": {
-                "en": "This street is made of asphalt",
-                "nl": "Deze straat is gemaakt van asfalt"
+                "en": "This cycleway is made of wood",
+                "nl": "Dit fietspad is gemaakt van hout"
               }
             },
             {
-              "if": "surface=paved",
+              "if": "surface=gravel",
               "then": {
-                "en": "This street is paved",
-                "nl": "Deze straat is geplaveid"
+                "en": "This cycleway is made of gravel",
+                "nl": "Dit fietspad is gemaakt van grind"
               }
             },
             {
               "if": "surface=fine_gravel",
               "then": {
-                "en": "This street is made from fine gravel",
-                "nl": "Deze straat is gemaakt van fijn grind"
-              },
-              "hideInAnswer": true
+                "en": "This cycleway is made of fine gravel",
+                "nl": "Dit fietspad is gemaakt van fijn grind"
+              }
             },
             {
-              "if": "surface=cobblestone",
+              "if": "surface=pebblestone",
               "then": {
-                "en": "This street is made from cobblestone",
-                "nl": "Deze straat is gemaakt van kasseien"
-              },
-              "hideInAnswer": true
+                "en": "This cycleway is made of pebblestone",
+                "nl": "Dit fietspad is gemaakt van kiezelsteentjes"
+              }
             },
             {
-              "if": "surface=paving_stones",
+              "if": "surface=ground",
               "then": {
-                "en": "This street is made from paving stones",
-                "nl": "Deze straat is gemaakt van geplaveide stenen"
-              },
-              "hideInAnswer": true
+                "en": "This cycleway is made from raw ground",
+                "nl": "Dit fietspad is gemaakt van aarde"
+              }
             }
           ],
           "question": {
diff --git a/langs/themes/en.json b/langs/themes/en.json
index 6fb0be0158..7f450beca7 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -799,39 +799,42 @@
                         "render": "This cyleway is made of {cycleway:surface}",
                         "mappings": {
                             "0": {
-                                "then": "This cycleway is made of wood"
-                            },
-                            "1": {
-                                "then": "This cycleway is made of concrete"
-                            },
-                            "2": {
-                                "then": "This cycleway is made of cobblestone"
-                            },
-                            "3": {
-                                "then": "This cycleway is made of asphalt"
-                            },
-                            "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"
                             },
+                            "1": {
+                                "then": "This cycleway is paved"
+                            },
+                            "2": {
+                                "then": "This cycleway is made of asphalt"
+                            },
+                            "3": {
+                                "then": "This cycleway is made of smooth paving stones"
+                            },
+                            "4": {
+                                "then": "This cycleway is made of concrete"
+                            },
+                            "5": {
+                                "then": "This cycleway is made of cobblestone (unhewn or sett)"
+                            },
+                            "6": {
+                                "then": "This cycleway is made of raw, natural cobblestone"
+                            },
+                            "7": {
+                                "then": "This cycleway is made of flat, square cobblestone"
+                            },
                             "8": {
-                                "then": "This cycleway is made of gravel"
+                                "then": "This cycleway is made of wood"
                             },
                             "9": {
-                                "then": "This cycleway is made of fine gravel"
+                                "then": "This cycleway is made of gravel"
                             },
                             "10": {
-                                "then": "This cycleway is made of pebblestone"
+                                "then": "This cycleway is made of fine gravel"
                             },
                             "11": {
+                                "then": "This cycleway is made of pebblestone"
+                            },
+                            "12": {
                                 "then": "This cycleway is made from raw ground"
                             }
                         },
@@ -870,28 +873,43 @@
                         "render": "This road is made of {surface}",
                         "mappings": {
                             "0": {
-                                "then": "This street is made of wood"
+                                "then": "This cycleway is unhardened"
                             },
                             "1": {
-                                "then": "This street is made of concrete"
+                                "then": "This cycleway is paved"
                             },
                             "2": {
-                                "then": "This street is made of cobblestone"
+                                "then": "This cycleway is made of asphalt"
                             },
                             "3": {
-                                "then": "This street is made of asphalt"
+                                "then": "This cycleway is made of smooth paving stones"
                             },
                             "4": {
-                                "then": "This street is paved"
+                                "then": "This cycleway is made of concrete"
                             },
                             "5": {
-                                "then": "This street is made from fine gravel"
+                                "then": "This cycleway is made of cobblestone (unhewn or sett)"
                             },
                             "6": {
-                                "then": "This street is made from cobblestone"
+                                "then": "This cycleway is made of raw, natural cobblestone"
                             },
                             "7": {
-                                "then": "This street is made from paving stones"
+                                "then": "This cycleway is made of flat, square cobblestone"
+                            },
+                            "8": {
+                                "then": "This cycleway is made of wood"
+                            },
+                            "9": {
+                                "then": "This cycleway is made of gravel"
+                            },
+                            "10": {
+                                "then": "This cycleway is made of fine gravel"
+                            },
+                            "11": {
+                                "then": "This cycleway is made of pebblestone"
+                            },
+                            "12": {
+                                "then": "This cycleway is made from raw ground"
                             }
                         },
                         "question": "What is the surface of the street made from?"
@@ -936,7 +954,7 @@
                                 "then": "Compulsory cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'>"
                             },
                             "1": {
-                                "then": "Compulsory cycleway (with supplementary sign)<br><img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'> "
+                                "then": "Compulsory cycleway (with supplementary sign)<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'> "
                             },
                             "2": {
                                 "then": "Segregated foot/cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D09.svg' style='width: 3em'>"
diff --git a/langs/themes/nl.json b/langs/themes/nl.json
index 17d236cdd1..169271f004 100644
--- a/langs/themes/nl.json
+++ b/langs/themes/nl.json
@@ -687,39 +687,42 @@
                         "render": "Dit fietspad is gemaakt van {cycleway:surface}",
                         "mappings": {
                             "0": {
-                                "then": "Dit fietspad is gemaakt van hout"
-                            },
-                            "1": {
-                                "then": "Dit fietspad is gemaakt van beton"
-                            },
-                            "2": {
-                                "then": "Dit fietspad is gemaakt van kasseien"
-                            },
-                            "3": {
-                                "then": "Dit fietspad is gemaakt van asfalt"
-                            },
-                            "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"
                             },
+                            "1": {
+                                "then": "Dit fietspad is geplaveid"
+                            },
+                            "2": {
+                                "then": "Dit fietspad is gemaakt van asfalt"
+                            },
+                            "3": {
+                                "then": "Dit fietspad is gemaakt van straatstenen"
+                            },
+                            "4": {
+                                "then": "Dit fietspad is gemaakt van beton"
+                            },
+                            "5": {
+                                "then": "Dit fietspad is gemaakt van kasseien (natuurlijk of verwerkt)"
+                            },
+                            "6": {
+                                "then": "Dit fietspad is gemaakt van ruwe, natuurlijke kasseien"
+                            },
+                            "7": {
+                                "then": "Dit fietspad is gemaakt van vlakke, rechthoekige kasseien"
+                            },
                             "8": {
-                                "then": "Dit fietspad is gemaakt van grind"
+                                "then": "Dit fietspad is gemaakt van hout"
                             },
                             "9": {
-                                "then": "Dit fietspad is gemaakt van fijn grind"
+                                "then": "Dit fietspad is gemaakt van grind"
                             },
                             "10": {
-                                "then": "Dit fietspad is gemaakt van kiezelsteentjes"
+                                "then": "Dit fietspad is gemaakt van fijn grind"
                             },
                             "11": {
+                                "then": "Dit fietspad is gemaakt van kiezelsteentjes"
+                            },
+                            "12": {
                                 "then": "Dit fietspad is gemaakt van aarde"
                             }
                         },
@@ -758,28 +761,43 @@
                         "render": "Deze weg is gemaakt van {surface}",
                         "mappings": {
                             "0": {
-                                "then": "Deze straat is gemaakt van hout"
+                                "then": "Dit fietspad is onverhard"
                             },
                             "1": {
-                                "then": "Deze straat is gemaakt van beton"
+                                "then": "Dit fietspad is geplaveid"
                             },
                             "2": {
-                                "then": "Deze straat is gemaakt van kasseien"
+                                "then": "Dit fietspad is gemaakt van asfalt"
                             },
                             "3": {
-                                "then": "Deze straat is gemaakt van asfalt"
+                                "then": "Dit fietspad is gemaakt van straatstenen"
                             },
                             "4": {
-                                "then": "Deze straat is geplaveid"
+                                "then": "Dit fietspad is gemaakt van beton"
                             },
                             "5": {
-                                "then": "Deze straat is gemaakt van fijn grind"
+                                "then": "Dit fietspad is gemaakt van kasseien (natuurlijk of verwerkt)"
                             },
                             "6": {
-                                "then": "Deze straat is gemaakt van kasseien"
+                                "then": "Dit fietspad is gemaakt van ruwe, natuurlijke kasseien"
                             },
                             "7": {
-                                "then": "Deze straat is gemaakt van geplaveide stenen"
+                                "then": "Dit fietspad is gemaakt van vlakke, rechthoekige kasseien"
+                            },
+                            "8": {
+                                "then": "Dit fietspad is gemaakt van hout"
+                            },
+                            "9": {
+                                "then": "Dit fietspad is gemaakt van grind"
+                            },
+                            "10": {
+                                "then": "Dit fietspad is gemaakt van fijn grind"
+                            },
+                            "11": {
+                                "then": "Dit fietspad is gemaakt van kiezelsteentjes"
+                            },
+                            "12": {
+                                "then": "Dit fietspad is gemaakt van aarde"
                             }
                         },
                         "question": "Waaruit is het oppervlak van de straat gemaakt?"
@@ -798,7 +816,7 @@
                                 "then": "Verplicht fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'>"
                             },
                             "1": {
-                                "then": "Verplicht fietspad (met onderbord)<br><img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'>"
+                                "then": "Verplicht fietspad (met onderbord)<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 3em'>"
                             },
                             "2": {
                                 "then": "Afgescheiden voet-/fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D09.svg' style='width: 3em'>"