@wix/himalaya-cli 0.1536.0 → 0.1538.0

package/templates/branded-lite/dev/index.ts

@@ -20066,7 +20066,7 @@ const SCREENS = runtimeSetting({
         "package": "himalaya",
         "type": "VStack",
         "props": {
-          "spacing": 16,
+          "spacing": 0,
           "alignment": "leading",
           "children": [
             {
@@ -20090,12 +20090,12 @@ const SCREENS = runtimeSetting({
                       }
                     },
                     {
-                      "id": "",
+                      "id": "himi_services.subtitle",
                       "body": {
                         "package": "himalaya",
                         "type": "Text",
                         "props": {
-                          "text": "Browse available appointments.",
+                          "text": "Choose a service to book.",
                           "style": "body",
                           "color": "textSecondary"
                         }
@@ -20103,95 +20103,36 @@ const SCREENS = runtimeSetting({
                     }
                   ]
                 }
-              }
-            },
-            {
-              "id": "himi_services.search",
-              "body": {
-                "package": "himalaya",
-                "type": "SearchField",
-                "props": {
-                  "placeholder": "Search services",
-                  "debounceMs": 200,
-                  "onChange": {
-                    "actionId": "tier5.himiBookingServices.collectionSearch"
-                  },
-                  "value": "$service:himiBookingServices.collection.query"
-                }
               },
               "modifiers": {
-                "hiddenPath": "$service:himiBookingServices.collection.hideChrome"
+                "padding": {
+                  "leading": 20,
+                  "trailing": 20,
+                  "top": 0,
+                  "bottom": 0
+                }
               }
             },
             {
-              "id": "himi_services.retry.block",
+              "id": "",
               "body": {
                 "package": "himalaya",
                 "type": "VStack",
                 "props": {
-                  "spacing": 12,
+                  "spacing": 0,
                   "alignment": "leading",
                   "children": [
                     {
-                      "id": "",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "HStack",
-                        "props": {
-                          "spacing": 10,
-                          "children": [
-                            {
-                              "id": "",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "Icon",
-                                "props": {
-                                  "name": "warning",
-                                  "size": 18,
-                                  "tint": "accentPrimary"
-                                }
-                              },
-                              "modifiers": {
-                                "accessibilityRole": "decorative"
-                              }
-                            },
-                            {
-                              "id": "",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "Text",
-                                "props": {
-                                  "text": "Something did not load.",
-                                  "style": "bodyEmphasis"
-                                }
-                              }
-                            }
-                          ]
-                        }
-                      }
-                    },
-                    {
-                      "id": "",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "Text",
-                        "props": {
-                          "text": "Try again when the connection settles.",
-                          "style": "body",
-                          "color": "textSecondary"
-                        }
-                      }
-                    },
-                    {
-                      "id": "himi_services.retry",
+                      "id": "himi_services.search",
                       "body": {
                         "package": "himalaya",
-                        "type": "Button",
+                        "type": "SearchField",
                         "props": {
-                          "title": "Try again",
-                          "style": "secondary",
-                          "action": {
-                            "actionId": "tier5.himiBookingServices.load"
+                          "placeholder": "Search services",
+                          "value": "$service:himiBookingServices.collection.query",
+                          "debounceMs": 200,
+                          "onChange": {
+                            "actionId": "tier5.himiBookingServices.search"
                           }
                         }
                       }
@@ -20200,417 +20141,582 @@ const SCREENS = runtimeSetting({
                 }
               },
               "modifiers": {
-                "background": {
-                  "token": "surfaceElevated"
+                "padding": {
+                  "leading": 20,
+                  "trailing": 20,
+                  "top": 16,
+                  "bottom": 0
                 },
-                "border": {
-                  "width": 1,
-                  "color": {
-                    "token": "border"
+                "hiddenPath": "$service:himiBookingServices.collection.hideChrome"
+              }
+            },
+            {
+              "id": "himi_services.categories",
+              "body": {
+                "package": "himalaya",
+                "type": "FilterChips",
+                "props": {
+                  "chips": [],
+                  "optionsPath": "$service:himiBookingServices.categoryChips",
+                  "selectedIds": [
+                    "$service:himiBookingServices.collection.filter"
+                  ],
+                  "multiSelect": false,
+                  "onChange": {
+                    "actionId": "tier5.himiBookingServices.collectionFilter"
                   }
-                },
-                "cornerRadius": 8,
+                }
+              },
+              "modifiers": {
+                "accessibilityLabel": "$service:himiBookingServices.categoriesLabel",
                 "padding": {
-                  "leading": 14,
-                  "trailing": 14,
-                  "top": 14,
-                  "bottom": 14
-                },
-                "transition": {
-                  "enter": "fade",
-                  "exit": "fade"
+                  "leading": 20,
+                  "trailing": 20,
+                  "top": 12,
+                  "bottom": 0
                 },
-                "hiddenPath": "$service:himiBookingServices.notErrored"
+                "hiddenPath": "$service:himiBookingServices.hideCategories"
               }
             },
             {
-              "id": "",
+              "id": "himi_services.offline",
               "body": {
                 "package": "himalaya",
-                "type": "VStack",
+                "type": "Text",
                 "props": {
-                  "spacing": 10,
-                  "children": [
-                    {
-                      "id": "himi_services.skeleton_1",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "Skeleton",
-                        "props": {
-                          "height": 88,
-                          "cornerRadius": 8
-                        }
-                      },
-                      "modifiers": {
-                        "height": 88,
-                        "background": {
-                          "token": "surfaceSecondary"
-                        },
-                        "cornerRadius": 8,
-                        "accessibilityRole": "decorative"
-                      }
-                    },
-                    {
-                      "id": "himi_services.skeleton_2",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "Skeleton",
-                        "props": {
-                          "height": 88,
-                          "cornerRadius": 8
-                        }
-                      },
-                      "modifiers": {
-                        "height": 88,
-                        "background": {
-                          "token": "surfaceSecondary"
-                        },
-                        "cornerRadius": 8,
-                        "accessibilityRole": "decorative"
-                      }
-                    },
-                    {
-                      "id": "himi_services.skeleton_3",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "Skeleton",
-                        "props": {
-                          "height": 88,
-                          "cornerRadius": 8
-                        }
-                      },
-                      "modifiers": {
-                        "height": 88,
-                        "background": {
-                          "token": "surfaceSecondary"
-                        },
-                        "cornerRadius": 8,
-                        "accessibilityRole": "decorative"
-                      }
-                    }
-                  ]
+                  "text": "Showing saved services. They may be out of date.",
+                  "style": "caption",
+                  "color": "textSecondary"
                 }
               },
               "modifiers": {
-                "hiddenPath": "$service:himiBookingServices.notLoading"
+                "padding": {
+                  "leading": 20,
+                  "trailing": 20,
+                  "top": 12,
+                  "bottom": 0
+                },
+                "hiddenPath": "$service:himiBookingServices.collection.noOffline"
               }
             },
             {
-              "id": "",
+              "id": "himi_services.retry_group",
               "body": {
                 "package": "himalaya",
                 "type": "VStack",
                 "props": {
-                  "spacing": 12,
+                  "spacing": 0,
+                  "alignment": "leading",
                   "children": [
                     {
-                      "id": "himi_services.list.collection.toolbar",
+                      "id": "himi_services.retry.block",
                       "body": {
                         "package": "himalaya",
                         "type": "VStack",
                         "props": {
-                          "spacing": 0,
+                          "spacing": 12,
+                          "alignment": "leading",
                           "children": [
-                            {
-                              "id": "himi_services.list.collection.loading",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "Skeleton",
-                                "props": {
-                                  "height": 72,
-                                  "cornerRadius": 12,
-                                  "count": 3
-                                }
-                              },
-                              "modifiers": {
-                                "hiddenPath": "$service:himiBookingServices.collection.noLoading",
-                                "padding": {
-                                  "bottom": 12
-                                }
-                              }
-                            },
                             {
                               "id": "",
                               "body": {
                                 "package": "himalaya",
                                 "type": "HStack",
                                 "props": {
-                                  "spacing": 8,
+                                  "spacing": 10,
                                   "children": [
                                     {
-                                      "id": "himi_services.list.collection.view",
+                                      "id": "",
                                       "body": {
                                         "package": "himalaya",
-                                        "type": "SegmentedControl",
+                                        "type": "Icon",
                                         "props": {
-                                          "options": [
-                                            {
-                                              "id": "list",
-                                              "label": "List"
-                                            },
-                                            {
-                                              "id": "grid",
-                                              "label": "Grid"
-                                            }
-                                          ],
-                                          "selectedId": "$service:himiBookingServices.collection.view",
-                                          "onChange": {
-                                            "actionId": "tier5.himiBookingServices.collectionView"
-                                          }
+                                          "name": "warning",
+                                          "size": 18,
+                                          "tint": "accentPrimary"
                                         }
                                       },
                                       "modifiers": {
-                                        "weight": 1
+                                        "accessibilityRole": "decorative"
                                       }
                                     },
                                     {
-                                      "id": "himi_services.list.collection.refine",
+                                      "id": "",
                                       "body": {
                                         "package": "himalaya",
-                                        "type": "Button",
+                                        "type": "Text",
                                         "props": {
-                                          "title": "Refine",
-                                          "style": "plain",
-                                          "fullWidth": false,
-                                          "action": {
-                                            "actionId": "tier5.himiBookingServices.collectionFilters"
-                                          },
-                                          "leadingIcon": "filter"
+                                          "text": "Something did not load.",
+                                          "style": "bodyEmphasis"
                                         }
                                       }
                                     }
                                   ]
                                 }
-                              },
-                              "modifiers": {
-                                "hiddenPath": "$service:himiBookingServices.collection.hideChrome",
-                                "padding": {
-                                  "bottom": 12
-                                }
                               }
                             },
                             {
                               "id": "",
                               "body": {
                                 "package": "himalaya",
-                                "type": "HStack",
+                                "type": "Text",
                                 "props": {
-                                  "spacing": 8,
-                                  "children": [
-                                    {
-                                      "id": "himi_services.list.collection.filters",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "FilterChips",
-                                        "props": {
-                                          "chips": [
-                                            {
-                                              "id": "all",
-                                              "label": "All"
-                                            },
-                                            {
-                                              "id": "saved",
-                                              "label": "Saved"
-                                            }
-                                          ],
-                                          "optionsPath": "$service:himiBookingServices.collection.chips",
-                                          "selectedIds": [
-                                            "$service:himiBookingServices.collection.filter"
-                                          ],
-                                          "onChange": {
-                                            "actionId": "tier5.himiBookingServices.collectionFilter"
-                                          }
-                                        }
-                                      },
-                                      "modifiers": {
-                                        "weight": 1
-                                      }
-                                    },
-                                    {
-                                      "id": "himi_services.list.collection.clear",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "Button",
-                                        "props": {
-                                          "title": "Clear",
-                                          "style": "plain",
-                                          "fullWidth": false,
-                                          "action": {
-                                            "actionId": "tier5.himiBookingServices.collectionClear"
-                                          }
-                                        }
-                                      },
-                                      "modifiers": {
-                                        "hiddenPath": "$service:himiBookingServices.collection.noActiveCriteria"
-                                      }
-                                    }
-                                  ]
-                                }
-                              },
-                              "modifiers": {
-                                "hiddenPath": "$service:himiBookingServices.collection.hideChrome",
-                                "padding": {
-                                  "bottom": 12
+                                  "text": "Try again when the connection settles.",
+                                  "style": "body",
+                                  "color": "textSecondary"
                                 }
                               }
                             },
                             {
-                              "id": "himi_services.list.collection.summary",
+                              "id": "himi_services.retry",
                               "body": {
                                 "package": "himalaya",
-                                "type": "Text",
+                                "type": "Button",
                                 "props": {
-                                  "text": "$service:himiBookingServices.collection.summary",
-                                  "style": "caption",
-                                  "color": "textSecondary",
-                                  "maxLines": 1
+                                  "title": "Try again",
+                                  "style": "secondary",
+                                  "action": {
+                                    "actionId": "tier5.himiBookingServices.load"
+                                  }
                                 }
-                              },
-                              "modifiers": {
-                                "hiddenPath": "$service:himiBookingServices.collection.hideChrome"
                               }
-                            },
+                            }
+                          ]
+                        }
+                      },
+                      "modifiers": {
+                        "background": {
+                          "token": "surfaceElevated"
+                        },
+                        "border": {
+                          "width": 1,
+                          "color": {
+                            "token": "border"
+                          }
+                        },
+                        "cornerRadius": 8,
+                        "padding": {
+                          "leading": 14,
+                          "trailing": 14,
+                          "top": 14,
+                          "bottom": 14
+                        },
+                        "transition": {
+                          "enter": "fade",
+                          "exit": "fade"
+                        },
+                        "hiddenPath": "$service:himiBookingServices.notErrored"
+                      }
+                    }
+                  ]
+                }
+              },
+              "modifiers": {
+                "padding": {
+                  "leading": 20,
+                  "trailing": 20,
+                  "top": 16,
+                  "bottom": 0
+                },
+                "hiddenPath": "$service:himiBookingServices.hasResults"
+              }
+            },
+            {
+              "id": "",
+              "body": {
+                "package": "himalaya",
+                "type": "VStack",
+                "props": {
+                  "spacing": 0,
+                  "alignment": "leading",
+                  "children": [
+                    {
+                      "id": "himi_services.skeleton_1",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "VStack",
+                        "props": {
+                          "spacing": 0,
+                          "alignment": "leading",
+                          "children": [
                             {
                               "id": "",
                               "body": {
                                 "package": "himalaya",
                                 "type": "HStack",
                                 "props": {
+                                  "spacing": 14,
+                                  "alignment": "center",
                                   "children": [
                                     {
                                       "id": "",
                                       "body": {
                                         "package": "himalaya",
-                                        "type": "Text",
+                                        "type": "Skeleton",
                                         "props": {
-                                          "text": "$service:himiBookingServices.collection.selectedSummary",
-                                          "style": "caption"
+                                          "height": 72,
+                                          "cornerRadius": 8
                                         }
+                                      },
+                                      "modifiers": {
+                                        "width": 72,
+                                        "height": 72,
+                                        "background": {
+                                          "token": "surfaceSecondary"
+                                        },
+                                        "cornerRadius": 8,
+                                        "accessibilityRole": "decorative"
                                       }
                                     },
                                     {
-                                      "id": "btn_tier5_himibookingservices_collectionsaveselected",
+                                      "id": "",
                                       "body": {
                                         "package": "himalaya",
-                                        "type": "Button",
+                                        "type": "VStack",
                                         "props": {
-                                          "title": "Save selected",
-                                          "style": "secondary",
-                                          "action": {
-                                            "actionId": "tier5.himiBookingServices.collectionSaveSelected"
-                                          }
+                                          "spacing": 8,
+                                          "alignment": "leading",
+                                          "children": [
+                                            {
+                                              "id": "",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "HStack",
+                                                "props": {
+                                                  "spacing": 0,
+                                                  "children": [
+                                                    {
+                                                      "id": "",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "Skeleton",
+                                                        "props": {
+                                                          "height": 16,
+                                                          "cornerRadius": 4
+                                                        }
+                                                      },
+                                                      "modifiers": {
+                                                        "height": 16,
+                                                        "fillMaxWidth": true,
+                                                        "background": {
+                                                          "token": "surfaceSecondary"
+                                                        },
+                                                        "cornerRadius": 4,
+                                                        "accessibilityRole": "decorative",
+                                                        "weight": 3
+                                                      }
+                                                    },
+                                                    {
+                                                      "id": "",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "Spacer",
+                                                        "props": {}
+                                                      },
+                                                      "modifiers": {
+                                                        "weight": 2
+                                                      }
+                                                    }
+                                                  ]
+                                                }
+                                              },
+                                              "modifiers": {
+                                                "fillMaxWidth": true
+                                              }
+                                            },
+                                            {
+                                              "id": "",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "HStack",
+                                                "props": {
+                                                  "spacing": 0,
+                                                  "children": [
+                                                    {
+                                                      "id": "",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "Skeleton",
+                                                        "props": {
+                                                          "height": 14,
+                                                          "cornerRadius": 4
+                                                        }
+                                                      },
+                                                      "modifiers": {
+                                                        "height": 14,
+                                                        "fillMaxWidth": true,
+                                                        "background": {
+                                                          "token": "surfaceSecondary"
+                                                        },
+                                                        "cornerRadius": 4,
+                                                        "accessibilityRole": "decorative",
+                                                        "weight": 2
+                                                      }
+                                                    },
+                                                    {
+                                                      "id": "",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "Spacer",
+                                                        "props": {}
+                                                      },
+                                                      "modifiers": {
+                                                        "weight": 3
+                                                      }
+                                                    }
+                                                  ]
+                                                }
+                                              },
+                                              "modifiers": {
+                                                "fillMaxWidth": true
+                                              }
+                                            }
+                                          ]
                                         }
                                       },
                                       "modifiers": {
-                                        "hiddenPath": "$service:himiBookingServices.collection.cannotSaveSelected"
+                                        "weight": 1
                                       }
                                     }
                                   ]
                                 }
                               },
                               "modifiers": {
-                                "hiddenPath": "$service:himiBookingServices.collection.noSelection",
+                                "fillMaxWidth": true,
                                 "padding": {
-                                  "bottom": 12
+                                  "leading": 20,
+                                  "trailing": 20,
+                                  "top": 14,
+                                  "bottom": 14
                                 }
                               }
                             },
                             {
-                              "id": "himi_services.list.collection.undo",
+                              "id": "",
                               "body": {
                                 "package": "himalaya",
-                                "type": "Button",
-                                "props": {
-                                  "title": "Undo saved change",
-                                  "style": "plain",
-                                  "action": {
-                                    "actionId": "tier5.himiBookingServices.collectionUndo"
-                                  }
-                                }
-                              },
-                              "modifiers": {
-                                "hiddenPath": "$service:himiBookingServices.collection.noUndo",
-                                "padding": {
-                                  "bottom": 12
-                                }
+                                "type": "Divider",
+                                "props": {}
                               }
-                            },
+                            }
+                          ]
+                        }
+                      },
+                      "modifiers": {
+                        "fillMaxWidth": true
+                      }
+                    },
+                    {
+                      "id": "himi_services.skeleton_2",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "VStack",
+                        "props": {
+                          "spacing": 0,
+                          "alignment": "leading",
+                          "children": [
                             {
                               "id": "",
                               "body": {
                                 "package": "himalaya",
-                                "type": "Text",
-                                "props": {
-                                  "text": "$service:himiBookingServices.collection.saveMessage",
-                                  "style": "caption",
-                                  "collapseWhenEmpty": true
-                                }
-                              }
-                            },
-                            {
-                              "id": "",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "VStack",
+                                "type": "HStack",
                                 "props": {
-                                  "spacing": 8,
+                                  "spacing": 14,
+                                  "alignment": "center",
                                   "children": [
                                     {
                                       "id": "",
                                       "body": {
                                         "package": "himalaya",
-                                        "type": "Text",
+                                        "type": "Skeleton",
                                         "props": {
-                                          "text": "The next page could not load.",
-                                          "style": "caption"
+                                          "height": 72,
+                                          "cornerRadius": 8
                                         }
+                                      },
+                                      "modifiers": {
+                                        "width": 72,
+                                        "height": 72,
+                                        "background": {
+                                          "token": "surfaceSecondary"
+                                        },
+                                        "cornerRadius": 8,
+                                        "accessibilityRole": "decorative"
                                       }
                                     },
                                     {
-                                      "id": "himi_services.list.collection.retry-page",
+                                      "id": "",
                                       "body": {
                                         "package": "himalaya",
-                                        "type": "Button",
+                                        "type": "VStack",
                                         "props": {
-                                          "title": "Retry next page",
-                                          "style": "secondary",
-                                          "action": {
-                                            "actionId": "tier5.himiBookingServices.collectionRetry"
-                                          }
+                                          "spacing": 8,
+                                          "alignment": "leading",
+                                          "children": [
+                                            {
+                                              "id": "",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "HStack",
+                                                "props": {
+                                                  "spacing": 0,
+                                                  "children": [
+                                                    {
+                                                      "id": "",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "Skeleton",
+                                                        "props": {
+                                                          "height": 16,
+                                                          "cornerRadius": 4
+                                                        }
+                                                      },
+                                                      "modifiers": {
+                                                        "height": 16,
+                                                        "fillMaxWidth": true,
+                                                        "background": {
+                                                          "token": "surfaceSecondary"
+                                                        },
+                                                        "cornerRadius": 4,
+                                                        "accessibilityRole": "decorative",
+                                                        "weight": 3
+                                                      }
+                                                    },
+                                                    {
+                                                      "id": "",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "Spacer",
+                                                        "props": {}
+                                                      },
+                                                      "modifiers": {
+                                                        "weight": 2
+                                                      }
+                                                    }
+                                                  ]
+                                                }
+                                              },
+                                              "modifiers": {
+                                                "fillMaxWidth": true
+                                              }
+                                            },
+                                            {
+                                              "id": "",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "HStack",
+                                                "props": {
+                                                  "spacing": 0,
+                                                  "children": [
+                                                    {
+                                                      "id": "",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "Skeleton",
+                                                        "props": {
+                                                          "height": 14,
+                                                          "cornerRadius": 4
+                                                        }
+                                                      },
+                                                      "modifiers": {
+                                                        "height": 14,
+                                                        "fillMaxWidth": true,
+                                                        "background": {
+                                                          "token": "surfaceSecondary"
+                                                        },
+                                                        "cornerRadius": 4,
+                                                        "accessibilityRole": "decorative",
+                                                        "weight": 2
+                                                      }
+                                                    },
+                                                    {
+                                                      "id": "",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "Spacer",
+                                                        "props": {}
+                                                      },
+                                                      "modifiers": {
+                                                        "weight": 3
+                                                      }
+                                                    }
+                                                  ]
+                                                }
+                                              },
+                                              "modifiers": {
+                                                "fillMaxWidth": true
+                                              }
+                                            }
+                                          ]
                                         }
+                                      },
+                                      "modifiers": {
+                                        "weight": 1
                                       }
                                     }
                                   ]
                                 }
                               },
                               "modifiers": {
-                                "hiddenPath": "$service:himiBookingServices.collection.noPageError",
+                                "fillMaxWidth": true,
                                 "padding": {
-                                  "bottom": 12
+                                  "leading": 20,
+                                  "trailing": 20,
+                                  "top": 14,
+                                  "bottom": 14
                                 }
                               }
                             },
                             {
-                              "id": "himi_services.list.collection.empty-source",
+                              "id": "",
                               "body": {
                                 "package": "himalaya",
-                                "type": "VStack",
+                                "type": "Divider",
+                                "props": {}
+                              }
+                            }
+                          ]
+                        }
+                      },
+                      "modifiers": {
+                        "fillMaxWidth": true
+                      }
+                    },
+                    {
+                      "id": "himi_services.skeleton_3",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "VStack",
+                        "props": {
+                          "spacing": 0,
+                          "alignment": "leading",
+                          "children": [
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "HStack",
                                 "props": {
-                                  "spacing": 8,
+                                  "spacing": 14,
                                   "alignment": "center",
                                   "children": [
                                     {
                                       "id": "",
                                       "body": {
                                         "package": "himalaya",
-                                        "type": "Icon",
+                                        "type": "Skeleton",
                                         "props": {
-                                          "name": "inbox",
-                                          "size": 28,
-                                          "tint": "textTertiary"
+                                          "height": 72,
+                                          "cornerRadius": 8
                                         }
                                       },
                                       "modifiers": {
+                                        "width": 72,
+                                        "height": 72,
+                                        "background": {
+                                          "token": "surfaceSecondary"
+                                        },
+                                        "cornerRadius": 8,
                                         "accessibilityRole": "decorative"
                                       }
                                     },
@@ -20618,361 +20724,176 @@ const SCREENS = runtimeSetting({
                                       "id": "",
                                       "body": {
                                         "package": "himalaya",
-                                        "type": "Text",
-                                        "props": {
-                                          "text": "$service:himiBookingServices.collection.emptySourceText",
-                                          "style": "body",
-                                          "color": "textSecondary"
-                                        }
-                                      }
-                                    }
-                                  ]
-                                }
-                              },
-                              "modifiers": {
-                                "hiddenPath": "$service:himiBookingServices.collection.noEmptySource",
-                                "padding": {
-                                  "bottom": 12
-                                }
-                              }
-                            },
-                            {
-                              "id": "",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "Text",
-                                "props": {
-                                  "text": "Showing saved offline results · may be outdated",
-                                  "style": "caption",
-                                  "color": "textSecondary"
-                                }
-                              },
-                              "modifiers": {
-                                "hiddenPath": "$service:himiBookingServices.collection.noOffline"
-                              }
-                            },
-                            {
-                              "id": "",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "VStack",
-                                "props": {
-                                  "spacing": 0,
-                                  "children": [
-                                    {
-                                      "id": "himi_services.list.collection.list",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "LazyList",
+                                        "type": "VStack",
                                         "props": {
-                                          "spacing": 10,
-                                          "itemsPath": "$service:himiBookingServices.collection.items",
-                                          "onPullToRefresh": {
-                                            "actionId": "tier5.himiBookingServices.refresh"
-                                          },
-                                          "pagination": {
-                                            "cursor": "$service:himiBookingServices.collection.cursor",
-                                            "onLoadMore": {
-                                              "actionId": "tier5.himiBookingServices.loadMore"
-                                            },
-                                            "pageSize": 50
-                                          },
-                                          "items": [
+                                          "spacing": 8,
+                                          "alignment": "leading",
+                                          "children": [
                                             {
-                                              "id": "himi_services.list.collection.list.$item.collectionId",
+                                              "id": "",
                                               "body": {
                                                 "package": "himalaya",
-                                                "type": "VStack",
+                                                "type": "HStack",
                                                 "props": {
-                                                  "spacing": 4,
+                                                  "spacing": 0,
                                                   "children": [
                                                     {
                                                       "id": "",
                                                       "body": {
                                                         "package": "himalaya",
-                                                        "type": "HStack",
+                                                        "type": "Skeleton",
                                                         "props": {
-                                                          "spacing": 12,
-                                                          "children": [
-                                                            {
-                                                              "id": "himi_services.list.collection.list.$item.collectionId/image",
-                                                              "body": {
-                                                                "package": "himalaya",
-                                                                "type": "Image",
-                                                                "props": {
-                                                                  "url": "$item.collectionImage",
-                                                                  "contentDescription": "$item.collectionTitle",
-                                                                  "contentMode": "fill",
-                                                                  "height": 56,
-                                                                  "width": 56
-                                                                }
-                                                              },
-                                                              "modifiers": {
-                                                                "cornerRadius": 12,
-                                                                "hiddenPath": "$item.collectionNoImage"
-                                                              }
-                                                            },
-                                                            {
-                                                              "id": "",
-                                                              "body": {
-                                                                "package": "himalaya",
-                                                                "type": "VStack",
-                                                                "props": {
-                                                                  "spacing": 4,
-                                                                  "alignment": "leading",
-                                                                  "children": [
-                                                                    {
-                                                                      "id": "",
-                                                                      "body": {
-                                                                        "package": "himalaya",
-                                                                        "type": "Text",
-                                                                        "props": {
-                                                                          "text": "$item.collectionTitle",
-                                                                          "style": "bodyEmphasis",
-                                                                          "maxLines": 2
-                                                                        }
-                                                                      }
-                                                                    },
-                                                                    {
-                                                                      "id": "",
-                                                                      "body": {
-                                                                        "package": "himalaya",
-                                                                        "type": "Text",
-                                                                        "props": {
-                                                                          "text": "$item.collectionSubtitle",
-                                                                          "style": "caption",
-                                                                          "color": "textSecondary",
-                                                                          "maxLines": 3,
-                                                                          "collapseWhenEmpty": true
-                                                                        }
-                                                                      }
-                                                                    },
-                                                                    {
-                                                                      "id": "",
-                                                                      "body": {
-                                                                        "package": "himalaya",
-                                                                        "type": "Text",
-                                                                        "props": {
-                                                                          "text": "$item.collectionMeta",
-                                                                          "style": "caption",
-                                                                          "color": "textSecondary",
-                                                                          "maxLines": 2,
-                                                                          "collapseWhenEmpty": true
-                                                                        }
-                                                                      }
-                                                                    },
-                                                                    {
-                                                                      "id": "",
-                                                                      "body": {
-                                                                        "package": "himalaya",
-                                                                        "type": "Text",
-                                                                        "props": {
-                                                                          "text": "Saved",
-                                                                          "style": "caption",
-                                                                          "color": "accentPrimary"
-                                                                        }
-                                                                      },
-                                                                      "modifiers": {
-                                                                        "hiddenPath": "$item.collectionNotSaved"
-                                                                      }
-                                                                    }
-                                                                  ]
-                                                                }
-                                                              },
-                                                              "modifiers": {
-                                                                "weight": 1
-                                                              }
-                                                            },
-                                                            {
-                                                              "id": "",
-                                                              "body": {
-                                                                "package": "himalaya",
-                                                                "type": "HStack",
-                                                                "props": {
-                                                                  "spacing": 8,
-                                                                  "children": [
-                                                                    {
-                                                                      "id": "himi_services.list.collection.list.$item.collectionId/select",
-                                                                      "body": {
-                                                                        "package": "himalaya",
-                                                                        "type": "Button",
-                                                                        "props": {
-                                                                          "title": "$item.collectionSelectLabel",
-                                                                          "style": "plain",
-                                                                          "fullWidth": false,
-                                                                          "action": {
-                                                                            "actionId": "tier5.himiBookingServices.collectionSelect",
-                                                                            "params": {
-                                                                              "id": "$item.collectionId"
-                                                                            }
-                                                                          }
-                                                                        }
-                                                                      },
-                                                                      "modifiers": {
-                                                                        "hiddenPath": "$service:himiBookingServices.collection.noSelection"
-                                                                      }
-                                                                    },
-                                                                    {
-                                                                      "id": "himi_services.list.collection.list.$item.collectionId/primary",
-                                                                      "body": {
-                                                                        "package": "himalaya",
-                                                                        "type": "Button",
-                                                                        "props": {
-                                                                          "title": "Book",
-                                                                          "style": "secondary",
-                                                                          "fullWidth": false,
-                                                                          "action": {
-                                                                            "actionId": "himi.open",
-                                                                            "params": {
-                                                                              "screenId": "himi_time",
-                                                                              "id": "$item.collectionId"
-                                                                            }
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    },
-                                                                    {
-                                                                      "id": "himi_services.list.collection.list.$item.collectionId/actions",
-                                                                      "body": {
-                                                                        "package": "himalaya",
-                                                                        "type": "Menu",
-                                                                        "props": {
-                                                                          "style": "dropdown",
-                                                                          "anchor": {
-                                                                            "id": "",
-                                                                            "body": {
-                                                                              "package": "himalaya",
-                                                                              "type": "Icon",
-                                                                              "props": {
-                                                                                "name": "ellipsis",
-                                                                                "size": 20
-                                                                              }
-                                                                            },
-                                                                            "modifiers": {
-                                                                              "width": 44,
-                                                                              "height": 44,
-                                                                              "accessibilityLabel": "$item.collectionActionsLabel"
-                                                                            }
-                                                                          },
-                                                                          "items": [
-                                                                            {
-                                                                              "id": "preview",
-                                                                              "label": "Quick preview",
-                                                                              "icon": "search",
-                                                                              "action": {
-                                                                                "actionId": "tier5.himiBookingServices.collectionPreview",
-                                                                                "params": {
-                                                                                  "id": "$item.collectionId"
-                                                                                }
-                                                                              }
-                                                                            },
-                                                                            {
-                                                                              "id": "save",
-                                                                              "label": "$item.collectionSaveLabel",
-                                                                              "icon": "bookmark",
-                                                                              "action": {
-                                                                                "actionId": "tier5.himiBookingServices.collectionSave",
-                                                                                "params": {
-                                                                                  "id": "$item.collectionId"
-                                                                                }
-                                                                              }
-                                                                            },
-                                                                            {
-                                                                              "id": "open",
-                                                                              "label": "Open details",
-                                                                              "icon": "chevron_right",
-                                                                              "action": {
-                                                                                "actionId": "himi.open",
-                                                                                "params": {
-                                                                                  "screenId": "$item.detailScreenId",
-                                                                                  "id": "$item.id"
-                                                                                }
-                                                                              }
-                                                                            }
-                                                                          ]
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  ]
-                                                                }
-                                                              },
-                                                              "modifiers": {
-                                                                "hiddenPath": "$item.collectionNoIdentity"
-                                                              }
-                                                            }
-                                                          ]
+                                                          "height": 16,
+                                                          "cornerRadius": 4
                                                         }
+                                                      },
+                                                      "modifiers": {
+                                                        "height": 16,
+                                                        "fillMaxWidth": true,
+                                                        "background": {
+                                                          "token": "surfaceSecondary"
+                                                        },
+                                                        "cornerRadius": 4,
+                                                        "accessibilityRole": "decorative",
+                                                        "weight": 3
+                                                      }
+                                                    },
+                                                    {
+                                                      "id": "",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "Spacer",
+                                                        "props": {}
+                                                      },
+                                                      "modifiers": {
+                                                        "weight": 2
                                                       }
                                                     }
                                                   ]
                                                 }
                                               },
                                               "modifiers": {
-                                                "onTap": {
-                                                  "actionId": "himi.open",
-                                                  "params": {
-                                                    "screenId": "$item.detailScreenId",
-                                                    "id": "$item.id"
-                                                  }
-                                                },
-                                                "haptic": "light",
-                                                "background": {
-                                                  "token": "surfaceElevated"
-                                                },
-                                                "border": {
-                                                  "width": 1,
-                                                  "color": {
-                                                    "token": "border"
-                                                  }
-                                                },
-                                                "cornerRadius": 12,
-                                                "padding": {
-                                                  "top": 12,
-                                                  "bottom": 12,
-                                                  "leading": 12,
-                                                  "trailing": 12
-                                                },
-                                                "fillMaxWidth": true,
-                                                "accessibilityLabel": "$item.collectionTitle",
-                                                "pressFeedback": "scale",
-                                                "transition": {
-                                                  "enter": "fadeSlide",
-                                                  "direction": "up",
-                                                  "distance": 8
+                                                "fillMaxWidth": true
+                                              }
+                                            },
+                                            {
+                                              "id": "",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "HStack",
+                                                "props": {
+                                                  "spacing": 0,
+                                                  "children": [
+                                                    {
+                                                      "id": "",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "Skeleton",
+                                                        "props": {
+                                                          "height": 14,
+                                                          "cornerRadius": 4
+                                                        }
+                                                      },
+                                                      "modifiers": {
+                                                        "height": 14,
+                                                        "fillMaxWidth": true,
+                                                        "background": {
+                                                          "token": "surfaceSecondary"
+                                                        },
+                                                        "cornerRadius": 4,
+                                                        "accessibilityRole": "decorative",
+                                                        "weight": 2
+                                                      }
+                                                    },
+                                                    {
+                                                      "id": "",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "Spacer",
+                                                        "props": {}
+                                                      },
+                                                      "modifiers": {
+                                                        "weight": 3
+                                                      }
+                                                    }
+                                                  ]
                                                 }
+                                              },
+                                              "modifiers": {
+                                                "fillMaxWidth": true
                                               }
                                             }
-                                          ],
-                                          "staggerMs": 30,
-                                          "animateItems": true,
-                                          "rowSwipeActions": {
-                                            "trailing": [
-                                              {
-                                                "label": "$item.collectionSaveLabel",
-                                                "icon": "bookmark",
-                                                "action": {
-                                                  "actionId": "tier5.himiBookingServices.collectionSave",
-                                                  "params": {
-                                                    "id": "$item.collectionId"
-                                                  }
-                                                }
-                                              },
-                                              {
-                                                "label": "Preview",
-                                                "icon": "search",
-                                                "action": {
-                                                  "actionId": "tier5.himiBookingServices.collectionPreview",
-                                                  "params": {
-                                                    "id": "$item.collectionId"
-                                                  }
-                                                }
-                                              }
-                                            ]
-                                          }
+                                          ]
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "weight": 1
+                                      }
+                                    }
+                                  ]
+                                }
+                              },
+                              "modifiers": {
+                                "fillMaxWidth": true,
+                                "padding": {
+                                  "leading": 20,
+                                  "trailing": 20,
+                                  "top": 14,
+                                  "bottom": 14
+                                }
+                              }
+                            },
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Divider",
+                                "props": {}
+                              }
+                            }
+                          ]
+                        }
+                      },
+                      "modifiers": {
+                        "fillMaxWidth": true
+                      }
+                    },
+                    {
+                      "id": "himi_services.skeleton_4",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "VStack",
+                        "props": {
+                          "spacing": 0,
+                          "alignment": "leading",
+                          "children": [
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "HStack",
+                                "props": {
+                                  "spacing": 14,
+                                  "alignment": "center",
+                                  "children": [
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Skeleton",
+                                        "props": {
+                                          "height": 72,
+                                          "cornerRadius": 8
                                         }
                                       },
                                       "modifiers": {
-                                        "hiddenPath": "$service:himiBookingServices.collection.hideList"
+                                        "width": 72,
+                                        "height": 72,
+                                        "background": {
+                                          "token": "surfaceSecondary"
+                                        },
+                                        "cornerRadius": 8,
+                                        "accessibilityRole": "decorative"
                                       }
                                     },
                                     {
@@ -20981,363 +20902,120 @@ const SCREENS = runtimeSetting({
                                         "package": "himalaya",
                                         "type": "VStack",
                                         "props": {
-                                          "spacing": 12,
+                                          "spacing": 8,
+                                          "alignment": "leading",
                                           "children": [
                                             {
-                                              "id": "himi_services.list.collection.grid",
+                                              "id": "",
                                               "body": {
                                                 "package": "himalaya",
-                                                "type": "Grid",
+                                                "type": "HStack",
                                                 "props": {
-                                                  "columns": 2,
-                                                  "columnsMedium": 3,
-                                                  "columnsExpanded": 4,
-                                                  "spacing": 12,
-                                                  "staggerMs": 30,
-                                                  "itemsPath": "$service:himiBookingServices.collection.items",
-                                                  "items": [
+                                                  "spacing": 0,
+                                                  "children": [
                                                     {
-                                                      "id": "himi_services.list.collection.grid.$item.collectionId",
+                                                      "id": "",
                                                       "body": {
                                                         "package": "himalaya",
-                                                        "type": "VStack",
+                                                        "type": "Skeleton",
                                                         "props": {
-                                                          "spacing": 8,
-                                                          "alignment": "leading",
-                                                          "children": [
-                                                            {
-                                                              "id": "",
-                                                              "body": {
-                                                                "package": "himalaya",
-                                                                "type": "VStack",
-                                                                "props": {
-                                                                  "spacing": 0,
-                                                                  "children": [
-                                                                    {
-                                                                      "id": "himi_services.list.collection.grid.$item.collectionId/image",
-                                                                      "body": {
-                                                                        "package": "himalaya",
-                                                                        "type": "Image",
-                                                                        "props": {
-                                                                          "url": "$item.collectionImage",
-                                                                          "contentDescription": "$item.collectionTitle",
-                                                                          "contentMode": "fill",
-                                                                          "height": 112,
-                                                                          "fillWidth": true
-                                                                        }
-                                                                      },
-                                                                      "modifiers": {
-                                                                        "cornerRadius": 12,
-                                                                        "hiddenPath": "$item.collectionNoImage"
-                                                                      }
-                                                                    },
-                                                                    {
-                                                                      "id": "",
-                                                                      "body": {
-                                                                        "package": "himalaya",
-                                                                        "type": "ZStack",
-                                                                        "props": {
-                                                                          "alignment": "center",
-                                                                          "children": [
-                                                                            {
-                                                                              "id": "",
-                                                                              "body": {
-                                                                                "package": "himalaya",
-                                                                                "type": "Icon",
-                                                                                "props": {
-                                                                                  "name": "photo",
-                                                                                  "size": 28,
-                                                                                  "tint": "accentPrimary"
-                                                                                }
-                                                                              },
-                                                                              "modifiers": {
-                                                                                "accessibilityRole": "decorative"
-                                                                              }
-                                                                            }
-                                                                          ]
-                                                                        }
-                                                                      },
-                                                                      "modifiers": {
-                                                                        "height": 112,
-                                                                        "fillMaxWidth": true,
-                                                                        "cornerRadius": 12,
-                                                                        "background": {
-                                                                          "token": "surfaceSecondary"
-                                                                        },
-                                                                        "accessibilityLabel": "No image available",
-                                                                        "hiddenPath": "$item.collectionHasImage"
-                                                                      }
-                                                                    }
-                                                                  ]
-                                                                }
-                                                              }
-                                                            },
-                                                            {
-                                                              "id": "",
-                                                              "body": {
-                                                                "package": "himalaya",
-                                                                "type": "VStack",
-                                                                "props": {
-                                                                  "spacing": 4,
-                                                                  "alignment": "leading",
-                                                                  "children": [
-                                                                    {
-                                                                      "id": "",
-                                                                      "body": {
-                                                                        "package": "himalaya",
-                                                                        "type": "Text",
-                                                                        "props": {
-                                                                          "text": "$item.collectionTitle",
-                                                                          "style": "bodyEmphasis",
-                                                                          "maxLines": 2
-                                                                        }
-                                                                      }
-                                                                    },
-                                                                    {
-                                                                      "id": "",
-                                                                      "body": {
-                                                                        "package": "himalaya",
-                                                                        "type": "Text",
-                                                                        "props": {
-                                                                          "text": "$item.collectionSubtitle",
-                                                                          "style": "caption",
-                                                                          "color": "textSecondary",
-                                                                          "maxLines": 3,
-                                                                          "collapseWhenEmpty": true
-                                                                        }
-                                                                      }
-                                                                    },
-                                                                    {
-                                                                      "id": "",
-                                                                      "body": {
-                                                                        "package": "himalaya",
-                                                                        "type": "Text",
-                                                                        "props": {
-                                                                          "text": "$item.collectionMeta",
-                                                                          "style": "caption",
-                                                                          "color": "textSecondary",
-                                                                          "maxLines": 2,
-                                                                          "collapseWhenEmpty": true
-                                                                        }
-                                                                      }
-                                                                    },
-                                                                    {
-                                                                      "id": "",
-                                                                      "body": {
-                                                                        "package": "himalaya",
-                                                                        "type": "Text",
-                                                                        "props": {
-                                                                          "text": "Saved",
-                                                                          "style": "caption",
-                                                                          "color": "accentPrimary"
-                                                                        }
-                                                                      },
-                                                                      "modifiers": {
-                                                                        "hiddenPath": "$item.collectionNotSaved"
-                                                                      }
-                                                                    }
-                                                                  ]
-                                                                }
-                                                              }
-                                                            },
-                                                            {
-                                                              "id": "",
-                                                              "body": {
-                                                                "package": "himalaya",
-                                                                "type": "HStack",
-                                                                "props": {
-                                                                  "spacing": 8,
-                                                                  "children": [
-                                                                    {
-                                                                      "id": "himi_services.list.collection.grid.$item.collectionId/select",
-                                                                      "body": {
-                                                                        "package": "himalaya",
-                                                                        "type": "Button",
-                                                                        "props": {
-                                                                          "title": "$item.collectionSelectLabel",
-                                                                          "style": "plain",
-                                                                          "fullWidth": false,
-                                                                          "action": {
-                                                                            "actionId": "tier5.himiBookingServices.collectionSelect",
-                                                                            "params": {
-                                                                              "id": "$item.collectionId"
-                                                                            }
-                                                                          }
-                                                                        }
-                                                                      },
-                                                                      "modifiers": {
-                                                                        "hiddenPath": "$service:himiBookingServices.collection.noSelection"
-                                                                      }
-                                                                    },
-                                                                    {
-                                                                      "id": "himi_services.list.collection.grid.$item.collectionId/primary",
-                                                                      "body": {
-                                                                        "package": "himalaya",
-                                                                        "type": "Button",
-                                                                        "props": {
-                                                                          "title": "Book",
-                                                                          "style": "secondary",
-                                                                          "fullWidth": false,
-                                                                          "action": {
-                                                                            "actionId": "himi.open",
-                                                                            "params": {
-                                                                              "screenId": "himi_time",
-                                                                              "id": "$item.collectionId"
-                                                                            }
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    },
-                                                                    {
-                                                                      "id": "",
-                                                                      "body": {
-                                                                        "package": "himalaya",
-                                                                        "type": "Spacer",
-                                                                        "props": {}
-                                                                      }
-                                                                    },
-                                                                    {
-                                                                      "id": "himi_services.list.collection.grid.$item.collectionId/actions",
-                                                                      "body": {
-                                                                        "package": "himalaya",
-                                                                        "type": "Menu",
-                                                                        "props": {
-                                                                          "style": "dropdown",
-                                                                          "anchor": {
-                                                                            "id": "",
-                                                                            "body": {
-                                                                              "package": "himalaya",
-                                                                              "type": "Icon",
-                                                                              "props": {
-                                                                                "name": "ellipsis",
-                                                                                "size": 20
-                                                                              }
-                                                                            },
-                                                                            "modifiers": {
-                                                                              "width": 44,
-                                                                              "height": 44,
-                                                                              "accessibilityLabel": "$item.collectionActionsLabel"
-                                                                            }
-                                                                          },
-                                                                          "items": [
-                                                                            {
-                                                                              "id": "preview",
-                                                                              "label": "Quick preview",
-                                                                              "icon": "search",
-                                                                              "action": {
-                                                                                "actionId": "tier5.himiBookingServices.collectionPreview",
-                                                                                "params": {
-                                                                                  "id": "$item.collectionId"
-                                                                                }
-                                                                              }
-                                                                            },
-                                                                            {
-                                                                              "id": "save",
-                                                                              "label": "$item.collectionSaveLabel",
-                                                                              "icon": "bookmark",
-                                                                              "action": {
-                                                                                "actionId": "tier5.himiBookingServices.collectionSave",
-                                                                                "params": {
-                                                                                  "id": "$item.collectionId"
-                                                                                }
-                                                                              }
-                                                                            },
-                                                                            {
-                                                                              "id": "open",
-                                                                              "label": "Open details",
-                                                                              "icon": "chevron_right",
-                                                                              "action": {
-                                                                                "actionId": "himi.open",
-                                                                                "params": {
-                                                                                  "screenId": "$item.detailScreenId",
-                                                                                  "id": "$item.id"
-                                                                                }
-                                                                              }
-                                                                            }
-                                                                          ]
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  ]
-                                                                }
-                                                              },
-                                                              "modifiers": {
-                                                                "hiddenPath": "$item.collectionNoIdentity"
-                                                              }
-                                                            }
-                                                          ]
+                                                          "height": 16,
+                                                          "cornerRadius": 4
                                                         }
                                                       },
                                                       "modifiers": {
-                                                        "onTap": {
-                                                          "actionId": "himi.open",
-                                                          "params": {
-                                                            "screenId": "$item.detailScreenId",
-                                                            "id": "$item.id"
-                                                          }
-                                                        },
-                                                        "haptic": "light",
+                                                        "height": 16,
+                                                        "fillMaxWidth": true,
                                                         "background": {
-                                                          "token": "surfaceElevated"
+                                                          "token": "surfaceSecondary"
                                                         },
-                                                        "border": {
-                                                          "width": 1,
-                                                          "color": {
-                                                            "token": "border"
-                                                          }
-                                                        },
-                                                        "cornerRadius": 12,
-                                                        "padding": {
-                                                          "top": 12,
-                                                          "bottom": 12,
-                                                          "leading": 12,
-                                                          "trailing": 12
-                                                        },
-                                                        "fillMaxWidth": true,
-                                                        "accessibilityLabel": "$item.collectionTitle",
-                                                        "pressFeedback": "scale",
-                                                        "transition": {
-                                                          "enter": "fadeSlide",
-                                                          "direction": "up",
-                                                          "distance": 8
-                                                        }
+                                                        "cornerRadius": 4,
+                                                        "accessibilityRole": "decorative",
+                                                        "weight": 3
+                                                      }
+                                                    },
+                                                    {
+                                                      "id": "",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "Spacer",
+                                                        "props": {}
+                                                      },
+                                                      "modifiers": {
+                                                        "weight": 2
                                                       }
                                                     }
                                                   ]
                                                 }
+                                              },
+                                              "modifiers": {
+                                                "fillMaxWidth": true
                                               }
                                             },
                                             {
-                                              "id": "himi_services.list.collection.more",
+                                              "id": "",
                                               "body": {
                                                 "package": "himalaya",
-                                                "type": "Button",
+                                                "type": "HStack",
                                                 "props": {
-                                                  "title": "Load more",
-                                                  "style": "secondary",
-                                                  "action": {
-                                                    "actionId": "tier5.himiBookingServices.loadMore"
-                                                  }
+                                                  "spacing": 0,
+                                                  "children": [
+                                                    {
+                                                      "id": "",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "Skeleton",
+                                                        "props": {
+                                                          "height": 14,
+                                                          "cornerRadius": 4
+                                                        }
+                                                      },
+                                                      "modifiers": {
+                                                        "height": 14,
+                                                        "fillMaxWidth": true,
+                                                        "background": {
+                                                          "token": "surfaceSecondary"
+                                                        },
+                                                        "cornerRadius": 4,
+                                                        "accessibilityRole": "decorative",
+                                                        "weight": 2
+                                                      }
+                                                    },
+                                                    {
+                                                      "id": "",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "Spacer",
+                                                        "props": {}
+                                                      },
+                                                      "modifiers": {
+                                                        "weight": 3
+                                                      }
+                                                    }
+                                                  ]
                                                 }
                                               },
                                               "modifiers": {
-                                                "hiddenPath": "$service:himiBookingServices.collection.noMore"
+                                                "fillMaxWidth": true
                                               }
                                             }
                                           ]
                                         }
                                       },
                                       "modifiers": {
-                                        "hiddenPath": "$service:himiBookingServices.collection.hideGrid"
+                                        "weight": 1
                                       }
                                     }
                                   ]
                                 }
                               },
                               "modifiers": {
-                                "hiddenPath": "$service:himiBookingServices.collection.hideComfortable",
+                                "fillMaxWidth": true,
                                 "padding": {
-                                  "bottom": 12
+                                  "leading": 20,
+                                  "trailing": 20,
+                                  "top": 14,
+                                  "bottom": 14
                                 }
                               }
                             },
@@ -21345,324 +21023,137 @@ const SCREENS = runtimeSetting({
                               "id": "",
                               "body": {
                                 "package": "himalaya",
-                                "type": "VStack",
+                                "type": "Divider",
+                                "props": {}
+                              }
+                            }
+                          ]
+                        }
+                      },
+                      "modifiers": {
+                        "fillMaxWidth": true
+                      }
+                    }
+                  ]
+                }
+              },
+              "modifiers": {
+                "padding": {
+                  "leading": 0,
+                  "trailing": 0,
+                  "top": 12,
+                  "bottom": 0
+                },
+                "hiddenPath": "$service:himiBookingServices.collection.noLoading"
+              }
+            },
+            {
+              "id": "himi_services.list",
+              "body": {
+                "package": "himalaya",
+                "type": "LazyList",
+                "props": {
+                  "spacing": 0,
+                  "itemsPath": "$service:himiBookingServices.collection.items",
+                  "onPullToRefresh": {
+                    "actionId": "tier5.himiBookingServices.refresh"
+                  },
+                  "pagination": {
+                    "cursor": "$service:himiBookingServices.collection.cursor",
+                    "onLoadMore": {
+                      "actionId": "tier5.himiBookingServices.loadMore"
+                    },
+                    "pageSize": 50
+                  },
+                  "staggerMs": 30,
+                  "animateItems": true,
+                  "items": [
+                    {
+                      "id": "himi_services.row.$item.id",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "VStack",
+                        "props": {
+                          "spacing": 0,
+                          "alignment": "leading",
+                          "children": [
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "HStack",
                                 "props": {
-                                  "spacing": 0,
+                                  "spacing": 14,
+                                  "alignment": "center",
                                   "children": [
                                     {
-                                      "id": "himi_services.list.collection.compact-list",
+                                      "id": "himi_services.row.$item.id/image",
                                       "body": {
                                         "package": "himalaya",
-                                        "type": "LazyList",
+                                        "type": "Image",
                                         "props": {
-                                          "spacing": 6,
-                                          "itemsPath": "$service:himiBookingServices.collection.items",
-                                          "onPullToRefresh": {
-                                            "actionId": "tier5.himiBookingServices.refresh"
-                                          },
-                                          "pagination": {
-                                            "cursor": "$service:himiBookingServices.collection.cursor",
-                                            "onLoadMore": {
-                                              "actionId": "tier5.himiBookingServices.loadMore"
-                                            },
-                                            "pageSize": 50
-                                          },
-                                          "items": [
-                                            {
-                                              "id": "himi_services.list.collection.compact-list.$item.collectionId",
-                                              "body": {
-                                                "package": "himalaya",
-                                                "type": "VStack",
+                                          "url": "$item.image",
+                                          "width": 72,
+                                          "height": 72,
+                                          "contentMode": "fill"
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "accessibilityRole": "decorative",
+                                        "cornerRadius": 8,
+                                        "hiddenPath": "$item.noImage"
+                                      }
+                                    },
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "ZStack",
+                                        "props": {
+                                          "alignment": "center",
+                                          "children": [
+                                            {
+                                              "id": "",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Image",
                                                 "props": {
-                                                  "spacing": 4,
-                                                  "children": [
-                                                    {
-                                                      "id": "",
-                                                      "body": {
-                                                        "package": "himalaya",
-                                                        "type": "HStack",
-                                                        "props": {
-                                                          "spacing": 12,
-                                                          "children": [
-                                                            {
-                                                              "id": "himi_services.list.collection.compact-list.$item.collectionId/image",
-                                                              "body": {
-                                                                "package": "himalaya",
-                                                                "type": "Image",
-                                                                "props": {
-                                                                  "url": "$item.collectionImage",
-                                                                  "contentDescription": "$item.collectionTitle",
-                                                                  "contentMode": "fill",
-                                                                  "height": 56,
-                                                                  "width": 56
-                                                                }
-                                                              },
-                                                              "modifiers": {
-                                                                "cornerRadius": 12,
-                                                                "hiddenPath": "$item.collectionNoImage"
-                                                              }
-                                                            },
-                                                            {
-                                                              "id": "",
-                                                              "body": {
-                                                                "package": "himalaya",
-                                                                "type": "VStack",
-                                                                "props": {
-                                                                  "spacing": 4,
-                                                                  "alignment": "leading",
-                                                                  "children": [
-                                                                    {
-                                                                      "id": "",
-                                                                      "body": {
-                                                                        "package": "himalaya",
-                                                                        "type": "Text",
-                                                                        "props": {
-                                                                          "text": "$item.collectionTitle",
-                                                                          "style": "bodyEmphasis",
-                                                                          "maxLines": 2
-                                                                        }
-                                                                      }
-                                                                    },
-                                                                    {
-                                                                      "id": "",
-                                                                      "body": {
-                                                                        "package": "himalaya",
-                                                                        "type": "Text",
-                                                                        "props": {
-                                                                          "text": "$item.collectionSubtitle",
-                                                                          "style": "caption",
-                                                                          "color": "textSecondary",
-                                                                          "maxLines": 1,
-                                                                          "collapseWhenEmpty": true
-                                                                        }
-                                                                      }
-                                                                    },
-                                                                    {
-                                                                      "id": "",
-                                                                      "body": {
-                                                                        "package": "himalaya",
-                                                                        "type": "Text",
-                                                                        "props": {
-                                                                          "text": "$item.collectionMeta",
-                                                                          "style": "caption",
-                                                                          "color": "textSecondary",
-                                                                          "maxLines": 2,
-                                                                          "collapseWhenEmpty": true
-                                                                        }
-                                                                      }
-                                                                    },
-                                                                    {
-                                                                      "id": "",
-                                                                      "body": {
-                                                                        "package": "himalaya",
-                                                                        "type": "Text",
-                                                                        "props": {
-                                                                          "text": "Saved",
-                                                                          "style": "caption",
-                                                                          "color": "accentPrimary"
-                                                                        }
-                                                                      },
-                                                                      "modifiers": {
-                                                                        "hiddenPath": "$item.collectionNotSaved"
-                                                                      }
-                                                                    }
-                                                                  ]
-                                                                }
-                                                              },
-                                                              "modifiers": {
-                                                                "weight": 1
-                                                              }
-                                                            },
-                                                            {
-                                                              "id": "",
-                                                              "body": {
-                                                                "package": "himalaya",
-                                                                "type": "HStack",
-                                                                "props": {
-                                                                  "spacing": 8,
-                                                                  "children": [
-                                                                    {
-                                                                      "id": "himi_services.list.collection.compact-list.$item.collectionId/select",
-                                                                      "body": {
-                                                                        "package": "himalaya",
-                                                                        "type": "Button",
-                                                                        "props": {
-                                                                          "title": "$item.collectionSelectLabel",
-                                                                          "style": "plain",
-                                                                          "fullWidth": false,
-                                                                          "action": {
-                                                                            "actionId": "tier5.himiBookingServices.collectionSelect",
-                                                                            "params": {
-                                                                              "id": "$item.collectionId"
-                                                                            }
-                                                                          }
-                                                                        }
-                                                                      },
-                                                                      "modifiers": {
-                                                                        "hiddenPath": "$service:himiBookingServices.collection.noSelection"
-                                                                      }
-                                                                    },
-                                                                    {
-                                                                      "id": "himi_services.list.collection.compact-list.$item.collectionId/primary",
-                                                                      "body": {
-                                                                        "package": "himalaya",
-                                                                        "type": "Button",
-                                                                        "props": {
-                                                                          "title": "Book",
-                                                                          "style": "secondary",
-                                                                          "fullWidth": false,
-                                                                          "action": {
-                                                                            "actionId": "himi.open",
-                                                                            "params": {
-                                                                              "screenId": "himi_time",
-                                                                              "id": "$item.collectionId"
-                                                                            }
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    },
-                                                                    {
-                                                                      "id": "himi_services.list.collection.compact-list.$item.collectionId/actions",
-                                                                      "body": {
-                                                                        "package": "himalaya",
-                                                                        "type": "Menu",
-                                                                        "props": {
-                                                                          "style": "dropdown",
-                                                                          "anchor": {
-                                                                            "id": "",
-                                                                            "body": {
-                                                                              "package": "himalaya",
-                                                                              "type": "Icon",
-                                                                              "props": {
-                                                                                "name": "ellipsis",
-                                                                                "size": 20
-                                                                              }
-                                                                            },
-                                                                            "modifiers": {
-                                                                              "width": 44,
-                                                                              "height": 44,
-                                                                              "accessibilityLabel": "$item.collectionActionsLabel"
-                                                                            }
-                                                                          },
-                                                                          "items": [
-                                                                            {
-                                                                              "id": "preview",
-                                                                              "label": "Quick preview",
-                                                                              "icon": "search",
-                                                                              "action": {
-                                                                                "actionId": "tier5.himiBookingServices.collectionPreview",
-                                                                                "params": {
-                                                                                  "id": "$item.collectionId"
-                                                                                }
-                                                                              }
-                                                                            },
-                                                                            {
-                                                                              "id": "save",
-                                                                              "label": "$item.collectionSaveLabel",
-                                                                              "icon": "bookmark",
-                                                                              "action": {
-                                                                                "actionId": "tier5.himiBookingServices.collectionSave",
-                                                                                "params": {
-                                                                                  "id": "$item.collectionId"
-                                                                                }
-                                                                              }
-                                                                            },
-                                                                            {
-                                                                              "id": "open",
-                                                                              "label": "Open details",
-                                                                              "icon": "chevron_right",
-                                                                              "action": {
-                                                                                "actionId": "himi.open",
-                                                                                "params": {
-                                                                                  "screenId": "$item.detailScreenId",
-                                                                                  "id": "$item.id"
-                                                                                }
-                                                                              }
-                                                                            }
-                                                                          ]
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  ]
-                                                                }
-                                                              },
-                                                              "modifiers": {
-                                                                "hiddenPath": "$item.collectionNoIdentity"
-                                                              }
-                                                            }
-                                                          ]
-                                                        }
-                                                      }
-                                                    }
-                                                  ]
+                                                  "url": "",
+                                                  "width": 72,
+                                                  "height": 72,
+                                                  "contentMode": "fill"
                                                 }
                                               },
                                               "modifiers": {
-                                                "onTap": {
-                                                  "actionId": "himi.open",
-                                                  "params": {
-                                                    "screenId": "$item.detailScreenId",
-                                                    "id": "$item.id"
-                                                  }
-                                                },
-                                                "haptic": "light",
+                                                "accessibilityRole": "decorative",
+                                                "cornerRadius": 8,
                                                 "background": {
-                                                  "token": "surfaceElevated"
-                                                },
-                                                "border": {
-                                                  "width": 1,
-                                                  "color": {
-                                                    "token": "border"
-                                                  }
-                                                },
-                                                "cornerRadius": 12,
-                                                "padding": {
-                                                  "top": 8,
-                                                  "bottom": 8,
-                                                  "leading": 12,
-                                                  "trailing": 12
-                                                },
-                                                "fillMaxWidth": true,
-                                                "accessibilityLabel": "$item.collectionTitle",
-                                                "pressFeedback": "scale",
-                                                "transition": {
-                                                  "enter": "fadeSlide",
-                                                  "direction": "up",
-                                                  "distance": 8
+                                                  "token": "surfaceSecondary"
                                                 }
                                               }
-                                            }
-                                          ],
-                                          "staggerMs": 30,
-                                          "animateItems": true,
-                                          "rowSwipeActions": {
-                                            "trailing": [
-                                              {
-                                                "label": "$item.collectionSaveLabel",
-                                                "icon": "bookmark",
-                                                "action": {
-                                                  "actionId": "tier5.himiBookingServices.collectionSave",
-                                                  "params": {
-                                                    "id": "$item.collectionId"
-                                                  }
+                                            },
+                                            {
+                                              "id": "",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Icon",
+                                                "props": {
+                                                  "name": "image",
+                                                  "size": 24,
+                                                  "tint": "accentPrimary"
                                                 }
                                               },
-                                              {
-                                                "label": "Preview",
-                                                "icon": "search",
-                                                "action": {
-                                                  "actionId": "tier5.himiBookingServices.collectionPreview",
-                                                  "params": {
-                                                    "id": "$item.collectionId"
-                                                  }
-                                                }
+                                              "modifiers": {
+                                                "accessibilityRole": "decorative"
                                               }
-                                            ]
-                                          }
+                                            }
+                                          ]
                                         }
                                       },
                                       "modifiers": {
-                                        "hiddenPath": "$service:himiBookingServices.collection.hideList"
+                                        "width": 72,
+                                        "height": 72,
+                                        "hiddenPath": "$item.hasImage"
                                       }
                                     },
                                     {
@@ -21671,1018 +21162,209 @@ const SCREENS = runtimeSetting({
                                         "package": "himalaya",
                                         "type": "VStack",
                                         "props": {
-                                          "spacing": 12,
+                                          "spacing": 3,
+                                          "alignment": "leading",
                                           "children": [
                                             {
-                                              "id": "himi_services.list.collection.compact-grid",
+                                              "id": "",
                                               "body": {
                                                 "package": "himalaya",
-                                                "type": "Grid",
+                                                "type": "Text",
                                                 "props": {
-                                                  "columns": 2,
-                                                  "columnsMedium": 3,
-                                                  "columnsExpanded": 4,
-                                                  "spacing": 8,
-                                                  "staggerMs": 30,
-                                                  "itemsPath": "$service:himiBookingServices.collection.items",
-                                                  "items": [
-                                                    {
-                                                      "id": "himi_services.list.collection.compact-grid.$item.collectionId",
-                                                      "body": {
-                                                        "package": "himalaya",
-                                                        "type": "VStack",
-                                                        "props": {
-                                                          "spacing": 8,
-                                                          "alignment": "leading",
-                                                          "children": [
-                                                            {
-                                                              "id": "",
-                                                              "body": {
-                                                                "package": "himalaya",
-                                                                "type": "VStack",
-                                                                "props": {
-                                                                  "spacing": 0,
-                                                                  "children": [
-                                                                    {
-                                                                      "id": "himi_services.list.collection.compact-grid.$item.collectionId/image",
-                                                                      "body": {
-                                                                        "package": "himalaya",
-                                                                        "type": "Image",
-                                                                        "props": {
-                                                                          "url": "$item.collectionImage",
-                                                                          "contentDescription": "$item.collectionTitle",
-                                                                          "contentMode": "fill",
-                                                                          "height": 80,
-                                                                          "fillWidth": true
-                                                                        }
-                                                                      },
-                                                                      "modifiers": {
-                                                                        "cornerRadius": 12,
-                                                                        "hiddenPath": "$item.collectionNoImage"
-                                                                      }
-                                                                    },
-                                                                    {
-                                                                      "id": "",
-                                                                      "body": {
-                                                                        "package": "himalaya",
-                                                                        "type": "ZStack",
-                                                                        "props": {
-                                                                          "alignment": "center",
-                                                                          "children": [
-                                                                            {
-                                                                              "id": "",
-                                                                              "body": {
-                                                                                "package": "himalaya",
-                                                                                "type": "Icon",
-                                                                                "props": {
-                                                                                  "name": "photo",
-                                                                                  "size": 28,
-                                                                                  "tint": "accentPrimary"
-                                                                                }
-                                                                              },
-                                                                              "modifiers": {
-                                                                                "accessibilityRole": "decorative"
-                                                                              }
-                                                                            }
-                                                                          ]
-                                                                        }
-                                                                      },
-                                                                      "modifiers": {
-                                                                        "height": 80,
-                                                                        "fillMaxWidth": true,
-                                                                        "cornerRadius": 12,
-                                                                        "background": {
-                                                                          "token": "surfaceSecondary"
-                                                                        },
-                                                                        "accessibilityLabel": "No image available",
-                                                                        "hiddenPath": "$item.collectionHasImage"
-                                                                      }
-                                                                    }
-                                                                  ]
-                                                                }
-                                                              }
-                                                            },
-                                                            {
-                                                              "id": "",
-                                                              "body": {
-                                                                "package": "himalaya",
-                                                                "type": "VStack",
-                                                                "props": {
-                                                                  "spacing": 4,
-                                                                  "alignment": "leading",
-                                                                  "children": [
-                                                                    {
-                                                                      "id": "",
-                                                                      "body": {
-                                                                        "package": "himalaya",
-                                                                        "type": "Text",
-                                                                        "props": {
-                                                                          "text": "$item.collectionTitle",
-                                                                          "style": "bodyEmphasis",
-                                                                          "maxLines": 2
-                                                                        }
-                                                                      }
-                                                                    },
-                                                                    {
-                                                                      "id": "",
-                                                                      "body": {
-                                                                        "package": "himalaya",
-                                                                        "type": "Text",
-                                                                        "props": {
-                                                                          "text": "$item.collectionSubtitle",
-                                                                          "style": "caption",
-                                                                          "color": "textSecondary",
-                                                                          "maxLines": 1,
-                                                                          "collapseWhenEmpty": true
-                                                                        }
-                                                                      }
-                                                                    },
-                                                                    {
-                                                                      "id": "",
-                                                                      "body": {
-                                                                        "package": "himalaya",
-                                                                        "type": "Text",
-                                                                        "props": {
-                                                                          "text": "$item.collectionMeta",
-                                                                          "style": "caption",
-                                                                          "color": "textSecondary",
-                                                                          "maxLines": 2,
-                                                                          "collapseWhenEmpty": true
-                                                                        }
-                                                                      }
-                                                                    },
-                                                                    {
-                                                                      "id": "",
-                                                                      "body": {
-                                                                        "package": "himalaya",
-                                                                        "type": "Text",
-                                                                        "props": {
-                                                                          "text": "Saved",
-                                                                          "style": "caption",
-                                                                          "color": "accentPrimary"
-                                                                        }
-                                                                      },
-                                                                      "modifiers": {
-                                                                        "hiddenPath": "$item.collectionNotSaved"
-                                                                      }
-                                                                    }
-                                                                  ]
-                                                                }
-                                                              }
-                                                            },
-                                                            {
-                                                              "id": "",
-                                                              "body": {
-                                                                "package": "himalaya",
-                                                                "type": "HStack",
-                                                                "props": {
-                                                                  "spacing": 8,
-                                                                  "children": [
-                                                                    {
-                                                                      "id": "himi_services.list.collection.compact-grid.$item.collectionId/select",
-                                                                      "body": {
-                                                                        "package": "himalaya",
-                                                                        "type": "Button",
-                                                                        "props": {
-                                                                          "title": "$item.collectionSelectLabel",
-                                                                          "style": "plain",
-                                                                          "fullWidth": false,
-                                                                          "action": {
-                                                                            "actionId": "tier5.himiBookingServices.collectionSelect",
-                                                                            "params": {
-                                                                              "id": "$item.collectionId"
-                                                                            }
-                                                                          }
-                                                                        }
-                                                                      },
-                                                                      "modifiers": {
-                                                                        "hiddenPath": "$service:himiBookingServices.collection.noSelection"
-                                                                      }
-                                                                    },
-                                                                    {
-                                                                      "id": "himi_services.list.collection.compact-grid.$item.collectionId/primary",
-                                                                      "body": {
-                                                                        "package": "himalaya",
-                                                                        "type": "Button",
-                                                                        "props": {
-                                                                          "title": "Book",
-                                                                          "style": "secondary",
-                                                                          "fullWidth": false,
-                                                                          "action": {
-                                                                            "actionId": "himi.open",
-                                                                            "params": {
-                                                                              "screenId": "himi_time",
-                                                                              "id": "$item.collectionId"
-                                                                            }
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    },
-                                                                    {
-                                                                      "id": "",
-                                                                      "body": {
-                                                                        "package": "himalaya",
-                                                                        "type": "Spacer",
-                                                                        "props": {}
-                                                                      }
-                                                                    },
-                                                                    {
-                                                                      "id": "himi_services.list.collection.compact-grid.$item.collectionId/actions",
-                                                                      "body": {
-                                                                        "package": "himalaya",
-                                                                        "type": "Menu",
-                                                                        "props": {
-                                                                          "style": "dropdown",
-                                                                          "anchor": {
-                                                                            "id": "",
-                                                                            "body": {
-                                                                              "package": "himalaya",
-                                                                              "type": "Icon",
-                                                                              "props": {
-                                                                                "name": "ellipsis",
-                                                                                "size": 20
-                                                                              }
-                                                                            },
-                                                                            "modifiers": {
-                                                                              "width": 44,
-                                                                              "height": 44,
-                                                                              "accessibilityLabel": "$item.collectionActionsLabel"
-                                                                            }
-                                                                          },
-                                                                          "items": [
-                                                                            {
-                                                                              "id": "preview",
-                                                                              "label": "Quick preview",
-                                                                              "icon": "search",
-                                                                              "action": {
-                                                                                "actionId": "tier5.himiBookingServices.collectionPreview",
-                                                                                "params": {
-                                                                                  "id": "$item.collectionId"
-                                                                                }
-                                                                              }
-                                                                            },
-                                                                            {
-                                                                              "id": "save",
-                                                                              "label": "$item.collectionSaveLabel",
-                                                                              "icon": "bookmark",
-                                                                              "action": {
-                                                                                "actionId": "tier5.himiBookingServices.collectionSave",
-                                                                                "params": {
-                                                                                  "id": "$item.collectionId"
-                                                                                }
-                                                                              }
-                                                                            },
-                                                                            {
-                                                                              "id": "open",
-                                                                              "label": "Open details",
-                                                                              "icon": "chevron_right",
-                                                                              "action": {
-                                                                                "actionId": "himi.open",
-                                                                                "params": {
-                                                                                  "screenId": "$item.detailScreenId",
-                                                                                  "id": "$item.id"
-                                                                                }
-                                                                              }
-                                                                            }
-                                                                          ]
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  ]
-                                                                }
-                                                              },
-                                                              "modifiers": {
-                                                                "hiddenPath": "$item.collectionNoIdentity"
-                                                              }
-                                                            }
-                                                          ]
-                                                        }
-                                                      },
-                                                      "modifiers": {
-                                                        "onTap": {
-                                                          "actionId": "himi.open",
-                                                          "params": {
-                                                            "screenId": "$item.detailScreenId",
-                                                            "id": "$item.id"
-                                                          }
-                                                        },
-                                                        "haptic": "light",
-                                                        "background": {
-                                                          "token": "surfaceElevated"
-                                                        },
-                                                        "border": {
-                                                          "width": 1,
-                                                          "color": {
-                                                            "token": "border"
-                                                          }
-                                                        },
-                                                        "cornerRadius": 12,
-                                                        "padding": {
-                                                          "top": 8,
-                                                          "bottom": 8,
-                                                          "leading": 12,
-                                                          "trailing": 12
-                                                        },
-                                                        "fillMaxWidth": true,
-                                                        "accessibilityLabel": "$item.collectionTitle",
-                                                        "pressFeedback": "scale",
-                                                        "transition": {
-                                                          "enter": "fadeSlide",
-                                                          "direction": "up",
-                                                          "distance": 8
-                                                        }
-                                                      }
-                                                    }
-                                                  ]
+                                                  "text": "$item.typeTag",
+                                                  "style": "caption",
+                                                  "color": "textSecondary",
+                                                  "maxLines": 1
                                                 }
+                                              },
+                                              "modifiers": {
+                                                "background": {
+                                                  "token": "surfaceTertiary"
+                                                },
+                                                "cornerRadius": 4,
+                                                "padding": {
+                                                  "leading": 8,
+                                                  "trailing": 8,
+                                                  "top": 2,
+                                                  "bottom": 2
+                                                },
+                                                "hiddenPath": "$item.noTypeTag"
                                               }
                                             },
                                             {
-                                              "id": "himi_services.list.collection.compact-more",
+                                              "id": "",
                                               "body": {
                                                 "package": "himalaya",
-                                                "type": "Button",
+                                                "type": "Text",
                                                 "props": {
-                                                  "title": "Load more",
-                                                  "style": "secondary",
-                                                  "action": {
-                                                    "actionId": "tier5.himiBookingServices.loadMore"
-                                                  }
+                                                  "text": "$item.name",
+                                                  "style": "bodyEmphasis",
+                                                  "maxLines": 2
                                                 }
-                                              },
-                                              "modifiers": {
-                                                "hiddenPath": "$service:himiBookingServices.collection.noMore"
                                               }
-                                            }
-                                          ]
-                                        }
-                                      },
-                                      "modifiers": {
-                                        "hiddenPath": "$service:himiBookingServices.collection.hideGrid"
-                                      }
-                                    }
-                                  ]
-                                }
-                              },
-                              "modifiers": {
-                                "hiddenPath": "$service:himiBookingServices.collection.hideCompact",
-                                "padding": {
-                                  "bottom": 12
-                                }
-                              }
-                            },
-                            {
-                              "id": "",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "VStack",
-                                "props": {
-                                  "spacing": 8,
-                                  "children": [
-                                    {
-                                      "id": "",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "Text",
-                                        "props": {
-                                          "text": "No matching items",
-                                          "style": "bodyEmphasis"
-                                        }
-                                      }
-                                    },
-                                    {
-                                      "id": "btn_tier5_himibookingservices_collectionclear",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "Button",
-                                        "props": {
-                                          "title": "Clear filters",
-                                          "style": "secondary",
-                                          "action": {
-                                            "actionId": "tier5.himiBookingServices.collectionClear"
-                                          }
-                                        }
-                                      }
-                                    }
-                                  ]
-                                }
-                              },
-                              "modifiers": {
-                                "hiddenPath": "$service:himiBookingServices.collection.noEmpty",
-                                "padding": {
-                                  "bottom": 12
-                                }
-                              }
-                            },
-                            {
-                              "id": "himi_services.list.collection.sheet",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "BottomSheet",
-                                "props": {
-                                  "presentedPath": "$service:himiBookingServices.collection.filtersPresented",
-                                  "dismissible": true,
-                                  "showGrabber": true,
-                                  "onDismiss": {
-                                    "actionId": "tier5.himiBookingServices.collectionDismissFilters"
-                                  },
-                                  "content": {
-                                    "id": "",
-                                    "body": {
-                                      "package": "himalaya",
-                                      "type": "VStack",
-                                      "props": {
-                                        "spacing": 16,
-                                        "children": [
-                                          {
-                                            "id": "",
-                                            "body": {
-                                              "package": "himalaya",
-                                              "type": "Text",
-                                              "props": {
-                                                "text": "Make this view yours",
-                                                "style": "title2"
-                                              }
-                                            }
-                                          },
-                                          {
-                                            "id": "",
-                                            "body": {
-                                              "package": "himalaya",
-                                              "type": "Text",
-                                              "props": {
-                                                "text": "$service:himiBookingServices.collection.persistenceLabel",
-                                                "style": "caption",
-                                                "color": "textSecondary"
+                                            },
+                                            {
+                                              "id": "",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Text",
+                                                "props": {
+                                                  "text": "$item.tagline",
+                                                  "style": "caption",
+                                                  "color": "textSecondary",
+                                                  "maxLines": 2,
+                                                  "collapseWhenEmpty": true
+                                                }
                                               }
-                                            }
-                                          },
-                                          {
-                                            "id": "",
-                                            "body": {
-                                              "package": "himalaya",
-                                              "type": "Text",
-                                              "props": {
-                                                "text": "Sort results",
-                                                "style": "bodyEmphasis"
+                                            },
+                                            {
+                                              "id": "",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Text",
+                                                "props": {
+                                                  "text": "$item.meta",
+                                                  "style": "footnote",
+                                                  "color": "textSecondary",
+                                                  "maxLines": 2,
+                                                  "collapseWhenEmpty": true
+                                                }
                                               }
                                             }
-                                          },
-                                          {
-                                            "id": "segmented_tier5_himibookingservices_collectionsort",
-                                            "body": {
-                                              "package": "himalaya",
-                                              "type": "SegmentedControl",
-                                              "props": {
-                                                "options": [
-                                                  {
-                                                    "id": "default",
-                                                    "label": "Original"
-                                                  },
-                                                  {
-                                                    "id": "az",
-                                                    "label": "A–Z"
-                                                  },
-                                                  {
-                                                    "id": "za",
-                                                    "label": "Z–A"
-                                                  }
-                                                ],
-                                                "selectedId": "$service:himiBookingServices.collection.sort",
-                                                "onChange": {
-                                                  "actionId": "tier5.himiBookingServices.collectionSort"
-                                                }
-                                              }
-                                            }
-                                          },
-                                          {
-                                            "id": "",
-                                            "body": {
-                                              "package": "himalaya",
-                                              "type": "Text",
-                                              "props": {
-                                                "text": "Density",
-                                                "style": "bodyEmphasis"
-                                              }
-                                            }
-                                          },
-                                          {
-                                            "id": "segmented_tier5_himibookingservices_collectiondensity",
-                                            "body": {
-                                              "package": "himalaya",
-                                              "type": "SegmentedControl",
-                                              "props": {
-                                                "options": [
-                                                  {
-                                                    "id": "comfortable",
-                                                    "label": "Comfortable"
-                                                  },
-                                                  {
-                                                    "id": "compact",
-                                                    "label": "Compact"
-                                                  }
-                                                ],
-                                                "selectedId": "$service:himiBookingServices.collection.density",
-                                                "onChange": {
-                                                  "actionId": "tier5.himiBookingServices.collectionDensity"
-                                                }
-                                              }
-                                            }
-                                          },
-                                          {
-                                            "id": "",
-                                            "body": {
-                                              "package": "himalaya",
-                                              "type": "Text",
-                                              "props": {
-                                                "text": "Saved views",
-                                                "style": "bodyEmphasis"
-                                              }
-                                            }
-                                          },
-                                          {
-                                            "id": "",
-                                            "body": {
-                                              "package": "himalaya",
-                                              "type": "LazyList",
-                                              "props": {
-                                                "itemsPath": "$service:himiBookingServices.collection.savedViews",
-                                                "items": [
-                                                  {
-                                                    "id": "",
-                                                    "body": {
-                                                      "package": "himalaya",
-                                                      "type": "HStack",
-                                                      "props": {
-                                                        "spacing": 8,
-                                                        "children": [
-                                                          {
-                                                            "id": "btn_tier5_himibookingservices_collectionapplyview",
-                                                            "body": {
-                                                              "package": "himalaya",
-                                                              "type": "Button",
-                                                              "props": {
-                                                                "title": "$item.name",
-                                                                "style": "secondary",
-                                                                "action": {
-                                                                  "actionId": "tier5.himiBookingServices.collectionApplyView",
-                                                                  "params": {
-                                                                    "id": "$item.id"
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          },
-                                                          {
-                                                            "id": "btn_tier5_himibookingservices_collectionremoveview",
-                                                            "body": {
-                                                              "package": "himalaya",
-                                                              "type": "Button",
-                                                              "props": {
-                                                                "title": "Remove",
-                                                                "style": "plain",
-                                                                "action": {
-                                                                  "actionId": "tier5.himiBookingServices.collectionRemoveView",
-                                                                  "params": {
-                                                                    "id": "$item.id"
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          }
-                                                        ]
-                                                      }
-                                                    }
-                                                  }
-                                                ]
-                                              }
-                                            },
-                                            "modifiers": {
-                                              "hiddenPath": "$service:himiBookingServices.collection.noSavedViews"
-                                            }
-                                          },
-                                          {
-                                            "id": "himi_services.list.collection.view-name",
-                                            "body": {
-                                              "package": "himalaya",
-                                              "type": "TextField",
-                                              "props": {
-                                                "placeholder": "Name this view",
-                                                "valuePath": "$service:himiBookingServices.collection.viewName",
-                                                "onChange": {
-                                                  "actionId": "tier5.himiBookingServices.collectionViewName"
-                                                }
-                                              }
-                                            }
-                                          },
-                                          {
-                                            "id": "himi_services.list.collection.remember-view",
-                                            "body": {
-                                              "package": "himalaya",
-                                              "type": "Button",
-                                              "props": {
-                                                "title": "Save current view",
-                                                "style": "secondary",
-                                                "action": {
-                                                  "actionId": "tier5.himiBookingServices.collectionRememberView"
-                                                }
-                                              }
-                                            }
-                                          },
-                                          {
-                                            "id": "",
-                                            "body": {
-                                              "package": "himalaya",
-                                              "type": "Text",
-                                              "props": {
-                                                "text": "$service:himiBookingServices.collection.viewMessage",
-                                                "style": "caption",
-                                                "collapseWhenEmpty": true
-                                              }
-                                            }
-                                          },
-                                          {
-                                            "id": "btn_tier5_himibookingservices_collectiondismissfilters",
-                                            "body": {
-                                              "package": "himalaya",
-                                              "type": "Button",
-                                              "props": {
-                                                "title": "Done",
-                                                "style": "primary",
-                                                "action": {
-                                                  "actionId": "tier5.himiBookingServices.collectionDismissFilters"
-                                                },
-                                                "fullWidth": true
-                                              }
-                                            }
-                                          }
-                                        ]
-                                      }
-                                    },
-                                    "modifiers": {
-                                      "padding": {
-                                        "leading": 20,
-                                        "trailing": 20,
-                                        "top": 20,
-                                        "bottom": 24
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            },
-                            {
-                              "id": "himi_services.list.collection.preview",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "BottomSheet",
-                                "props": {
-                                  "presentedPath": "$service:himiBookingServices.collection.previewPresented",
-                                  "dismissible": true,
-                                  "showGrabber": true,
-                                  "onDismiss": {
-                                    "actionId": "tier5.himiBookingServices.collectionDismissPreview"
-                                  },
-                                  "content": {
-                                    "id": "",
-                                    "body": {
-                                      "package": "himalaya",
-                                      "type": "Grid",
-                                      "props": {
-                                        "columns": 1,
-                                        "itemsPath": "$service:himiBookingServices.collection.preview",
-                                        "items": [
-                                          {
-                                            "id": "himi_services.list.collection.preview.$item.collectionId",
-                                            "body": {
-                                              "package": "himalaya",
-                                              "type": "VStack",
-                                              "props": {
-                                                "spacing": 8,
-                                                "alignment": "leading",
-                                                "children": [
-                                                  {
-                                                    "id": "",
-                                                    "body": {
-                                                      "package": "himalaya",
-                                                      "type": "VStack",
-                                                      "props": {
-                                                        "spacing": 0,
-                                                        "children": [
-                                                          {
-                                                            "id": "himi_services.list.collection.preview.$item.collectionId/image",
-                                                            "body": {
-                                                              "package": "himalaya",
-                                                              "type": "Image",
-                                                              "props": {
-                                                                "url": "$item.collectionImage",
-                                                                "contentDescription": "$item.collectionTitle",
-                                                                "contentMode": "fill",
-                                                                "height": 112,
-                                                                "fillWidth": true
-                                                              }
-                                                            },
-                                                            "modifiers": {
-                                                              "cornerRadius": 12,
-                                                              "hiddenPath": "$item.collectionNoImage"
-                                                            }
-                                                          },
-                                                          {
-                                                            "id": "",
-                                                            "body": {
-                                                              "package": "himalaya",
-                                                              "type": "ZStack",
-                                                              "props": {
-                                                                "alignment": "center",
-                                                                "children": [
-                                                                  {
-                                                                    "id": "",
-                                                                    "body": {
-                                                                      "package": "himalaya",
-                                                                      "type": "Icon",
-                                                                      "props": {
-                                                                        "name": "photo",
-                                                                        "size": 28,
-                                                                        "tint": "accentPrimary"
-                                                                      }
-                                                                    },
-                                                                    "modifiers": {
-                                                                      "accessibilityRole": "decorative"
-                                                                    }
-                                                                  }
-                                                                ]
-                                                              }
-                                                            },
-                                                            "modifiers": {
-                                                              "height": 112,
-                                                              "fillMaxWidth": true,
-                                                              "cornerRadius": 12,
-                                                              "background": {
-                                                                "token": "surfaceSecondary"
-                                                              },
-                                                              "accessibilityLabel": "No image available",
-                                                              "hiddenPath": "$item.collectionHasImage"
-                                                            }
-                                                          }
-                                                        ]
-                                                      }
-                                                    }
-                                                  },
-                                                  {
-                                                    "id": "",
-                                                    "body": {
-                                                      "package": "himalaya",
-                                                      "type": "VStack",
-                                                      "props": {
-                                                        "spacing": 4,
-                                                        "alignment": "leading",
-                                                        "children": [
-                                                          {
-                                                            "id": "",
-                                                            "body": {
-                                                              "package": "himalaya",
-                                                              "type": "Text",
-                                                              "props": {
-                                                                "text": "$item.collectionTitle",
-                                                                "style": "bodyEmphasis",
-                                                                "maxLines": 2
-                                                              }
-                                                            }
-                                                          },
-                                                          {
-                                                            "id": "",
-                                                            "body": {
-                                                              "package": "himalaya",
-                                                              "type": "Text",
-                                                              "props": {
-                                                                "text": "$item.collectionSubtitle",
-                                                                "style": "caption",
-                                                                "color": "textSecondary",
-                                                                "maxLines": 3,
-                                                                "collapseWhenEmpty": true
-                                                              }
-                                                            }
-                                                          },
-                                                          {
-                                                            "id": "",
-                                                            "body": {
-                                                              "package": "himalaya",
-                                                              "type": "Text",
-                                                              "props": {
-                                                                "text": "$item.collectionMeta",
-                                                                "style": "caption",
-                                                                "color": "textSecondary",
-                                                                "maxLines": 2,
-                                                                "collapseWhenEmpty": true
-                                                              }
-                                                            }
-                                                          },
-                                                          {
-                                                            "id": "",
-                                                            "body": {
-                                                              "package": "himalaya",
-                                                              "type": "Text",
-                                                              "props": {
-                                                                "text": "Saved",
-                                                                "style": "caption",
-                                                                "color": "accentPrimary"
-                                                              }
-                                                            },
-                                                            "modifiers": {
-                                                              "hiddenPath": "$item.collectionNotSaved"
-                                                            }
-                                                          }
-                                                        ]
-                                                      }
-                                                    }
-                                                  },
-                                                  {
-                                                    "id": "",
-                                                    "body": {
-                                                      "package": "himalaya",
-                                                      "type": "HStack",
-                                                      "props": {
-                                                        "spacing": 8,
-                                                        "children": [
-                                                          {
-                                                            "id": "himi_services.list.collection.preview.$item.collectionId/select",
-                                                            "body": {
-                                                              "package": "himalaya",
-                                                              "type": "Button",
-                                                              "props": {
-                                                                "title": "$item.collectionSelectLabel",
-                                                                "style": "plain",
-                                                                "fullWidth": false,
-                                                                "action": {
-                                                                  "actionId": "tier5.himiBookingServices.collectionSelect",
-                                                                  "params": {
-                                                                    "id": "$item.collectionId"
-                                                                  }
-                                                                }
-                                                              }
-                                                            },
-                                                            "modifiers": {
-                                                              "hiddenPath": "$service:himiBookingServices.collection.noSelection"
-                                                            }
-                                                          },
-                                                          {
-                                                            "id": "himi_services.list.collection.preview.$item.collectionId/primary",
-                                                            "body": {
-                                                              "package": "himalaya",
-                                                              "type": "Button",
-                                                              "props": {
-                                                                "title": "Book",
-                                                                "style": "secondary",
-                                                                "fullWidth": false,
-                                                                "action": {
-                                                                  "actionId": "himi.open",
-                                                                  "params": {
-                                                                    "screenId": "himi_time",
-                                                                    "id": "$item.collectionId"
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          },
-                                                          {
-                                                            "id": "",
-                                                            "body": {
-                                                              "package": "himalaya",
-                                                              "type": "Spacer",
-                                                              "props": {}
-                                                            }
-                                                          },
-                                                          {
-                                                            "id": "himi_services.list.collection.preview.$item.collectionId/actions",
-                                                            "body": {
-                                                              "package": "himalaya",
-                                                              "type": "Menu",
-                                                              "props": {
-                                                                "style": "dropdown",
-                                                                "anchor": {
-                                                                  "id": "",
-                                                                  "body": {
-                                                                    "package": "himalaya",
-                                                                    "type": "Icon",
-                                                                    "props": {
-                                                                      "name": "ellipsis",
-                                                                      "size": 20
-                                                                    }
-                                                                  },
-                                                                  "modifiers": {
-                                                                    "width": 44,
-                                                                    "height": 44,
-                                                                    "accessibilityLabel": "$item.collectionActionsLabel"
-                                                                  }
-                                                                },
-                                                                "items": [
-                                                                  {
-                                                                    "id": "preview",
-                                                                    "label": "Quick preview",
-                                                                    "icon": "search",
-                                                                    "action": {
-                                                                      "actionId": "tier5.himiBookingServices.collectionPreview",
-                                                                      "params": {
-                                                                        "id": "$item.collectionId"
-                                                                      }
-                                                                    }
-                                                                  },
-                                                                  {
-                                                                    "id": "save",
-                                                                    "label": "$item.collectionSaveLabel",
-                                                                    "icon": "bookmark",
-                                                                    "action": {
-                                                                      "actionId": "tier5.himiBookingServices.collectionSave",
-                                                                      "params": {
-                                                                        "id": "$item.collectionId"
-                                                                      }
-                                                                    }
-                                                                  },
-                                                                  {
-                                                                    "id": "open",
-                                                                    "label": "Open details",
-                                                                    "icon": "chevron_right",
-                                                                    "action": {
-                                                                      "actionId": "himi.open",
-                                                                      "params": {
-                                                                        "screenId": "$item.detailScreenId",
-                                                                        "id": "$item.id"
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                ]
-                                                              }
-                                                            }
-                                                          }
-                                                        ]
+                                          ]
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "weight": 1
+                                      }
+                                    },
+                                    {
+                                      "id": "himi_services.row.$item.id/book",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "VStack",
+                                        "props": {
+                                          "spacing": 0,
+                                          "children": [
+                                            {
+                                              "id": "",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "HStack",
+                                                "props": {
+                                                  "spacing": 0,
+                                                  "alignment": "center",
+                                                  "children": [
+                                                    {
+                                                      "id": "",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "Text",
+                                                        "props": {
+                                                          "text": "$item.bookCta",
+                                                          "style": "footnote",
+                                                          "color": "textPrimary",
+                                                          "maxLines": 1
+                                                        }
                                                       }
-                                                    },
-                                                    "modifiers": {
-                                                      "hiddenPath": "$item.collectionNoIdentity"
                                                     }
-                                                  }
-                                                ]
-                                              }
-                                            },
-                                            "modifiers": {
-                                              "onTap": {
-                                                "actionId": "himi.open",
-                                                "params": {
-                                                  "screenId": "$item.detailScreenId",
-                                                  "id": "$item.id"
+                                                  ]
                                                 }
                                               },
-                                              "haptic": "light",
-                                              "background": {
-                                                "token": "surfaceElevated"
-                                              },
-                                              "border": {
-                                                "width": 1,
-                                                "color": {
-                                                  "token": "border"
+                                              "modifiers": {
+                                                "height": 36,
+                                                "padding": {
+                                                  "leading": 16,
+                                                  "trailing": 16,
+                                                  "top": 0,
+                                                  "bottom": 0
+                                                },
+                                                "cornerRadius": 18,
+                                                "border": {
+                                                  "width": 1,
+                                                  "color": {
+                                                    "token": "textPrimary"
+                                                  }
                                                 }
-                                              },
-                                              "cornerRadius": 12,
-                                              "padding": {
-                                                "top": 12,
-                                                "bottom": 12,
-                                                "leading": 12,
-                                                "trailing": 12
-                                              },
-                                              "fillMaxWidth": true,
-                                              "accessibilityLabel": "$item.collectionTitle",
-                                              "pressFeedback": "scale",
-                                              "transition": {
-                                                "enter": "fadeSlide",
-                                                "direction": "up",
-                                                "distance": 8
                                               }
                                             }
+                                          ]
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "padding": {
+                                          "leading": 0,
+                                          "trailing": 0,
+                                          "top": 4,
+                                          "bottom": 4
+                                        },
+                                        "onTap": {
+                                          "actionId": "himi.open",
+                                          "params": {
+                                            "screenId": "himi_time",
+                                            "id": "$item.id"
                                           }
-                                        ]
-                                      }
-                                    },
-                                    "modifiers": {
-                                      "padding": {
-                                        "leading": 20,
-                                        "trailing": 20,
-                                        "top": 20,
-                                        "bottom": 24
+                                        },
+                                        "accessibilityRole": "button",
+                                        "accessibilityLabel": "$item.bookA11y",
+                                        "pressFeedback": "scale",
+                                        "haptic": "light",
+                                        "hiddenPath": "$item.noBook"
                                       }
                                     }
-                                  }
+                                  ]
+                                }
+                              },
+                              "modifiers": {
+                                "fillMaxWidth": true,
+                                "padding": {
+                                  "leading": 20,
+                                  "trailing": 20,
+                                  "top": 14,
+                                  "bottom": 14
                                 }
                               }
+                            },
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Divider",
+                                "props": {}
+                              }
                             }
                           ]
                         }
+                      },
+                      "modifiers": {
+                        "onTap": {
+                          "actionId": "himi.open",
+                          "params": {
+                            "screenId": "$item.detailScreenId",
+                            "id": "$item.id"
+                          }
+                        },
+                        "pressFeedback": "highlight",
+                        "haptic": "light",
+                        "accessibilityLabel": "$item.a11y",
+                        "transition": {
+                          "enter": "fadeSlide",
+                          "direction": "up",
+                          "distance": 8
+                        }
                       }
                     }
                   ]
                 }
               },
               "modifiers": {
-                "hiddenPath": "$service:himiBookingServices.isLoading"
+                "padding": {
+                  "leading": 0,
+                  "trailing": 0,
+                  "top": 12,
+                  "bottom": 0
+                },
+                "hiddenPath": "$service:himiBookingServices.hideRows"
               }
             },
             {
@@ -22691,7 +21373,55 @@ const SCREENS = runtimeSetting({
                 "package": "himalaya",
                 "type": "VStack",
                 "props": {
-                  "spacing": 12,
+                  "spacing": 8,
+                  "alignment": "leading",
+                  "children": [
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "More services did not load.",
+                          "style": "caption",
+                          "color": "textSecondary"
+                        }
+                      }
+                    },
+                    {
+                      "id": "himi_services.retry_page",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Try again",
+                          "style": "secondary",
+                          "action": {
+                            "actionId": "tier5.himiBookingServices.retry"
+                          }
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              "modifiers": {
+                "padding": {
+                  "leading": 20,
+                  "trailing": 20,
+                  "top": 12,
+                  "bottom": 0
+                },
+                "hiddenPath": "$service:himiBookingServices.collection.noPageError"
+              }
+            },
+            {
+              "id": "himi_services.empty_source",
+              "body": {
+                "package": "himalaya",
+                "type": "VStack",
+                "props": {
+                  "spacing": 10,
                   "alignment": "center",
                   "children": [
                     {
@@ -22701,7 +21431,7 @@ const SCREENS = runtimeSetting({
                         "type": "Icon",
                         "props": {
                           "name": "calendar",
-                          "size": 34,
+                          "size": 28,
                           "tint": "textTertiary"
                         }
                       },
@@ -22715,10 +21445,50 @@ const SCREENS = runtimeSetting({
                         "package": "himalaya",
                         "type": "Text",
                         "props": {
-                          "text": "$service:himiBookingServices.emptyText",
-                          "style": "bodyEmphasis",
+                          "text": "$service:himiBookingServices.collection.emptySourceText",
+                          "style": "body",
                           "color": "textSecondary",
-                          "collapseWhenEmpty": true
+                          "textAlign": "center"
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              "modifiers": {
+                "fillMaxWidth": true,
+                "padding": {
+                  "leading": 20,
+                  "trailing": 20,
+                  "top": 40,
+                  "bottom": 0
+                },
+                "transition": {
+                  "enter": "fade",
+                  "exit": "fade"
+                },
+                "hiddenPath": "$service:himiBookingServices.collection.noEmptySource"
+              }
+            },
+            {
+              "id": "himi_services.empty",
+              "body": {
+                "package": "himalaya",
+                "type": "VStack",
+                "props": {
+                  "spacing": 16,
+                  "alignment": "center",
+                  "children": [
+                    {
+                      "id": "himi_services.no_match_text",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:himiBookingServices.noMatchText",
+                          "style": "body",
+                          "color": "textSecondary",
+                          "textAlign": "center"
                         }
                       }
                     },
@@ -22728,29 +21498,58 @@ const SCREENS = runtimeSetting({
                         "package": "himalaya",
                         "type": "Button",
                         "props": {
-                          "title": "Clear search",
+                          "title": "Clear Search",
+                          "style": "secondary",
+                          "action": {
+                            "actionId": "tier5.himiBookingServices.search",
+                            "params": {
+                              "value": ""
+                            }
+                          }
+                        }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiBookingServices.noQuery"
+                      }
+                    },
+                    {
+                      "id": "himi_services.empty.show_all",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Show All",
                           "style": "secondary",
                           "action": {
-                            "actionId": "tier5.himiBookingServices.clearSearch"
+                            "actionId": "tier5.himiBookingServices.collectionFilter",
+                            "args": {
+                              "selectedIds": [
+                                "all"
+                              ]
+                            }
                           }
                         }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiBookingServices.hasQuery"
                       }
                     }
                   ]
                 }
               },
               "modifiers": {
+                "fillMaxWidth": true,
                 "padding": {
-                  "leading": 24,
-                  "trailing": 24,
-                  "top": 24,
-                  "bottom": 24
+                  "leading": 20,
+                  "trailing": 20,
+                  "top": 40,
+                  "bottom": 0
                 },
                 "transition": {
                   "enter": "fade",
                   "exit": "fade"
                 },
-                "hiddenPath": "$service:himiBookingServices.noEmpty"
+                "hiddenPath": "$service:himiBookingServices.collection.noEmpty"
               }
             }
           ]
@@ -22761,8 +21560,8 @@ const SCREENS = runtimeSetting({
           "token": "surfacePrimary"
         },
         "padding": {
-          "leading": 16,
-          "trailing": 16,
+          "leading": 0,
+          "trailing": 0,
           "top": 18,
           "bottom": 24
         },