diff --git a/cycleway_types.yaml b/cycleway_types.yaml
index d4f439d..c37aced 100644
--- a/cycleway_types.yaml
+++ b/cycleway_types.yaml
@@ -15,7 +15,7 @@ feature:
     {% set type = tags.highway %}
 
     {% if tags.highway == 'path' and tags.bicycle and tags.bicycle != 'no' %}
-      {% set type = 'cycleway' %}
+      {% set type = 'highway=cycleway' %}
     {% endif %}
 
     {% if tags.cyclestreet == 'yes' %}
@@ -195,13 +195,13 @@ feature:
 
   style:footway:
     color: |
-      {{ const.types.footway.color }}
+      {{ const.types['highway=footway'].color }}
 
     width: |
       {% if tags.segregated == 'yes' %}
-      {{ const.types.footway.width / 2 }}
+      {{ const.types['highway=footway'].width / 2 }}
       {% else %}
-      {{ const.types.footway.width }}
+      {{ const.types['highway=footway'].width }}
       {% endif %}
 
     dashArray: |
@@ -232,7 +232,7 @@ feature:
 
     offset: |
       {% if tags.segregated == 'yes' %}
-      {{ (const.types.footway.width / 2 - 1) * -1 }}
+      {{ (const.types['highway=footway'].width / 2 - 1) * -1 }}
       {% endif %}
 
     zIndex: |-
@@ -499,14 +499,12 @@ const:
     highway=living_street:
       color: '#ff9f00'
       width: 8
-    cycleway:
+    highway=cycleway:
       color: '#009f00'
       width: 4
-      label: highway=cycleway
-    footway:
+    highway=footway:
       color: '#ff9f00'
       width: 4
-      label: highway=footway
     lane:
       color: '#00df3f'
     track: