diff --git a/shared b/shared
index 5518c95..cf2e2ba 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit 5518c9523729e5c1f6cdb8dd1892ded8d0ed8c71
+Subproject commit cf2e2ba1db3011f686de7b8f11dfaa7d928c0d1e
diff --git a/templates/_types/blog/desktop/menu.html b/templates/_types/blog/desktop/menu.html
index 57dba58..2c1afc4 100644
--- a/templates/_types/blog/desktop/menu.html
+++ b/templates/_types/blog/desktop/menu.html
@@ -1,5 +1,5 @@
-{% import '_types/browse/desktop/_filter/search.html' as s %}
-{{ s.search(current_local_href, search, search_count, hx_select) }}
+{% from 'macros/search.html' import search_desktop %}
+{{ search_desktop(current_local_href, search, search_count, hx_select) }}
 {% include '_types/blog/_action_buttons.html' %}
 <div
     id="category-summary-desktop"
diff --git a/templates/_types/browse/desktop/_filter/search.html b/templates/_types/browse/desktop/_filter/search.html
deleted file mode 100644
index 2e0ea8e..0000000
--- a/templates/_types/browse/desktop/_filter/search.html
+++ /dev/null
@@ -1,44 +0,0 @@
-
-{% macro search(current_local_href,search, search_count, hx_select) -%}
-<!-- Search (1/3 width → 4/12 columns) -->
-  <!-- nb this does NOT oob itself!! -->
-   <div
-      id="search-desktop-wrapper"
-      class="flex flex-row gap-2 items-center"
-    >
-    <input
-      id="search-desktop"
-      type="text"
-      name="search"
-      aria-label="search"
-      class="w-full mx-1 my-3 px-3 py-2 text-md rounded-xl border-2 shadow-sm border-white placeholder-shown:border-white [&:not(:placeholder-shown)]:border-yellow-200"
-      hx-preserve
-      value="{{ search|default('', true) }}"
-      placeholder="search"
-      hx-trigger="input changed delay:300ms"
-      hx-target="#main-panel"
-            
-      hx-select="{{hx_select}}, #search-mobile-wrapper, #search-desktop-wrapper"
-      hx-get="{{ (current_local_href ~ {'search': None}|qs)|host}}"
-      hx-swap="outerHTML"
-      hx-push-url="true"
-      hx-headers='{"X-Origin":"search-desktop", "X-Search":"true"}'
-      hx-sync="this:replace"
-        
-      autocomplete="off"
-    >
-
-    <div
-        id="search-count-desktop"
-        aria-label="search count"
-        {% if not search_count %}
-          class="text-xl text-red-500"
-        {% endif %}
-      >
-        {% if search %}
-          {{search_count}}
-        {% endif %}
-        {{zap_filter}}
-      </div>
-  </div>
-{% endmacro %}
\ No newline at end of file
diff --git a/templates/_types/browse/like/button.html b/templates/_types/browse/like/button.html
deleted file mode 100644
index 426bdc1..0000000
--- a/templates/_types/browse/like/button.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<button
-  class="flex items-center gap-1 {% if liked %} text-red-600 {% else %} text-stone-300 {% endif %} hover:text-red-600 transition-colors w-[1em] h-[1em]"
-  hx-post="{{ like_url if like_url else url_for('market.browse.product.like_toggle', product_slug=slug)|host }}"
-  hx-target="this"
-  hx-swap="outerHTML"
-  hx-push-url="false"
-  hx-headers='{"X-CSRFToken": "{{ csrf_token() }}"}'
-  hx-swap-settle="0ms"
-  {% if liked %}
-    aria-label="Unlike this {{ item_type if item_type else 'product' }}"
-  {% else %}
-    aria-label="Like this {{ item_type if item_type else 'product' }}"
-  {% endif %}
->
-  {% if liked %}
-    <i aria-hidden="true" class="fa-solid fa-heart"></i>
-  {% else %}
-    <i aria-hidden="true" class="fa-regular fa-heart"></i>
-  {% endif %}
-</button>
diff --git a/templates/_types/browse/mobile/_filter/search.html b/templates/_types/browse/mobile/_filter/search.html
deleted file mode 100644
index 0f39178..0000000
--- a/templates/_types/browse/mobile/_filter/search.html
+++ /dev/null
@@ -1,40 +0,0 @@
-{% macro search(current_local_href, search, search_count, hx_select) -%}
-
-    <div
-      id="search-mobile-wrapper"
-      class="flex flex-row gap-2 items-center flex-1 min-w-0 pr-2"
-    >
-      <input
-        id="search-mobile"
-        type="text"
-        name="search"
-        aria-label="search"
-        class="text-base md:text-sm col-span-5 rounded-md px-3 py-2 mb-2 w-full min-w-0 max-w-full border-2 border-stone-200 placeholder-shown:border-stone-200 [&:not(:placeholder-shown)]:border-yellow-200"
-        hx-preserve
-        value="{{ search|default('', true) }}"
-        placeholder="search"
-        hx-trigger="input changed delay:300ms"
-        hx-target="#main-panel"
-              
-        hx-select="{{hx_select}}, #search-mobile-wrapper, #search-desktop-wrapper"
-        hx-get="{{ (current_local_href ~ {'search': None}|qs)|host }}"
-        hx-swap="outerHTML"
-        hx-push-url="true"
-        hx-headers='{"X-Origin":"search-mobile",  "X-Search":"true"}'
-        hx-sync="this:replace"
-        autocomplete="off"
-      >
-      
-        <div
-          id="search-count-mobile"
-          aria-label="search count"
-          {% if not search_count %}
-            class="text-xl text-red-500"
-          {% endif %}
-        >
-          {% if search %}
-            {{search_count}}
-          {% endif %}
-        </div>
-    </div>
-{% endmacro %}
\ No newline at end of file
diff --git a/templates/_types/cart/_mini.html b/templates/_types/cart/_mini.html
deleted file mode 100644
index a8255e4..0000000
--- a/templates/_types/cart/_mini.html
+++ /dev/null
@@ -1,45 +0,0 @@
-{% macro mini(oob=False, count=None) %}
-<div id="cart-mini" {% if oob %}hx-swap-oob="{{oob}}"{% endif %} >
-  {# cart_count is set by the context processor in all apps.
-     Cart app computes it from g.cart + calendar_cart_entries;
-     other apps get it from the cart internal API.
-     count param allows explicit override when macro is imported without context. #}
-  {% if count is not none %}
-    {% set _count = count %}
-  {% elif cart_count is defined and cart_count is not none %}
-    {% set _count = cart_count %}
-  {% elif cart is defined and cart is not none %}
-    {% set _count = (cart | sum(attribute="quantity")) + ((calendar_cart_entries | length) if calendar_cart_entries else 0) %}
-  {% else %}
-    {% set _count = 0 %}
-  {% endif %}
-
-  {% if _count == 0 %}
-  <div class="h-12 w-12 rounded-full overflow-hidden border border-stone-300 flex-shrink-0">
-    <a
-      href="{{ blog_url('/') }}"
-      class="h-full w-full font-bold text-5xl flex-shrink-0 flex flex-row items-center gap-1"
-    >
-      <img
-        src="{{ site().logo }}"
-        class="h-full w-full rounded-full object-cover border border-stone-300 flex-shrink-0"
-      >
-    </a>
-  </div>
-  {% else %}
-
-    <a
-      href="{{ cart_url('/') }}"
-      class="relative inline-flex items-center justify-center text-stone-700 hover:text-emerald-700"
-    >
-      <i class="fa fa-shopping-cart text-5xl" aria-hidden="true"></i>
-
-      <span
-        class="absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 inline-flex items-center justify-center rounded-full bg-emerald-600 text-white text-sm w-5 h-5"
-      >
-        {{ _count }}
-      </span>
-    </a>
-  {% endif %}
-</div>
-{% endmacro %}