diff --git a/assets/themes/dog/dog.json b/assets/themes/dog/dog.json
index 2ea6b9a593..83e0fff4b6 100644
--- a/assets/themes/dog/dog.json
+++ b/assets/themes/dog/dog.json
@@ -217,95 +217,72 @@
       }
     },
     {
+      "builtin": "shops",
       "id": "dogshop",
-      "source": {
-        "osmTags": {
-          "and": [
-            "shop~*",
+      "override": {
+        "id": "dogshop",
+        "name": {
+          "en": "dog-friendly shop",
+          "da": "hundevenlig butik"
+        },
+        "title": {
+          "render": {
+            "en": "dog-friendly shop",
+            "da": "hundevenlig butik"
+          },
+          "mappings": [
             {
+              "if": "name~*",
+              "then": {
+              "*": "{name}"
+              }
+            }
+          ]
+        },
+        "mapRendering": [
+          {
+            "location": [
+              "point",
+              "centroid"
+            ],
+            "icon": {
+              "render": "./assets/themes/dog/dogshop.svg",
+              "mappings": [
+                {
+                  "if": {
+                    "and": [
+                      "shop=pet"
+                    ]
+                  },
+                  "then": "./assets/themes/dog/petshop.svg"
+              }
+              ]
+            },
+            "iconSize": "30,30,center"
+           
+          },
+          {
+            "#": "Rendering of a line",
+            "color": "#ff0",
+            "width": 5
+          }
+        ],
+        "=presets": [],
+        "source": {
+          "=osmTags": {
+            "and": [
+              "shop~*",
+              {
               "or": [
                 "dog=leashed",
                 "dog=yes",
                 "shop=pet"
               ]
-            }
+              }
           ]
-        }
-      },
-      "minzoom": 12,
-      "name": {
-        "en": "dogfriendly shop",
-        "da": "hundevenlig butik"
-      },
-      "title": {
-        "render": {
-          "en": "dog-friendly shop",
-          "da": "hundevenlig butik"
-        },
-        "mappings": [
-          {
-            "if": "name~*",
-            "then": {
-              "*": "{name}"
-            }
           }
-        ]
-      },
-      "mapRendering": [
-        {
-          "location": [
-            "point",
-            "centroid"
-          ],
-          "icon": {
-            "render": "./assets/themes/dog/dogshop.svg",
-            "mappings": [
-              {
-                "if": {
-                  "and": [
-                    "shop=pet"
-                  ]
-                },
-                "then": "./assets/themes/dog/petshop.svg"
-              }
-            ]
-          },
-          "iconSize": "30,30,center",
-          "label": {
-            "render": {
-              "en": "dog friendly shop",
-              "da": "hundevenlig butik"
-            },
-            "mappings": [
-              {
-                "if": "name~*",
-                "then": {
-                  "*": "{name}"
-                }
-              }
-            ]
-          }
-        },
-        {
-          "#": "Rendering of a line",
-          "color": "#ff0",
-          "width": 5
         }
-      ],
-      "tagRenderings": [
-        {
-          "id": "shoptype",
-          "render": {
-            "en": "sells {shop}",
-            "da": "sælger {shop}"
-          },
-          "condition": "shop!=pet"
-        },
-        "website",
-        "reviews",
-        "phone",
-        "images"
-      ]
+      }
     },
     {
       "id": "veterinary",
@@ -392,6 +369,14 @@
         "filter": null,
         "name": null
       }
+    },
+    {
+      "builtin": "shops",
+      "override": {
+        "minzoom": 19,
+        "filter": null,
+        "name": null
+      }
     }
   ]
 }