@wix/himalaya-cli 0.1582.0 → 0.1584.0

package/templates/yoga-studio/dev/index.ts

@@ -3772,7 +3772,7 @@ const SCREENS = runtimeSetting({
                         "package": "himalaya",
                         "type": "Text",
                         "props": {
-                          "text": "Settings",
+                          "text": "Appearance",
                           "style": "body",
                           "maxLines": 1
                         }
@@ -3804,7 +3804,88 @@ const SCREENS = runtimeSetting({
                 "pressFeedback": "highlight",
                 "haptic": "light",
                 "accessibilityRole": "button",
-                "accessibilityLabel": "Settings"
+                "accessibilityLabel": "Appearance"
+              }
+            },
+            {
+              "id": "himi_account.notification_settings",
+              "body": {
+                "package": "himalaya",
+                "type": "HStack",
+                "props": {
+                  "spacing": 12,
+                  "alignment": "center",
+                  "children": [
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "ZStack",
+                        "props": {
+                          "alignment": "center",
+                          "children": [
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Icon",
+                                "props": {
+                                  "name": "bell",
+                                  "size": 20,
+                                  "tint": "textPrimary"
+                                }
+                              },
+                              "modifiers": {
+                                "accessibilityRole": "decorative"
+                              }
+                            }
+                          ]
+                        }
+                      },
+                      "modifiers": {
+                        "width": 24,
+                        "height": 24
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "Notification Settings",
+                          "style": "body",
+                          "maxLines": 1
+                        }
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Spacer",
+                        "props": {}
+                      }
+                    }
+                  ]
+                }
+              },
+              "modifiers": {
+                "fillMaxWidth": true,
+                "padding": {
+                  "top": 12,
+                  "bottom": 12
+                },
+                "onTap": {
+                  "actionId": "himi.open",
+                  "params": {
+                    "screenId": "himi_notif_settings"
+                  }
+                },
+                "pressFeedback": "highlight",
+                "haptic": "light",
+                "accessibilityRole": "button",
+                "accessibilityLabel": "Notification Settings"
               }
             },
             {
@@ -7045,8 +7126,8 @@ const SCREENS = runtimeSetting({
       "bundleVersion": "0.0.1"
     }
   },
-  "himi_view_profile": {
-    "screenId": "himi_view_profile",
+  "himi_notif_settings": {
+    "screenId": "himi_notif_settings",
     "renderer": "sdui_intent",
     "title": "",
     "schemaVersion": 1,
@@ -7055,183 +7136,317 @@ const SCREENS = runtimeSetting({
       "staleWhileRevalidate": 0
     },
     "payload": {
-      "id": "himi_view_profile.root",
+      "id": "himi_notif_settings.root",
       "body": {
         "package": "himalaya",
         "type": "VStack",
         "props": {
-          "spacing": 8,
-          "alignment": "center",
+          "spacing": 16,
+          "alignment": "leading",
           "children": [
             {
-              "id": "himi_view_profile.loading",
+              "id": "himi_notif_settings.title",
               "body": {
                 "package": "himalaya",
                 "type": "Text",
                 "props": {
-                  "text": "Loading…",
+                  "text": "Notification Settings",
+                  "style": "title1"
+                }
+              }
+            },
+            {
+              "id": "",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "Your site notification preferences — tap a topic to mute or enable.",
                   "style": "body",
                   "color": "textSecondary"
                 }
               },
               "modifiers": {
-                "hiddenPath": "$service:spacesViewProfile.hideLoading"
+                "hiddenPath": "$service:himiBrandedNotifSettings.isMock"
               }
             },
             {
               "id": "",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "Example topics — your notification preferences will appear here.",
+                  "style": "body",
+                  "color": "textSecondary"
+                }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:himiBrandedNotifSettings.notMock"
+              }
+            },
+            {
+              "id": "himi_notif_settings.sample_banner",
+              "body": {
+                "package": "himalaya",
+                "type": "Banner",
+                "props": {
+                  "severity": "warning",
+                  "title": "Sample content",
+                  "message": "These are example settings — none are configured yet."
+                }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:himiBrandedNotifSettings.notMockEmpty"
+              }
+            },
+            {
+              "id": "himi_notif_settings.unavailable_banner",
+              "body": {
+                "package": "himalaya",
+                "type": "Banner",
+                "props": {
+                  "severity": "warning",
+                  "title": "Sample content",
+                  "message": "Your notification settings couldn't be loaded."
+                }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:himiBrandedNotifSettings.notMockUnavailable"
+              }
+            },
+            {
+              "id": "himi_notif_settings.action_message",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "$service:himiBrandedNotifSettings.actionMessage",
+                  "style": "body",
+                  "color": "textSecondary",
+                  "collapseWhenEmpty": true
+                }
+              }
+            },
+            {
+              "id": "himi_notif_settings.loading",
+              "body": {
+                "package": "himalaya",
+                "type": "Skeleton",
+                "props": {
+                  "height": 72,
+                  "cornerRadius": 12,
+                  "count": 3
+                }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:himiBrandedNotifSettings.notLoading"
+              }
+            },
+            {
+              "id": "himi_notif_settings.error",
               "body": {
                 "package": "himalaya",
                 "type": "VStack",
                 "props": {
                   "spacing": 8,
-                  "alignment": "center",
+                  "alignment": "leading",
                   "children": [
                     {
-                      "id": "himi_view_profile.avatar",
-                      "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": {
-                        "width": 96,
-                        "height": 96,
-                        "background": {
-                          "token": "accentSurface"
-                        },
-                        "cornerRadius": 16
-                      }
-                    },
-                    {
-                      "id": "himi_view_profile.name",
+                      "id": "",
                       "body": {
                         "package": "himalaya",
                         "type": "Text",
                         "props": {
-                          "text": "$service:spacesViewProfile.name",
-                          "style": "title1"
+                          "text": "$service:himiBrandedNotifSettings.error",
+                          "style": "bodyEmphasis",
+                          "collapseWhenEmpty": true
                         }
                       }
                     },
                     {
-                      "id": "",
+                      "id": "himi_notif_settings.retry",
                       "body": {
                         "package": "himalaya",
-                        "type": "Text",
+                        "type": "Button",
                         "props": {
-                          "text": "$service:spacesViewProfile.handle",
-                          "style": "footnote",
-                          "color": "textSecondary",
-                          "collapseWhenEmpty": true
+                          "title": "Try again",
+                          "style": "secondary",
+                          "action": {
+                            "actionId": "tier5.himiBrandedNotifSettings.load"
+                          }
                         }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiBrandedNotifSettings.signInRequired"
                       }
                     },
                     {
-                      "id": "",
+                      "id": "himi_notif_settings.sign_in",
                       "body": {
                         "package": "himalaya",
-                        "type": "Text",
+                        "type": "Button",
                         "props": {
-                          "text": "$service:spacesViewProfile.about",
-                          "style": "body",
-                          "collapseWhenEmpty": true
+                          "title": "Sign in",
+                          "style": "primary",
+                          "leadingIcon": "person",
+                          "action": {
+                            "actionId": "himi.open",
+                            "params": {
+                              "screenId": "himi_sign_in",
+                              "returnScreenId": "himi_notif_settings",
+                              "modal": "1"
+                            },
+                            "presentation": "sheet"
+                          }
                         }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiBrandedNotifSettings.noSignIn"
                       }
                     }
                   ]
                 }
               },
               "modifiers": {
-                "hiddenPath": "$service:spacesViewProfile.profileHidden"
+                "background": {
+                  "token": "surfaceElevated"
+                },
+                "border": {
+                  "width": 1,
+                  "color": {
+                    "token": "border"
+                  }
+                },
+                "cornerRadius": 4,
+                "padding": {
+                  "leading": 16,
+                  "trailing": 16,
+                  "top": 16,
+                  "bottom": 16
+                },
+                "hiddenPath": "$service:himiBrandedNotifSettings.notErrored"
               }
             },
             {
-              "id": "himi_view_profile.member_gate",
+              "id": "himi_notif_settings.rows",
               "body": {
                 "package": "himalaya",
-                "type": "VStack",
+                "type": "Grid",
                 "props": {
+                  "columns": 1,
                   "spacing": 10,
-                  "alignment": "center",
-                  "children": [
+                  "itemsPath": "$service:himiBrandedNotifSettings.topics",
+                  "items": [
                     {
                       "id": "",
                       "body": {
                         "package": "himalaya",
-                        "type": "Icon",
+                        "type": "VStack",
                         "props": {
-                          "name": "person",
-                          "size": 28,
-                          "tint": "accentPrimary"
-                        }
-                      },
-                      "modifiers": {
-                        "accessibilityRole": "decorative"
-                      }
-                    },
-                    {
-                      "id": "himi_view_profile.member_gate_title",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "Text",
-                        "props": {
-                          "text": "Sign in to view your profile",
-                          "style": "bodyEmphasis"
-                        }
-                      }
-                    },
-                    {
-                      "id": "",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "Text",
-                        "props": {
-                          "text": "Your public profile appears here after you sign in.",
-                          "style": "footnote",
-                          "color": "textSecondary"
-                        }
-                      }
-                    },
-                    {
-                      "id": "himi_view_profile.member_gate_signin",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "Button",
-                        "props": {
-                          "title": "Sign in",
-                          "style": "primary",
-                          "fullWidth": true,
-                          "action": {
-                            "actionId": "himi.open",
-                            "params": {
-                              "screenId": "himi_sign_in",
-                              "mode": "signin",
-                              "intent": "profile",
-                              "returnScreenId": "himi_view_profile",
-                              "modal": "1"
+                          "spacing": 2,
+                          "alignment": "leading",
+                          "children": [
+                            {
+                              "id": "himi_notif_settings.topic.$item.id",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Toggle",
+                                "props": {
+                                  "label": "$item.name",
+                                  "valuePath": "$item.on",
+                                  "onChange": {
+                                    "actionId": "tier5.himiBrandedNotifSettings.toggle",
+                                    "params": {
+                                      "id": "$item.id"
+                                    }
+                                  }
+                                }
+                              },
+                              "modifiers": {
+                                "hiddenPath": "$item.locked"
+                              }
                             },
-                            "presentation": "sheet"
+                            {
+                              "id": "himi_notif_settings.locked_topic.$item.id",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "HStack",
+                                "props": {
+                                  "spacing": 12,
+                                  "children": [
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "$item.name",
+                                          "style": "body",
+                                          "maxLines": 2
+                                        }
+                                      }
+                                    },
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Spacer",
+                                        "props": {}
+                                      }
+                                    },
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "$item.stateLabel",
+                                          "style": "footnote",
+                                          "color": "textSecondary",
+                                          "maxLines": 1
+                                        }
+                                      }
+                                    }
+                                  ]
+                                }
+                              },
+                              "modifiers": {
+                                "hiddenPath": "$item.notLocked"
+                              }
+                            },
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Text",
+                                "props": {
+                                  "text": "$item.note",
+                                  "style": "footnote",
+                                  "color": "textSecondary",
+                                  "collapseWhenEmpty": true
+                                }
+                              }
+                            }
+                          ]
+                        }
+                      },
+                      "modifiers": {
+                        "background": {
+                          "token": "surfaceElevated"
+                        },
+                        "border": {
+                          "width": 1,
+                          "color": {
+                            "token": "border"
                           }
+                        },
+                        "cornerRadius": 8,
+                        "padding": {
+                          "leading": 14,
+                          "trailing": 14,
+                          "top": 12,
+                          "bottom": 12
                         }
                       }
                     }
@@ -7239,24 +7454,28 @@ const SCREENS = runtimeSetting({
                 }
               },
               "modifiers": {
-                "background": {
-                  "token": "surfaceElevated"
-                },
-                "border": {
-                  "width": 1,
-                  "color": {
-                    "token": "border"
-                  }
-                },
-                "cornerRadius": 16,
+                "hiddenPath": "$service:himiBrandedNotifSettings.noTopics"
+              }
+            },
+            {
+              "id": "",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "$service:himiBrandedNotifSettings.emptyText",
+                  "style": "body",
+                  "color": "textSecondary",
+                  "collapseWhenEmpty": true
+                }
+              },
+              "modifiers": {
                 "padding": {
-                  "leading": 16,
-                  "trailing": 16,
-                  "top": 20,
-                  "bottom": 20
-                },
-                "fillMaxWidth": true,
-                "hiddenPath": "$service:spacesViewProfile.noSignIn"
+                  "leading": 8,
+                  "trailing": 8,
+                  "top": 8,
+                  "bottom": 0
+                }
               }
             }
           ]
@@ -7273,12 +7492,12 @@ const SCREENS = runtimeSetting({
           "bottom": 28
         },
         "onAppear": {
-          "actionId": "tier5.spacesViewProfile.load"
+          "actionId": "tier5.himiBrandedNotifSettings.load"
         }
       }
     },
     "logicBundle": {
-      "url": "http://localhost:8190/v1/bundles/wix-spaces-view-profile?integrity=",
+      "url": "http://localhost:8190/v1/bundles/himi-branded-lite-notifsettings?integrity=",
       "integrity": "",
       "contentType": "application/javascript+ts-bundle",
       "declaredCapabilities": [
@@ -7288,8 +7507,8 @@ const SCREENS = runtimeSetting({
       "bundleVersion": "0.0.1"
     }
   },
-  "himi_delete_account": {
-    "screenId": "himi_delete_account",
+  "himi_view_profile": {
+    "screenId": "himi_view_profile",
     "renderer": "sdui_intent",
     "title": "",
     "schemaVersion": 1,
@@ -7298,64 +7517,307 @@ const SCREENS = runtimeSetting({
       "staleWhileRevalidate": 0
     },
     "payload": {
-      "id": "himi_delete_account.root",
+      "id": "himi_view_profile.root",
       "body": {
         "package": "himalaya",
         "type": "VStack",
         "props": {
-          "spacing": 16,
-          "alignment": "leading",
+          "spacing": 8,
+          "alignment": "center",
           "children": [
+            {
+              "id": "himi_view_profile.loading",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "Loading…",
+                  "style": "body",
+                  "color": "textSecondary"
+                }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:spacesViewProfile.hideLoading"
+              }
+            },
             {
               "id": "",
               "body": {
                 "package": "himalaya",
-                "type": "HStack",
+                "type": "VStack",
                 "props": {
-                  "spacing": 10,
+                  "spacing": 8,
+                  "alignment": "center",
                   "children": [
                     {
-                      "id": "",
+                      "id": "himi_view_profile.avatar",
                       "body": {
                         "package": "himalaya",
-                        "type": "Icon",
+                        "type": "ZStack",
                         "props": {
-                          "name": "trash",
-                          "size": 24,
-                          "tint": "danger"
+                          "alignment": "center",
+                          "children": [
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Icon",
+                                "props": {
+                                  "name": "photo",
+                                  "size": 28,
+                                  "tint": "accentPrimary"
+                                }
+                              },
+                              "modifiers": {
+                                "accessibilityRole": "decorative"
+                              }
+                            }
+                          ]
                         }
                       },
                       "modifiers": {
-                        "accessibilityRole": "decorative"
+                        "width": 96,
+                        "height": 96,
+                        "background": {
+                          "token": "accentSurface"
+                        },
+                        "cornerRadius": 16
                       }
                     },
                     {
-                      "id": "himi_delete_account.title",
+                      "id": "himi_view_profile.name",
                       "body": {
                         "package": "himalaya",
                         "type": "Text",
                         "props": {
-                          "text": "$service:spacesDeleteAccount.title",
+                          "text": "$service:spacesViewProfile.name",
                           "style": "title1"
                         }
                       }
-                    }
-                  ]
-                }
-              }
-            },
-            {
-              "id": "",
-              "body": {
-                "package": "himalaya",
-                "type": "Text",
-                "props": {
-                  "text": "$service:spacesDeleteAccount.body",
-                  "style": "body",
-                  "color": "textSecondary"
-                }
-              }
-            },
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:spacesViewProfile.handle",
+                          "style": "footnote",
+                          "color": "textSecondary",
+                          "collapseWhenEmpty": true
+                        }
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:spacesViewProfile.about",
+                          "style": "body",
+                          "collapseWhenEmpty": true
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:spacesViewProfile.profileHidden"
+              }
+            },
+            {
+              "id": "himi_view_profile.member_gate",
+              "body": {
+                "package": "himalaya",
+                "type": "VStack",
+                "props": {
+                  "spacing": 10,
+                  "alignment": "center",
+                  "children": [
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Icon",
+                        "props": {
+                          "name": "person",
+                          "size": 28,
+                          "tint": "accentPrimary"
+                        }
+                      },
+                      "modifiers": {
+                        "accessibilityRole": "decorative"
+                      }
+                    },
+                    {
+                      "id": "himi_view_profile.member_gate_title",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "Sign in to view your profile",
+                          "style": "bodyEmphasis"
+                        }
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "Your public profile appears here after you sign in.",
+                          "style": "footnote",
+                          "color": "textSecondary"
+                        }
+                      }
+                    },
+                    {
+                      "id": "himi_view_profile.member_gate_signin",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Sign in",
+                          "style": "primary",
+                          "fullWidth": true,
+                          "action": {
+                            "actionId": "himi.open",
+                            "params": {
+                              "screenId": "himi_sign_in",
+                              "mode": "signin",
+                              "intent": "profile",
+                              "returnScreenId": "himi_view_profile",
+                              "modal": "1"
+                            },
+                            "presentation": "sheet"
+                          }
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              "modifiers": {
+                "background": {
+                  "token": "surfaceElevated"
+                },
+                "border": {
+                  "width": 1,
+                  "color": {
+                    "token": "border"
+                  }
+                },
+                "cornerRadius": 16,
+                "padding": {
+                  "leading": 16,
+                  "trailing": 16,
+                  "top": 20,
+                  "bottom": 20
+                },
+                "fillMaxWidth": true,
+                "hiddenPath": "$service:spacesViewProfile.noSignIn"
+              }
+            }
+          ]
+        }
+      },
+      "modifiers": {
+        "background": {
+          "token": "surfacePrimary"
+        },
+        "padding": {
+          "leading": 16,
+          "trailing": 16,
+          "top": 18,
+          "bottom": 28
+        },
+        "onAppear": {
+          "actionId": "tier5.spacesViewProfile.load"
+        }
+      }
+    },
+    "logicBundle": {
+      "url": "http://localhost:8190/v1/bundles/wix-spaces-view-profile?integrity=",
+      "integrity": "",
+      "contentType": "application/javascript+ts-bundle",
+      "declaredCapabilities": [
+        "wix_api"
+      ],
+      "minBinaryVersion": "0.1.0",
+      "bundleVersion": "0.0.1"
+    }
+  },
+  "himi_delete_account": {
+    "screenId": "himi_delete_account",
+    "renderer": "sdui_intent",
+    "title": "",
+    "schemaVersion": 1,
+    "cacheControl": {
+      "maxAge": 0,
+      "staleWhileRevalidate": 0
+    },
+    "payload": {
+      "id": "himi_delete_account.root",
+      "body": {
+        "package": "himalaya",
+        "type": "VStack",
+        "props": {
+          "spacing": 16,
+          "alignment": "leading",
+          "children": [
+            {
+              "id": "",
+              "body": {
+                "package": "himalaya",
+                "type": "HStack",
+                "props": {
+                  "spacing": 10,
+                  "children": [
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Icon",
+                        "props": {
+                          "name": "trash",
+                          "size": 24,
+                          "tint": "danger"
+                        }
+                      },
+                      "modifiers": {
+                        "accessibilityRole": "decorative"
+                      }
+                    },
+                    {
+                      "id": "himi_delete_account.title",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:spacesDeleteAccount.title",
+                          "style": "title1"
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              "id": "",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "$service:spacesDeleteAccount.body",
+                  "style": "body",
+                  "color": "textSecondary"
+                }
+              }
+            },
             {
               "id": "himi_delete_account.message",
               "body": {
@@ -8843,149 +9305,40 @@ const SCREENS = runtimeSetting({
           "alignment": "leading",
           "children": [
             {
-              "id": "",
+              "id": "himi_services.offline",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "Showing saved services. They may be out of date.",
+                  "style": "caption",
+                  "color": "textSecondary"
+                }
+              },
+              "modifiers": {
+                "padding": {
+                  "leading": 20,
+                  "trailing": 20,
+                  "top": 12,
+                  "bottom": 0
+                },
+                "hiddenPath": "$service:himiBookingServices.collection.noOffline"
+              }
+            },
+            {
+              "id": "himi_services.retry_group",
               "body": {
                 "package": "himalaya",
                 "type": "VStack",
                 "props": {
-                  "spacing": 4,
+                  "spacing": 0,
                   "alignment": "leading",
                   "children": [
                     {
-                      "id": "himi_services.title",
+                      "id": "himi_services.retry.block",
                       "body": {
                         "package": "himalaya",
-                        "type": "Text",
-                        "props": {
-                          "text": "Services",
-                          "style": "title1"
-                        }
-                      }
-                    },
-                    {
-                      "id": "himi_services.subtitle",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "Text",
-                        "props": {
-                          "text": "Find a class and reserve your spot.",
-                          "style": "body",
-                          "color": "textSecondary"
-                        }
-                      }
-                    }
-                  ]
-                }
-              },
-              "modifiers": {
-                "padding": {
-                  "leading": 20,
-                  "trailing": 20,
-                  "top": 0,
-                  "bottom": 0
-                }
-              }
-            },
-            {
-              "id": "",
-              "body": {
-                "package": "himalaya",
-                "type": "VStack",
-                "props": {
-                  "spacing": 0,
-                  "alignment": "leading",
-                  "children": [
-                    {
-                      "id": "himi_services.search",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "SearchField",
-                        "props": {
-                          "placeholder": "Search services",
-                          "value": "$service:himiBookingServices.collection.query",
-                          "debounceMs": 200,
-                          "onChange": {
-                            "actionId": "tier5.himiBookingServices.search"
-                          }
-                        }
-                      }
-                    }
-                  ]
-                }
-              },
-              "modifiers": {
-                "padding": {
-                  "leading": 20,
-                  "trailing": 20,
-                  "top": 16,
-                  "bottom": 0
-                },
-                "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"
-                  }
-                }
-              },
-              "modifiers": {
-                "accessibilityLabel": "$service:himiBookingServices.categoriesLabel",
-                "padding": {
-                  "leading": 20,
-                  "trailing": 20,
-                  "top": 12,
-                  "bottom": 0
-                },
-                "hiddenPath": "$service:himiBookingServices.hideCategories"
-              }
-            },
-            {
-              "id": "himi_services.offline",
-              "body": {
-                "package": "himalaya",
-                "type": "Text",
-                "props": {
-                  "text": "Showing saved services. They may be out of date.",
-                  "style": "caption",
-                  "color": "textSecondary"
-                }
-              },
-              "modifiers": {
-                "padding": {
-                  "leading": 20,
-                  "trailing": 20,
-                  "top": 12,
-                  "bottom": 0
-                },
-                "hiddenPath": "$service:himiBookingServices.collection.noOffline"
-              }
-            },
-            {
-              "id": "himi_services.retry_group",
-              "body": {
-                "package": "himalaya",
-                "type": "VStack",
-                "props": {
-                  "spacing": 0,
-                  "alignment": "leading",
-                  "children": [
-                    {
-                      "id": "himi_services.retry.block",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "VStack",
+                        "type": "VStack",
                         "props": {
                           "spacing": 12,
                           "alignment": "leading",
@@ -9103,6 +9456,48 @@ const SCREENS = runtimeSetting({
                   "spacing": 0,
                   "alignment": "leading",
                   "children": [
+                    {
+                      "id": "himi_services.skeleton_title",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "VStack",
+                        "props": {
+                          "spacing": 0,
+                          "alignment": "leading",
+                          "children": [
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Skeleton",
+                                "props": {
+                                  "width": 120,
+                                  "height": 20,
+                                  "cornerRadius": 4
+                                }
+                              },
+                              "modifiers": {
+                                "width": 120,
+                                "height": 20,
+                                "background": {
+                                  "token": "surfaceSecondary"
+                                },
+                                "cornerRadius": 4,
+                                "accessibilityRole": "decorative"
+                              }
+                            }
+                          ]
+                        }
+                      },
+                      "modifiers": {
+                        "padding": {
+                          "leading": 20,
+                          "trailing": 20,
+                          "top": 20,
+                          "bottom": 4
+                        }
+                      }
+                    },
                     {
                       "id": "himi_services.skeleton_1",
                       "body": {
@@ -9814,7 +10209,7 @@ const SCREENS = runtimeSetting({
                 "padding": {
                   "leading": 0,
                   "trailing": 0,
-                  "top": 12,
+                  "top": 0,
                   "bottom": 0
                 },
                 "hiddenPath": "$service:himiBookingServices.collection.noLoading"
@@ -9827,7 +10222,7 @@ const SCREENS = runtimeSetting({
                 "type": "LazyList",
                 "props": {
                   "spacing": 0,
-                  "itemsPath": "$service:himiBookingServices.collection.items",
+                  "itemsPath": "$service:himiBookingServices.listRows",
                   "onPullToRefresh": {
                     "actionId": "tier5.himiBookingServices.refresh"
                   },
@@ -9836,13 +10231,17 @@ const SCREENS = runtimeSetting({
                     "onLoadMore": {
                       "actionId": "tier5.himiBookingServices.loadMore"
                     },
-                    "pageSize": 50
+                    "pageSize": 100
                   },
                   "staggerMs": 30,
                   "animateItems": true,
+                  "scrollToItemPath": "$service:himiBookingServices.scrollTo",
+                  "onTopItemChange": {
+                    "actionId": "tier5.himiBookingServices.topItemChanged"
+                  },
                   "items": [
                     {
-                      "id": "himi_services.row.$item.id",
+                      "id": "himi_services.item.$item.id",
                       "body": {
                         "package": "himalaya",
                         "type": "VStack",
@@ -9851,47 +10250,75 @@ const SCREENS = runtimeSetting({
                           "alignment": "leading",
                           "children": [
                             {
-                              "id": "",
+                              "id": "himi_services.section.$item.id",
                               "body": {
                                 "package": "himalaya",
                                 "type": "HStack",
                                 "props": {
-                                  "spacing": 14,
+                                  "spacing": 0,
                                   "alignment": "center",
                                   "children": [
                                     {
-                                      "id": "himi_services.row.$item.id/image",
+                                      "id": "",
                                       "body": {
                                         "package": "himalaya",
-                                        "type": "Image",
+                                        "type": "Text",
                                         "props": {
-                                          "url": "$item.image",
-                                          "width": 72,
-                                          "height": 72,
-                                          "contentMode": "fill"
+                                          "text": "$item.sectionTitle",
+                                          "style": "title3",
+                                          "maxLines": 2
                                         }
-                                      },
-                                      "modifiers": {
-                                        "accessibilityRole": "decorative",
-                                        "cornerRadius": 8,
-                                        "hiddenPath": "$item.noImage"
                                       }
                                     },
                                     {
                                       "id": "",
                                       "body": {
                                         "package": "himalaya",
-                                        "type": "ZStack",
+                                        "type": "Spacer",
+                                        "props": {}
+                                      }
+                                    }
+                                  ]
+                                }
+                              },
+                              "modifiers": {
+                                "fillMaxWidth": true,
+                                "padding": {
+                                  "leading": 20,
+                                  "trailing": 20,
+                                  "top": 20,
+                                  "bottom": 4
+                                },
+                                "accessibilityRole": "heading",
+                                "accessibilityLabel": "$item.sectionTitle",
+                                "hiddenPath": "$item.notSection"
+                              }
+                            },
+                            {
+                              "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": 14,
                                           "alignment": "center",
                                           "children": [
                                             {
-                                              "id": "",
+                                              "id": "himi_services.row.$item.id/image",
                                               "body": {
                                                 "package": "himalaya",
                                                 "type": "Image",
                                                 "props": {
-                                                  "url": "",
+                                                  "url": "$item.image",
                                                   "width": 72,
                                                   "height": 72,
                                                   "contentMode": "fill"
@@ -9900,158 +10327,204 @@ const SCREENS = runtimeSetting({
                                               "modifiers": {
                                                 "accessibilityRole": "decorative",
                                                 "cornerRadius": 8,
-                                                "background": {
-                                                  "token": "surfaceSecondary"
-                                                }
+                                                "hiddenPath": "$item.noImage"
                                               }
                                             },
                                             {
                                               "id": "",
                                               "body": {
                                                 "package": "himalaya",
-                                                "type": "Icon",
+                                                "type": "ZStack",
                                                 "props": {
-                                                  "name": "image",
-                                                  "size": 24,
-                                                  "tint": "accentPrimary"
+                                                  "alignment": "center",
+                                                  "children": [
+                                                    {
+                                                      "id": "",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "Image",
+                                                        "props": {
+                                                          "url": "",
+                                                          "width": 72,
+                                                          "height": 72,
+                                                          "contentMode": "fill"
+                                                        }
+                                                      },
+                                                      "modifiers": {
+                                                        "accessibilityRole": "decorative",
+                                                        "cornerRadius": 8,
+                                                        "background": {
+                                                          "token": "surfaceSecondary"
+                                                        }
+                                                      }
+                                                    },
+                                                    {
+                                                      "id": "",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "Icon",
+                                                        "props": {
+                                                          "name": "image",
+                                                          "size": 24,
+                                                          "tint": "accentPrimary"
+                                                        }
+                                                      },
+                                                      "modifiers": {
+                                                        "accessibilityRole": "decorative"
+                                                      }
+                                                    }
+                                                  ]
                                                 }
                                               },
                                               "modifiers": {
-                                                "accessibilityRole": "decorative"
+                                                "width": 72,
+                                                "height": 72,
+                                                "hiddenPath": "$item.hasImage"
                                               }
-                                            }
-                                          ]
-                                        }
-                                      },
-                                      "modifiers": {
-                                        "width": 72,
-                                        "height": 72,
-                                        "hiddenPath": "$item.hasImage"
-                                      }
-                                    },
-                                    {
-                                      "id": "",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "VStack",
-                                        "props": {
-                                          "spacing": 3,
-                                          "alignment": "leading",
-                                          "children": [
+                                            },
                                             {
                                               "id": "",
                                               "body": {
                                                 "package": "himalaya",
-                                                "type": "Text",
+                                                "type": "VStack",
                                                 "props": {
-                                                  "text": "$item.typeTag",
-                                                  "style": "caption",
-                                                  "color": "textSecondary",
-                                                  "maxLines": 1
+                                                  "spacing": 3,
+                                                  "alignment": "leading",
+                                                  "children": [
+                                                    {
+                                                      "id": "",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "Text",
+                                                        "props": {
+                                                          "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.row.$item.id/ended",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "Text",
+                                                        "props": {
+                                                          "text": "$item.endedText",
+                                                          "style": "caption",
+                                                          "color": "textSecondary",
+                                                          "maxLines": 1,
+                                                          "collapseWhenEmpty": true
+                                                        }
+                                                      }
+                                                    },
+                                                    {
+                                                      "id": "",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "Text",
+                                                        "props": {
+                                                          "text": "$item.name",
+                                                          "style": "bodyEmphasis",
+                                                          "maxLines": 2
+                                                        }
+                                                      }
+                                                    },
+                                                    {
+                                                      "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": "$item.meta",
+                                                          "style": "footnote",
+                                                          "color": "textSecondary",
+                                                          "maxLines": 2,
+                                                          "collapseWhenEmpty": true
+                                                        }
+                                                      }
+                                                    }
+                                                  ]
                                                 }
                                               },
                                               "modifiers": {
-                                                "background": {
-                                                  "token": "surfaceTertiary"
-                                                },
-                                                "cornerRadius": 4,
-                                                "padding": {
-                                                  "leading": 8,
-                                                  "trailing": 8,
-                                                  "top": 2,
-                                                  "bottom": 2
-                                                },
-                                                "hiddenPath": "$item.noTypeTag"
-                                              }
-                                            },
-                                            {
-                                              "id": "himi_services.row.$item.id/ended",
-                                              "body": {
-                                                "package": "himalaya",
-                                                "type": "Text",
-                                                "props": {
-                                                  "text": "$item.endedText",
-                                                  "style": "caption",
-                                                  "color": "textSecondary",
-                                                  "maxLines": 1,
-                                                  "collapseWhenEmpty": true
-                                                }
-                                              }
-                                            },
-                                            {
-                                              "id": "",
-                                              "body": {
-                                                "package": "himalaya",
-                                                "type": "Text",
-                                                "props": {
-                                                  "text": "$item.name",
-                                                  "style": "bodyEmphasis",
-                                                  "maxLines": 2
-                                                }
-                                              }
-                                            },
-                                            {
-                                              "id": "",
-                                              "body": {
-                                                "package": "himalaya",
-                                                "type": "Text",
-                                                "props": {
-                                                  "text": "$item.tagline",
-                                                  "style": "caption",
-                                                  "color": "textSecondary",
-                                                  "maxLines": 2,
-                                                  "collapseWhenEmpty": true
-                                                }
+                                                "weight": 1
                                               }
                                             },
                                             {
-                                              "id": "",
-                                              "body": {
-                                                "package": "himalaya",
-                                                "type": "Text",
-                                                "props": {
-                                                  "text": "$item.meta",
-                                                  "style": "footnote",
-                                                  "color": "textSecondary",
-                                                  "maxLines": 2,
-                                                  "collapseWhenEmpty": true
-                                                }
-                                              }
-                                            }
-                                          ]
-                                        }
-                                      },
-                                      "modifiers": {
-                                        "weight": 1
-                                      }
-                                    },
-                                    {
-                                      "id": "himi_services.row.$item.id/book",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "VStack",
-                                        "props": {
-                                          "spacing": 0,
-                                          "children": [
-                                            {
-                                              "id": "",
+                                              "id": "himi_services.row.$item.id/book",
                                               "body": {
                                                 "package": "himalaya",
-                                                "type": "HStack",
+                                                "type": "VStack",
                                                 "props": {
                                                   "spacing": 0,
-                                                  "alignment": "center",
                                                   "children": [
                                                     {
                                                       "id": "",
                                                       "body": {
                                                         "package": "himalaya",
-                                                        "type": "Text",
+                                                        "type": "HStack",
                                                         "props": {
-                                                          "text": "$item.bookCta",
-                                                          "style": "footnote",
-                                                          "color": "textPrimary",
-                                                          "maxLines": 1
+                                                          "spacing": 0,
+                                                          "alignment": "center",
+                                                          "children": [
+                                                            {
+                                                              "id": "",
+                                                              "body": {
+                                                                "package": "himalaya",
+                                                                "type": "Text",
+                                                                "props": {
+                                                                  "text": "$item.bookCta",
+                                                                  "style": "footnote",
+                                                                  "color": "textPrimary",
+                                                                  "maxLines": 1
+                                                                }
+                                                              }
+                                                            }
+                                                          ]
+                                                        }
+                                                      },
+                                                      "modifiers": {
+                                                        "height": 36,
+                                                        "padding": {
+                                                          "leading": 16,
+                                                          "trailing": 16,
+                                                          "top": 0,
+                                                          "bottom": 0
+                                                        },
+                                                        "cornerRadius": 18,
+                                                        "border": {
+                                                          "width": 1,
+                                                          "color": {
+                                                            "token": "textPrimary"
+                                                          }
                                                         }
                                                       }
                                                     }
@@ -10059,81 +10532,69 @@ const SCREENS = runtimeSetting({
                                                 }
                                               },
                                               "modifiers": {
-                                                "height": 36,
                                                 "padding": {
-                                                  "leading": 16,
-                                                  "trailing": 16,
-                                                  "top": 0,
-                                                  "bottom": 0
+                                                  "leading": 0,
+                                                  "trailing": 0,
+                                                  "top": 4,
+                                                  "bottom": 4
                                                 },
-                                                "cornerRadius": 18,
-                                                "border": {
-                                                  "width": 1,
-                                                  "color": {
-                                                    "token": "textPrimary"
+                                                "onTap": {
+                                                  "actionId": "himi.open",
+                                                  "params": {
+                                                    "screenId": "himi_time",
+                                                    "id": "$item.id"
                                                   }
-                                                }
+                                                },
+                                                "accessibilityRole": "button",
+                                                "accessibilityLabel": "$item.bookA11y",
+                                                "pressFeedback": "scale",
+                                                "haptic": "light",
+                                                "hiddenPath": "$item.noBook"
                                               }
                                             }
                                           ]
                                         }
                                       },
                                       "modifiers": {
+                                        "fillMaxWidth": true,
                                         "padding": {
-                                          "leading": 0,
-                                          "trailing": 0,
-                                          "top": 4,
-                                          "bottom": 4
-                                        },
-                                        "onTap": {
-                                          "actionId": "himi.open",
-                                          "params": {
-                                            "screenId": "himi_time",
-                                            "id": "$item.id"
-                                          }
-                                        },
-                                        "accessibilityRole": "button",
-                                        "accessibilityLabel": "$item.bookA11y",
-                                        "pressFeedback": "scale",
-                                        "haptic": "light",
-                                        "hiddenPath": "$item.noBook"
+                                          "leading": 20,
+                                          "trailing": 20,
+                                          "top": 14,
+                                          "bottom": 14
+                                        }
+                                      }
+                                    },
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Divider",
+                                        "props": {}
                                       }
                                     }
                                   ]
                                 }
                               },
                               "modifiers": {
-                                "fillMaxWidth": true,
-                                "padding": {
-                                  "leading": 20,
-                                  "trailing": 20,
-                                  "top": 14,
-                                  "bottom": 14
-                                }
-                              }
-                            },
-                            {
-                              "id": "",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "Divider",
-                                "props": {}
+                                "onTap": {
+                                  "actionId": "himi.open",
+                                  "params": {
+                                    "screenId": "$item.detailScreenId",
+                                    "id": "$item.id"
+                                  }
+                                },
+                                "pressFeedback": "highlight",
+                                "haptic": "light",
+                                "accessibilityLabel": "$item.a11y",
+                                "hiddenPath": "$item.isSection"
                               }
                             }
                           ]
                         }
                       },
                       "modifiers": {
-                        "onTap": {
-                          "actionId": "himi.open",
-                          "params": {
-                            "screenId": "$item.detailScreenId",
-                            "id": "$item.id"
-                          }
-                        },
-                        "pressFeedback": "highlight",
-                        "haptic": "light",
-                        "accessibilityLabel": "$item.a11y",
+                        "fillMaxWidth": true,
                         "transition": {
                           "enter": "fadeSlide",
                           "direction": "up",
@@ -10146,12 +10607,483 @@ const SCREENS = runtimeSetting({
               },
               "modifiers": {
                 "padding": {
-                  "leading": 0,
-                  "trailing": 0,
-                  "top": 12,
+                  "leading": 0,
+                  "trailing": 0,
+                  "top": 0,
+                  "bottom": 0
+                },
+                "hiddenPath": "$service:himiBookingServices.hideRows"
+              }
+            },
+            {
+              "id": "",
+              "body": {
+                "package": "himalaya",
+                "type": "VStack",
+                "props": {
+                  "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": [
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Icon",
+                        "props": {
+                          "name": "calendar",
+                          "size": 28,
+                          "tint": "textTertiary"
+                        }
+                      },
+                      "modifiers": {
+                        "accessibilityRole": "decorative"
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:himiBookingServices.collection.emptySourceText",
+                          "style": "body",
+                          "color": "textSecondary",
+                          "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"
+                        }
+                      }
+                    },
+                    {
+                      "id": "himi_services.empty.cta",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Clear Search",
+                          "style": "secondary",
+                          "action": {
+                            "actionId": "tier5.himiBookingServices.search",
+                            "params": {
+                              "value": ""
+                            }
+                          }
+                        }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiBookingServices.noQuery"
+                      }
+                    }
+                  ]
+                }
+              },
+              "modifiers": {
+                "fillMaxWidth": true,
+                "padding": {
+                  "leading": 20,
+                  "trailing": 20,
+                  "top": 40,
+                  "bottom": 0
+                },
+                "transition": {
+                  "enter": "fade",
+                  "exit": "fade"
+                },
+                "hiddenPath": "$service:himiBookingServices.collection.noEmpty"
+              }
+            },
+            {
+              "id": "himi_services.location_empty",
+              "body": {
+                "package": "himalaya",
+                "type": "VStack",
+                "props": {
+                  "spacing": 16,
+                  "alignment": "center",
+                  "children": [
+                    {
+                      "id": "himi_services.location_empty_text",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:himiBookingServices.locationEmptyText",
+                          "style": "body",
+                          "color": "textSecondary",
+                          "textAlign": "center"
+                        }
+                      }
+                    },
+                    {
+                      "id": "himi_services.all_locations",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Show all locations",
+                          "style": "secondary",
+                          "action": {
+                            "actionId": "tier5.himiBookingServices.selectLocation",
+                            "params": {
+                              "locationId": ""
+                            }
+                          }
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              "modifiers": {
+                "fillMaxWidth": true,
+                "padding": {
+                  "leading": 20,
+                  "trailing": 20,
+                  "top": 40,
+                  "bottom": 0
+                },
+                "transition": {
+                  "enter": "fade",
+                  "exit": "fade"
+                },
+                "hiddenPath": "$service:himiBookingServices.notLocationEmpty"
+              }
+            },
+            {
+              "id": "himi_services.location_sheet",
+              "body": {
+                "package": "himalaya",
+                "type": "BottomSheet",
+                "props": {
+                  "presentedPath": "$service:himiBookingServices.locationSheetOpen",
+                  "dismissible": true,
+                  "showGrabber": true,
+                  "onDismiss": {
+                    "actionId": "tier5.himiBookingServices.closeLocations"
+                  },
+                  "content": {
+                    "id": "",
+                    "body": {
+                      "package": "himalaya",
+                      "type": "VStack",
+                      "props": {
+                        "spacing": 8,
+                        "alignment": "leading",
+                        "children": [
+                          {
+                            "id": "",
+                            "body": {
+                              "package": "himalaya",
+                              "type": "Text",
+                              "props": {
+                                "text": "Choose a location",
+                                "style": "title3"
+                              }
+                            }
+                          },
+                          {
+                            "id": "himi_services.location_options",
+                            "body": {
+                              "package": "himalaya",
+                              "type": "Grid",
+                              "props": {
+                                "columns": 1,
+                                "spacing": 0,
+                                "itemsPath": "$service:himiBookingServices.locationOptions",
+                                "items": [
+                                  {
+                                    "id": "",
+                                    "body": {
+                                      "package": "himalaya",
+                                      "type": "VStack",
+                                      "props": {
+                                        "spacing": 0,
+                                        "children": [
+                                          {
+                                            "id": "",
+                                            "body": {
+                                              "package": "himalaya",
+                                              "type": "HStack",
+                                              "props": {
+                                                "spacing": 12,
+                                                "alignment": "center",
+                                                "children": [
+                                                  {
+                                                    "id": "",
+                                                    "body": {
+                                                      "package": "himalaya",
+                                                      "type": "VStack",
+                                                      "props": {
+                                                        "spacing": 2,
+                                                        "alignment": "leading",
+                                                        "children": [
+                                                          {
+                                                            "id": "",
+                                                            "body": {
+                                                              "package": "himalaya",
+                                                              "type": "Text",
+                                                              "props": {
+                                                                "text": "$item.label",
+                                                                "style": "body",
+                                                                "maxLines": 2
+                                                              }
+                                                            }
+                                                          },
+                                                          {
+                                                            "id": "",
+                                                            "body": {
+                                                              "package": "himalaya",
+                                                              "type": "Text",
+                                                              "props": {
+                                                                "text": "$item.sub",
+                                                                "style": "caption",
+                                                                "color": "textSecondary",
+                                                                "maxLines": 2
+                                                              }
+                                                            },
+                                                            "modifiers": {
+                                                              "hiddenPath": "$item.noSub"
+                                                            }
+                                                          }
+                                                        ]
+                                                      }
+                                                    }
+                                                  },
+                                                  {
+                                                    "id": "",
+                                                    "body": {
+                                                      "package": "himalaya",
+                                                      "type": "Spacer",
+                                                      "props": {}
+                                                    }
+                                                  },
+                                                  {
+                                                    "id": "",
+                                                    "body": {
+                                                      "package": "himalaya",
+                                                      "type": "Icon",
+                                                      "props": {
+                                                        "name": "check",
+                                                        "size": 20,
+                                                        "tint": "accentPrimary"
+                                                      }
+                                                    },
+                                                    "modifiers": {
+                                                      "accessibilityRole": "decorative",
+                                                      "hiddenPath": "$item.notSelected"
+                                                    }
+                                                  }
+                                                ]
+                                              }
+                                            },
+                                            "modifiers": {
+                                              "fillMaxWidth": true,
+                                              "padding": {
+                                                "top": 15,
+                                                "bottom": 15
+                                              }
+                                            }
+                                          },
+                                          {
+                                            "id": "",
+                                            "body": {
+                                              "package": "himalaya",
+                                              "type": "Divider",
+                                              "props": {}
+                                            }
+                                          }
+                                        ]
+                                      }
+                                    },
+                                    "modifiers": {
+                                      "fillMaxWidth": true,
+                                      "onTap": {
+                                        "actionId": "tier5.himiBookingServices.selectLocation",
+                                        "params": {
+                                          "locationId": "$item.id"
+                                        }
+                                      },
+                                      "pressFeedback": "highlight",
+                                      "accessibilityRole": "button",
+                                      "accessibilityLabel": "$item.a11y"
+                                    }
+                                  }
+                                ]
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    "modifiers": {
+                      "padding": {
+                        "leading": 20,
+                        "trailing": 20,
+                        "top": 8,
+                        "bottom": 24
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ]
+        }
+      },
+      "modifiers": {
+        "background": {
+          "token": "surfacePrimary"
+        },
+        "padding": {
+          "leading": 0,
+          "trailing": 0,
+          "bottom": 24
+        },
+        "onAppear": {
+          "actionId": "tier5.himiBookingServices.load",
+          "params": {
+            "copy": "{\"services.subtitle\":\"Find a class and reserve your spot.\"}"
+          }
+        }
+      }
+    },
+    "logicBundle": {
+      "url": "http://localhost:8190/v1/bundles/himi-booking-services",
+      "integrity": "",
+      "contentType": "application/javascript+ts-bundle",
+      "declaredCapabilities": [
+        "wix_api",
+        "local_database",
+        "app_info"
+      ],
+      "minBinaryVersion": "0.1.0",
+      "bundleVersion": "0.0.1"
+    },
+    "stickyHeader": {
+      "id": "himi_services.header",
+      "body": {
+        "package": "himalaya",
+        "type": "VStack",
+        "props": {
+          "spacing": 0,
+          "alignment": "leading",
+          "children": [
+            {
+              "id": "",
+              "body": {
+                "package": "himalaya",
+                "type": "VStack",
+                "props": {
+                  "spacing": 4,
+                  "alignment": "leading",
+                  "children": [
+                    {
+                      "id": "himi_services.title",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "Services",
+                          "style": "title1"
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              "modifiers": {
+                "padding": {
+                  "leading": 20,
+                  "trailing": 20,
+                  "top": 0,
                   "bottom": 0
-                },
-                "hiddenPath": "$service:himiBookingServices.hideRows"
+                }
               }
             },
             {
@@ -10160,31 +11092,20 @@ const SCREENS = runtimeSetting({
                 "package": "himalaya",
                 "type": "VStack",
                 "props": {
-                  "spacing": 8,
+                  "spacing": 0,
                   "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",
+                      "id": "himi_services.search",
                       "body": {
                         "package": "himalaya",
-                        "type": "Button",
+                        "type": "SearchField",
                         "props": {
-                          "title": "Try again",
-                          "style": "secondary",
-                          "action": {
-                            "actionId": "tier5.himiBookingServices.retry"
+                          "placeholder": "Search services",
+                          "value": "$service:himiBookingServices.collection.query",
+                          "debounceMs": 200,
+                          "onChange": {
+                            "actionId": "tier5.himiBookingServices.search"
                           }
                         }
                       }
@@ -10196,147 +11117,64 @@ const SCREENS = runtimeSetting({
                 "padding": {
                   "leading": 20,
                   "trailing": 20,
-                  "top": 12,
+                  "top": 16,
                   "bottom": 0
                 },
-                "hiddenPath": "$service:himiBookingServices.collection.noPageError"
+                "hiddenPath": "$service:himiBookingServices.collection.hideChrome"
               }
             },
             {
-              "id": "himi_services.empty_source",
+              "id": "himi_services.categories",
               "body": {
                 "package": "himalaya",
-                "type": "VStack",
+                "type": "FilterChips",
                 "props": {
-                  "spacing": 10,
-                  "alignment": "center",
-                  "children": [
-                    {
-                      "id": "",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "Icon",
-                        "props": {
-                          "name": "calendar",
-                          "size": 28,
-                          "tint": "textTertiary"
-                        }
-                      },
-                      "modifiers": {
-                        "accessibilityRole": "decorative"
-                      }
-                    },
-                    {
-                      "id": "",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "Text",
-                        "props": {
-                          "text": "$service:himiBookingServices.collection.emptySourceText",
-                          "style": "body",
-                          "color": "textSecondary",
-                          "textAlign": "center"
-                        }
-                      }
-                    }
-                  ]
+                  "chips": [],
+                  "optionsPath": "$service:himiBookingServices.categoryChips",
+                  "selectedIds": [
+                    "$service:himiBookingServices.activeCategory"
+                  ],
+                  "multiSelect": false,
+                  "onChange": {
+                    "actionId": "tier5.himiBookingServices.scrollToCategory"
+                  }
                 }
               },
               "modifiers": {
-                "fillMaxWidth": true,
+                "accessibilityLabel": "$service:himiBookingServices.categoriesLabel",
                 "padding": {
                   "leading": 20,
                   "trailing": 20,
-                  "top": 40,
+                  "top": 12,
                   "bottom": 0
                 },
-                "transition": {
-                  "enter": "fade",
-                  "exit": "fade"
-                },
-                "hiddenPath": "$service:himiBookingServices.collection.noEmptySource"
+                "hiddenPath": "$service:himiBookingServices.hideCategories"
               }
             },
             {
-              "id": "himi_services.empty",
+              "id": "",
               "body": {
                 "package": "himalaya",
                 "type": "VStack",
                 "props": {
-                  "spacing": 16,
-                  "alignment": "center",
+                  "spacing": 0,
                   "children": [
                     {
-                      "id": "himi_services.no_match_text",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "Text",
-                        "props": {
-                          "text": "$service:himiBookingServices.noMatchText",
-                          "style": "body",
-                          "color": "textSecondary",
-                          "textAlign": "center"
-                        }
-                      }
-                    },
-                    {
-                      "id": "himi_services.empty.cta",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "Button",
-                        "props": {
-                          "title": "Clear Search",
-                          "style": "secondary",
-                          "action": {
-                            "actionId": "tier5.himiBookingServices.search",
-                            "params": {
-                              "value": ""
-                            }
-                          }
-                        }
-                      },
-                      "modifiers": {
-                        "hiddenPath": "$service:himiBookingServices.noQuery"
-                      }
-                    },
-                    {
-                      "id": "himi_services.empty.show_all",
+                      "id": "",
                       "body": {
                         "package": "himalaya",
-                        "type": "Button",
-                        "props": {
-                          "title": "Show All",
-                          "style": "secondary",
-                          "action": {
-                            "actionId": "tier5.himiBookingServices.collectionFilter",
-                            "args": {
-                              "selectedIds": [
-                                "all"
-                              ]
-                            }
-                          }
-                        }
-                      },
-                      "modifiers": {
-                        "hiddenPath": "$service:himiBookingServices.hasQuery"
+                        "type": "Divider",
+                        "props": {}
                       }
                     }
                   ]
                 }
               },
               "modifiers": {
-                "fillMaxWidth": true,
                 "padding": {
-                  "leading": 20,
-                  "trailing": 20,
-                  "top": 40,
-                  "bottom": 0
-                },
-                "transition": {
-                  "enter": "fade",
-                  "exit": "fade"
+                  "top": 12
                 },
-                "hiddenPath": "$service:himiBookingServices.collection.noEmpty"
+                "fillMaxWidth": true
               }
             }
           ]
@@ -10347,46 +11185,25 @@ const SCREENS = runtimeSetting({
           "token": "surfacePrimary"
         },
         "padding": {
-          "leading": 0,
-          "trailing": 0,
-          "top": 18,
-          "bottom": 24
+          "top": 18
         },
-        "onAppear": {
-          "actionId": "tier5.himiBookingServices.load",
-          "params": {
-            "copy": "{\"services.subtitle\":\"Find a class and reserve your spot.\"}"
-          }
-        }
+        "fillMaxWidth": true
       }
     },
-    "logicBundle": {
-      "url": "http://localhost:8190/v1/bundles/himi-booking-services",
-      "integrity": "",
-      "contentType": "application/javascript+ts-bundle",
-      "declaredCapabilities": [
-        "wix_api",
-        "local_database"
-      ],
-      "minBinaryVersion": "0.1.0",
-      "bundleVersion": "0.0.1"
-    },
     "topBar": {
       "actions": [
         {
-          "id": "bookings",
-          "icon": "calendar",
-          "accessibilityLabel": "My Bookings",
+          "id": "location",
+          "icon": "location",
+          "accessibilityLabel": "Choose a location",
           "onTap": {
-            "actionId": "himi.open",
-            "params": {
-              "screenId": "himi_bookings"
-            }
-          }
+            "actionId": "tier5.himiBookingServices.openLocations"
+          },
+          "hiddenPath": "$service:brandedLiteNav.noLocationMenu"
         },
         {
           "id": "agenda",
-          "icon": "list",
+          "icon": "calendar",
           "accessibilityLabel": "Agenda",
           "onTap": {
             "actionId": "himi.open",
@@ -10513,29 +11330,45 @@ const SCREENS = runtimeSetting({
               }
             },
             {
-              "id": "himi_bookings.tabs",
+              "id": "",
               "body": {
                 "package": "himalaya",
-                "type": "SegmentedControl",
+                "type": "VStack",
                 "props": {
-                  "options": [
-                    {
-                      "id": "upcoming",
-                      "label": "Upcoming"
-                    },
-                    {
-                      "id": "past",
-                      "label": "Past"
-                    },
+                  "spacing": 0,
+                  "alignment": "leading",
+                  "children": [
                     {
-                      "id": "cancelled",
-                      "label": "Canceled"
+                      "id": "himi_bookings.tabs",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "SegmentedControl",
+                        "props": {
+                          "options": [
+                            {
+                              "id": "upcoming",
+                              "label": "Upcoming"
+                            },
+                            {
+                              "id": "past",
+                              "label": "Past"
+                            },
+                            {
+                              "id": "cancelled",
+                              "label": "Canceled"
+                            }
+                          ],
+                          "selectedId": "$service:himiBookingBookings.tab",
+                          "onChange": {
+                            "actionId": "tier5.himiBookingBookings.selectTab"
+                          }
+                        }
+                      },
+                      "modifiers": {
+                        "fillMaxWidth": true
+                      }
                     }
-                  ],
-                  "selectedId": "$service:himiBookingBookings.tab",
-                  "onChange": {
-                    "actionId": "tier5.himiBookingBookings.selectTab"
-                  }
+                  ]
                 }
               },
               "modifiers": {
@@ -12807,8 +13640,8 @@ const SCREENS = runtimeSetting({
                               },
                               "modifiers": {
                                 "padding": {
-                                  "leading": 20,
-                                  "trailing": 20,
+                                  "leading": 16,
+                                  "trailing": 16,
                                   "top": 14,
                                   "bottom": 14
                                 },
@@ -12914,8 +13747,8 @@ const SCREENS = runtimeSetting({
                               },
                               "modifiers": {
                                 "padding": {
-                                  "leading": 20,
-                                  "trailing": 20,
+                                  "leading": 16,
+                                  "trailing": 16,
                                   "top": 14,
                                   "bottom": 14
                                 },
@@ -13021,8 +13854,8 @@ const SCREENS = runtimeSetting({
                               },
                               "modifiers": {
                                 "padding": {
-                                  "leading": 20,
-                                  "trailing": 20,
+                                  "leading": 16,
+                                  "trailing": 16,
                                   "top": 14,
                                   "bottom": 14
                                 },
@@ -13293,7 +14126,9 @@ const SCREENS = runtimeSetting({
                                         "actionId": "himi.open",
                                         "params": {
                                           "screenId": "himi_service",
-                                          "id": "$item.serviceId"
+                                          "id": "$item.serviceId",
+                                          "sessionId": "$item.sessionId",
+                                          "start": "$item.start"
                                         }
                                       },
                                       "pressFeedback": "highlight",
@@ -13460,7 +14295,9 @@ const SCREENS = runtimeSetting({
                                                 "actionId": "himi.open",
                                                 "params": {
                                                   "screenId": "himi_service",
-                                                  "id": "$item.serviceId"
+                                                  "id": "$item.serviceId",
+                                                  "sessionId": "$item.sessionId",
+                                                  "start": "$item.start"
                                                 }
                                               },
                                               "accessibilityRole": "button",
@@ -13649,6 +14486,8 @@ const SCREENS = runtimeSetting({
                             },
                             "modifiers": {
                               "padding": {
+                                "leading": 16,
+                                "trailing": 16,
                                 "top": 14,
                                 "bottom": 14
                               },
@@ -13661,20 +14500,22 @@ const SCREENS = runtimeSetting({
                               "package": "himalaya",
                               "type": "Divider",
                               "props": {}
+                            },
+                            "modifiers": {
+                              "hiddenPath": "$item.lastOfDay"
                             }
                           }
                         ]
                       }
                     }
+                  },
+                  "onVisibleDateChange": {
+                    "actionId": "tier5.himiBrandedAgenda.visibleDate"
                   }
                 }
               },
               "modifiers": {
                 "fillMaxWidth": true,
-                "padding": {
-                  "leading": 20,
-                  "trailing": 20
-                },
                 "hiddenPath": "$service:himiBrandedAgenda.listHidden"
               }
             },
@@ -13757,11 +14598,46 @@ const SCREENS = runtimeSetting({
                   "top": 48
                 },
                 "fillMaxWidth": true,
-                "hiddenPath": "$service:himiBrandedAgenda.notNoClasses"
+                "hiddenPath": "$service:himiBrandedAgenda.notNoClasses"
+              }
+            },
+            {
+              "id": "himi_agenda.nothing_ahead",
+              "body": {
+                "package": "himalaya",
+                "type": "VStack",
+                "props": {
+                  "spacing": 22,
+                  "alignment": "center",
+                  "children": [
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "There are no classes for 4 weeks from this day.",
+                          "style": "body",
+                          "color": "textPrimary",
+                          "textAlign": "center"
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              "modifiers": {
+                "padding": {
+                  "leading": 28,
+                  "trailing": 28,
+                  "top": 48
+                },
+                "fillMaxWidth": true,
+                "hiddenPath": "$service:himiBrandedAgenda.notNothingAhead"
               }
             },
             {
-              "id": "himi_agenda.nothing_ahead",
+              "id": "himi_agenda.location_empty",
               "body": {
                 "package": "himalaya",
                 "type": "VStack",
@@ -13775,12 +14651,29 @@ const SCREENS = runtimeSetting({
                         "package": "himalaya",
                         "type": "Text",
                         "props": {
-                          "text": "There are no classes for 4 weeks from this day.",
+                          "text": "No classes at this location in the coming weeks.",
                           "style": "body",
                           "color": "textPrimary",
                           "textAlign": "center"
                         }
                       }
+                    },
+                    {
+                      "id": "himi_agenda.all_locations",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Show all locations",
+                          "style": "secondary",
+                          "action": {
+                            "actionId": "tier5.himiBrandedAgenda.selectLocation",
+                            "params": {
+                              "locationId": ""
+                            }
+                          }
+                        }
+                      }
                     }
                   ]
                 }
@@ -13792,7 +14685,7 @@ const SCREENS = runtimeSetting({
                   "top": 48
                 },
                 "fillMaxWidth": true,
-                "hiddenPath": "$service:himiBrandedAgenda.notNothingAhead"
+                "hiddenPath": "$service:himiBrandedAgenda.notLocationEmpty"
               }
             },
             {
@@ -13899,7 +14792,9 @@ const SCREENS = runtimeSetting({
                                           "nav": {
                                             "screenId": "himi_service",
                                             "args": {
-                                              "id": "$service:himiBrandedAgenda.sheetServiceId"
+                                              "id": "$service:himiBrandedAgenda.sheetServiceId",
+                                              "sessionId": "$service:himiBrandedAgenda.sheetSessionId",
+                                              "start": "$service:himiBrandedAgenda.sheetStart"
                                             }
                                           }
                                         }
@@ -13973,6 +14868,184 @@ const SCREENS = runtimeSetting({
                 }
               }
             },
+            {
+              "id": "himi_agenda.location_sheet",
+              "body": {
+                "package": "himalaya",
+                "type": "BottomSheet",
+                "props": {
+                  "presentedPath": "$service:himiBrandedAgenda.locationSheetOpen",
+                  "dismissible": true,
+                  "showGrabber": true,
+                  "onDismiss": {
+                    "actionId": "tier5.himiBrandedAgenda.closeLocations"
+                  },
+                  "content": {
+                    "id": "",
+                    "body": {
+                      "package": "himalaya",
+                      "type": "VStack",
+                      "props": {
+                        "spacing": 8,
+                        "alignment": "leading",
+                        "children": [
+                          {
+                            "id": "",
+                            "body": {
+                              "package": "himalaya",
+                              "type": "Text",
+                              "props": {
+                                "text": "Choose a location",
+                                "style": "title3"
+                              }
+                            }
+                          },
+                          {
+                            "id": "himi_agenda.location_options",
+                            "body": {
+                              "package": "himalaya",
+                              "type": "Grid",
+                              "props": {
+                                "columns": 1,
+                                "spacing": 0,
+                                "itemsPath": "$service:himiBrandedAgenda.locationOptions",
+                                "items": [
+                                  {
+                                    "id": "",
+                                    "body": {
+                                      "package": "himalaya",
+                                      "type": "VStack",
+                                      "props": {
+                                        "spacing": 0,
+                                        "children": [
+                                          {
+                                            "id": "",
+                                            "body": {
+                                              "package": "himalaya",
+                                              "type": "HStack",
+                                              "props": {
+                                                "spacing": 12,
+                                                "alignment": "center",
+                                                "children": [
+                                                  {
+                                                    "id": "",
+                                                    "body": {
+                                                      "package": "himalaya",
+                                                      "type": "VStack",
+                                                      "props": {
+                                                        "spacing": 2,
+                                                        "alignment": "leading",
+                                                        "children": [
+                                                          {
+                                                            "id": "",
+                                                            "body": {
+                                                              "package": "himalaya",
+                                                              "type": "Text",
+                                                              "props": {
+                                                                "text": "$item.label",
+                                                                "style": "body",
+                                                                "maxLines": 2
+                                                              }
+                                                            }
+                                                          },
+                                                          {
+                                                            "id": "",
+                                                            "body": {
+                                                              "package": "himalaya",
+                                                              "type": "Text",
+                                                              "props": {
+                                                                "text": "$item.sub",
+                                                                "style": "caption",
+                                                                "color": "textSecondary",
+                                                                "maxLines": 2
+                                                              }
+                                                            },
+                                                            "modifiers": {
+                                                              "hiddenPath": "$item.noSub"
+                                                            }
+                                                          }
+                                                        ]
+                                                      }
+                                                    }
+                                                  },
+                                                  {
+                                                    "id": "",
+                                                    "body": {
+                                                      "package": "himalaya",
+                                                      "type": "Spacer",
+                                                      "props": {}
+                                                    }
+                                                  },
+                                                  {
+                                                    "id": "",
+                                                    "body": {
+                                                      "package": "himalaya",
+                                                      "type": "Icon",
+                                                      "props": {
+                                                        "name": "check",
+                                                        "size": 20,
+                                                        "tint": "accentPrimary"
+                                                      }
+                                                    },
+                                                    "modifiers": {
+                                                      "accessibilityRole": "decorative",
+                                                      "hiddenPath": "$item.notSelected"
+                                                    }
+                                                  }
+                                                ]
+                                              }
+                                            },
+                                            "modifiers": {
+                                              "fillMaxWidth": true,
+                                              "padding": {
+                                                "top": 15,
+                                                "bottom": 15
+                                              }
+                                            }
+                                          },
+                                          {
+                                            "id": "",
+                                            "body": {
+                                              "package": "himalaya",
+                                              "type": "Divider",
+                                              "props": {}
+                                            }
+                                          }
+                                        ]
+                                      }
+                                    },
+                                    "modifiers": {
+                                      "fillMaxWidth": true,
+                                      "onTap": {
+                                        "actionId": "tier5.himiBrandedAgenda.selectLocation",
+                                        "params": {
+                                          "locationId": "$item.id"
+                                        }
+                                      },
+                                      "pressFeedback": "highlight",
+                                      "accessibilityRole": "button",
+                                      "accessibilityLabel": "$item.a11y"
+                                    }
+                                  }
+                                ]
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    "modifiers": {
+                      "padding": {
+                        "leading": 20,
+                        "trailing": 20,
+                        "top": 8,
+                        "bottom": 24
+                      }
+                    }
+                  }
+                }
+              }
+            },
             {
               "id": "himi_agenda.result",
               "body": {
@@ -14227,7 +15300,8 @@ const SCREENS = runtimeSetting({
         "wix_api",
         "app_info",
         "calendar",
-        "open_url"
+        "open_url",
+        "local_database"
       ],
       "minBinaryVersion": "0.1.0",
       "bundleVersion": "0.0.1"
@@ -14245,28 +15319,110 @@ const SCREENS = runtimeSetting({
           "alignment": "leading",
           "children": [
             {
-              "id": "himi_agenda.back",
+              "id": "",
               "body": {
                 "package": "himalaya",
-                "type": "Button",
+                "type": "HStack",
                 "props": {
-                  "title": "Back",
-                  "action": {
-                    "actionId": "nav.back",
-                    "presentation": "back"
-                  },
-                  "style": "tertiary",
-                  "iconOnly": true,
-                  "leadingIcon": "chevron_left",
-                  "cornerRadius": 22,
-                  "minHeight": 44
+                  "spacing": 0,
+                  "alignment": "center",
+                  "children": [
+                    {
+                      "id": "himi_agenda.back",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Back",
+                          "action": {
+                            "actionId": "nav.back",
+                            "presentation": "back"
+                          },
+                          "style": "tertiary",
+                          "iconOnly": true,
+                          "leadingIcon": "chevron_left",
+                          "cornerRadius": 22,
+                          "minHeight": 44
+                        }
+                      },
+                      "modifiers": {
+                        "width": 44,
+                        "height": 44,
+                        "accessibilityLabel": "Back",
+                        "accessibilityRole": "button"
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Spacer",
+                        "props": {}
+                      }
+                    },
+                    {
+                      "id": "himi_agenda.location",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "ZStack",
+                        "props": {
+                          "children": [
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Icon",
+                                "props": {
+                                  "name": "location",
+                                  "size": 22,
+                                  "tint": "textPrimary"
+                                }
+                              },
+                              "modifiers": {
+                                "accessibilityRole": "decorative",
+                                "hiddenPath": "$service:himiBrandedAgenda.locationActive"
+                              }
+                            },
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Icon",
+                                "props": {
+                                  "name": "location",
+                                  "size": 22,
+                                  "tint": "accentPrimary"
+                                }
+                              },
+                              "modifiers": {
+                                "accessibilityRole": "decorative",
+                                "hiddenPath": "$service:himiBrandedAgenda.noLocationActive"
+                              }
+                            }
+                          ]
+                        }
+                      },
+                      "modifiers": {
+                        "width": 44,
+                        "height": 44,
+                        "onTap": {
+                          "actionId": "tier5.himiBrandedAgenda.openLocations"
+                        },
+                        "pressFeedback": "highlight",
+                        "accessibilityRole": "button",
+                        "accessibilityLabel": "$service:himiBrandedAgenda.locationA11y",
+                        "accessibilityHint": "Choose a location",
+                        "hiddenPath": "$service:himiBrandedAgenda.noLocationMenu"
+                      }
+                    }
+                  ]
                 }
               },
               "modifiers": {
-                "width": 44,
-                "height": 44,
-                "accessibilityLabel": "Back",
-                "accessibilityRole": "button"
+                "fillMaxWidth": true,
+                "padding": {
+                  "trailing": 4
+                }
               }
             },
             {
@@ -21943,14 +23099,74 @@ const SCREENS = runtimeSetting({
                                                                   "alignment": "leading",
                                                                   "children": [
                                                                     {
-                                                                      "id": "",
+                                                                      "id": "himi_events.list.collection.list.$item.collectionId/heading",
                                                                       "body": {
                                                                         "package": "himalaya",
-                                                                        "type": "Text",
+                                                                        "type": "HStack",
                                                                         "props": {
-                                                                          "text": "$item.collectionTitle",
-                                                                          "style": "bodyEmphasis",
-                                                                          "maxLines": 2
+                                                                          "spacing": 0,
+                                                                          "alignment": "center",
+                                                                          "children": [
+                                                                            {
+                                                                              "id": "himi_events.list.collection.list.$item.collectionId/date-badge-group",
+                                                                              "body": {
+                                                                                "package": "himalaya",
+                                                                                "type": "VStack",
+                                                                                "props": {
+                                                                                  "spacing": 0,
+                                                                                  "children": [
+                                                                                    {
+                                                                                      "id": "himi_events.list.collection.list.$item.collectionId/date-badge",
+                                                                                      "body": {
+                                                                                        "package": "himalaya",
+                                                                                        "type": "Text",
+                                                                                        "props": {
+                                                                                          "text": "$item.dateBadge",
+                                                                                          "style": "bodyEmphasis",
+                                                                                          "maxLines": 2,
+                                                                                          "collapseWhenEmpty": true,
+                                                                                          "textAlign": "center"
+                                                                                        }
+                                                                                      },
+                                                                                      "modifiers": {
+                                                                                        "padding": {
+                                                                                          "leading": 8,
+                                                                                          "trailing": 8,
+                                                                                          "top": 8,
+                                                                                          "bottom": 8
+                                                                                        },
+                                                                                        "background": {
+                                                                                          "token": "surfaceSecondary"
+                                                                                        },
+                                                                                        "cornerRadius": 8
+                                                                                      }
+                                                                                    }
+                                                                                  ]
+                                                                                }
+                                                                              },
+                                                                              "modifiers": {
+                                                                                "padding": {
+                                                                                  "trailing": 8
+                                                                                },
+                                                                                "hiddenPath": "$item.noDateBadge"
+                                                                              }
+                                                                            },
+                                                                            {
+                                                                              "id": "",
+                                                                              "body": {
+                                                                                "package": "himalaya",
+                                                                                "type": "Text",
+                                                                                "props": {
+                                                                                  "text": "$item.collectionTitle",
+                                                                                  "style": "bodyEmphasis",
+                                                                                  "maxLines": 2
+                                                                                }
+                                                                              },
+                                                                              "modifiers": {
+                                                                                "weight": 1
+                                                                              }
+                                                                            }
+                                                                          ]
                                                                         }
                                                                       }
                                                                     },
@@ -22042,21 +23258,36 @@ const SCREENS = runtimeSetting({
                                                                           "spacing": 0,
                                                                           "children": [
                                                                             {
-                                                                              "id": "himi_events.list.collection.list.$item.collectionId/primary",
+                                                                              "id": "",
                                                                               "body": {
                                                                                 "package": "himalaya",
-                                                                                "type": "Button",
+                                                                                "type": "HStack",
                                                                                 "props": {
-                                                                                  "title": "Register",
-                                                                                  "style": "secondary",
-                                                                                  "fullWidth": false,
-                                                                                  "action": {
-                                                                                    "actionId": "himi.open",
-                                                                                    "params": {
-                                                                                      "screenId": "$item.detailScreenId",
-                                                                                      "id": "$item.id"
+                                                                                  "spacing": 0,
+                                                                                  "children": [
+                                                                                    {
+                                                                                      "id": "himi_events.list.collection.list.$item.collectionId/primary",
+                                                                                      "body": {
+                                                                                        "package": "himalaya",
+                                                                                        "type": "Button",
+                                                                                        "props": {
+                                                                                          "title": "$item.actionLabel",
+                                                                                          "style": "secondary",
+                                                                                          "fullWidth": false,
+                                                                                          "action": {
+                                                                                            "actionId": "himi.open",
+                                                                                            "params": {
+                                                                                              "screenId": "$item.detailScreenId",
+                                                                                              "id": "$item.id"
+                                                                                            }
+                                                                                          }
+                                                                                        }
+                                                                                      },
+                                                                                      "modifiers": {
+                                                                                        "hiddenPath": "$item.noAction"
+                                                                                      }
                                                                                     }
-                                                                                  }
+                                                                                  ]
                                                                                 }
                                                                               },
                                                                               "modifiers": {
@@ -22135,6 +23366,17 @@ const SCREENS = runtimeSetting({
                                                                                 }
                                                                               }
                                                                             },
+                                                                            {
+                                                                              "id": "share",
+                                                                              "label": "Share",
+                                                                              "icon": "share",
+                                                                              "action": {
+                                                                                "actionId": "tier5.himiEvents.share",
+                                                                                "params": {
+                                                                                  "id": "$item.collectionId"
+                                                                                }
+                                                                              }
+                                                                            },
                                                                             {
                                                                               "id": "open",
                                                                               "label": "Open details",
@@ -22247,9 +23489,9 @@ const SCREENS = runtimeSetting({
                                                 "package": "himalaya",
                                                 "type": "Grid",
                                                 "props": {
-                                                  "columns": 2,
-                                                  "columnsMedium": 3,
-                                                  "columnsExpanded": 4,
+                                                  "columns": 1,
+                                                  "columnsMedium": 2,
+                                                  "columnsExpanded": 3,
                                                   "spacing": 12,
                                                   "staggerMs": 30,
                                                   "itemsPath": "$service:himiEvents.collection.items",
@@ -22340,14 +23582,74 @@ const SCREENS = runtimeSetting({
                                                                   "alignment": "leading",
                                                                   "children": [
                                                                     {
-                                                                      "id": "",
+                                                                      "id": "himi_events.list.collection.grid.$item.collectionId/heading",
                                                                       "body": {
                                                                         "package": "himalaya",
-                                                                        "type": "Text",
+                                                                        "type": "HStack",
                                                                         "props": {
-                                                                          "text": "$item.collectionTitle",
-                                                                          "style": "bodyEmphasis",
-                                                                          "maxLines": 2
+                                                                          "spacing": 0,
+                                                                          "alignment": "center",
+                                                                          "children": [
+                                                                            {
+                                                                              "id": "himi_events.list.collection.grid.$item.collectionId/date-badge-group",
+                                                                              "body": {
+                                                                                "package": "himalaya",
+                                                                                "type": "VStack",
+                                                                                "props": {
+                                                                                  "spacing": 0,
+                                                                                  "children": [
+                                                                                    {
+                                                                                      "id": "himi_events.list.collection.grid.$item.collectionId/date-badge",
+                                                                                      "body": {
+                                                                                        "package": "himalaya",
+                                                                                        "type": "Text",
+                                                                                        "props": {
+                                                                                          "text": "$item.dateBadge",
+                                                                                          "style": "bodyEmphasis",
+                                                                                          "maxLines": 2,
+                                                                                          "collapseWhenEmpty": true,
+                                                                                          "textAlign": "center"
+                                                                                        }
+                                                                                      },
+                                                                                      "modifiers": {
+                                                                                        "padding": {
+                                                                                          "leading": 8,
+                                                                                          "trailing": 8,
+                                                                                          "top": 8,
+                                                                                          "bottom": 8
+                                                                                        },
+                                                                                        "background": {
+                                                                                          "token": "surfaceSecondary"
+                                                                                        },
+                                                                                        "cornerRadius": 8
+                                                                                      }
+                                                                                    }
+                                                                                  ]
+                                                                                }
+                                                                              },
+                                                                              "modifiers": {
+                                                                                "padding": {
+                                                                                  "trailing": 8
+                                                                                },
+                                                                                "hiddenPath": "$item.noDateBadge"
+                                                                              }
+                                                                            },
+                                                                            {
+                                                                              "id": "",
+                                                                              "body": {
+                                                                                "package": "himalaya",
+                                                                                "type": "Text",
+                                                                                "props": {
+                                                                                  "text": "$item.collectionTitle",
+                                                                                  "style": "bodyEmphasis",
+                                                                                  "maxLines": 2
+                                                                                }
+                                                                              },
+                                                                              "modifiers": {
+                                                                                "weight": 1
+                                                                              }
+                                                                            }
+                                                                          ]
                                                                         }
                                                                       }
                                                                     },
@@ -22477,21 +23779,36 @@ const SCREENS = runtimeSetting({
                                                                               }
                                                                             },
                                                                             {
-                                                                              "id": "himi_events.list.collection.grid.$item.collectionId/primary",
+                                                                              "id": "",
                                                                               "body": {
                                                                                 "package": "himalaya",
-                                                                                "type": "Button",
+                                                                                "type": "HStack",
                                                                                 "props": {
-                                                                                  "title": "Register",
-                                                                                  "style": "secondary",
-                                                                                  "fullWidth": false,
-                                                                                  "action": {
-                                                                                    "actionId": "himi.open",
-                                                                                    "params": {
-                                                                                      "screenId": "$item.detailScreenId",
-                                                                                      "id": "$item.id"
+                                                                                  "spacing": 0,
+                                                                                  "children": [
+                                                                                    {
+                                                                                      "id": "himi_events.list.collection.grid.$item.collectionId/primary",
+                                                                                      "body": {
+                                                                                        "package": "himalaya",
+                                                                                        "type": "Button",
+                                                                                        "props": {
+                                                                                          "title": "$item.actionLabel",
+                                                                                          "style": "secondary",
+                                                                                          "fullWidth": false,
+                                                                                          "action": {
+                                                                                            "actionId": "himi.open",
+                                                                                            "params": {
+                                                                                              "screenId": "$item.detailScreenId",
+                                                                                              "id": "$item.id"
+                                                                                            }
+                                                                                          }
+                                                                                        }
+                                                                                      },
+                                                                                      "modifiers": {
+                                                                                        "hiddenPath": "$item.noAction"
+                                                                                      }
                                                                                     }
-                                                                                  }
+                                                                                  ]
                                                                                 }
                                                                               },
                                                                               "modifiers": {
@@ -22552,6 +23869,17 @@ const SCREENS = runtimeSetting({
                                                                                         }
                                                                                       }
                                                                                     },
+                                                                                    {
+                                                                                      "id": "share",
+                                                                                      "label": "Share",
+                                                                                      "icon": "share",
+                                                                                      "action": {
+                                                                                        "actionId": "tier5.himiEvents.share",
+                                                                                        "params": {
+                                                                                          "id": "$item.collectionId"
+                                                                                        }
+                                                                                      }
+                                                                                    },
                                                                                     {
                                                                                       "id": "open",
                                                                                       "label": "Open details",
@@ -22726,14 +24054,74 @@ const SCREENS = runtimeSetting({
                                                                   "alignment": "leading",
                                                                   "children": [
                                                                     {
-                                                                      "id": "",
+                                                                      "id": "himi_events.list.collection.compact-list.$item.collectionId/heading",
                                                                       "body": {
                                                                         "package": "himalaya",
-                                                                        "type": "Text",
+                                                                        "type": "HStack",
                                                                         "props": {
-                                                                          "text": "$item.collectionTitle",
-                                                                          "style": "bodyEmphasis",
-                                                                          "maxLines": 2
+                                                                          "spacing": 0,
+                                                                          "alignment": "center",
+                                                                          "children": [
+                                                                            {
+                                                                              "id": "himi_events.list.collection.compact-list.$item.collectionId/date-badge-group",
+                                                                              "body": {
+                                                                                "package": "himalaya",
+                                                                                "type": "VStack",
+                                                                                "props": {
+                                                                                  "spacing": 0,
+                                                                                  "children": [
+                                                                                    {
+                                                                                      "id": "himi_events.list.collection.compact-list.$item.collectionId/date-badge",
+                                                                                      "body": {
+                                                                                        "package": "himalaya",
+                                                                                        "type": "Text",
+                                                                                        "props": {
+                                                                                          "text": "$item.dateBadge",
+                                                                                          "style": "bodyEmphasis",
+                                                                                          "maxLines": 2,
+                                                                                          "collapseWhenEmpty": true,
+                                                                                          "textAlign": "center"
+                                                                                        }
+                                                                                      },
+                                                                                      "modifiers": {
+                                                                                        "padding": {
+                                                                                          "leading": 8,
+                                                                                          "trailing": 8,
+                                                                                          "top": 8,
+                                                                                          "bottom": 8
+                                                                                        },
+                                                                                        "background": {
+                                                                                          "token": "surfaceSecondary"
+                                                                                        },
+                                                                                        "cornerRadius": 8
+                                                                                      }
+                                                                                    }
+                                                                                  ]
+                                                                                }
+                                                                              },
+                                                                              "modifiers": {
+                                                                                "padding": {
+                                                                                  "trailing": 8
+                                                                                },
+                                                                                "hiddenPath": "$item.noDateBadge"
+                                                                              }
+                                                                            },
+                                                                            {
+                                                                              "id": "",
+                                                                              "body": {
+                                                                                "package": "himalaya",
+                                                                                "type": "Text",
+                                                                                "props": {
+                                                                                  "text": "$item.collectionTitle",
+                                                                                  "style": "bodyEmphasis",
+                                                                                  "maxLines": 2
+                                                                                }
+                                                                              },
+                                                                              "modifiers": {
+                                                                                "weight": 1
+                                                                              }
+                                                                            }
+                                                                          ]
                                                                         }
                                                                       }
                                                                     },
@@ -22825,21 +24213,36 @@ const SCREENS = runtimeSetting({
                                                                           "spacing": 0,
                                                                           "children": [
                                                                             {
-                                                                              "id": "himi_events.list.collection.compact-list.$item.collectionId/primary",
+                                                                              "id": "",
                                                                               "body": {
                                                                                 "package": "himalaya",
-                                                                                "type": "Button",
+                                                                                "type": "HStack",
                                                                                 "props": {
-                                                                                  "title": "Register",
-                                                                                  "style": "secondary",
-                                                                                  "fullWidth": false,
-                                                                                  "action": {
-                                                                                    "actionId": "himi.open",
-                                                                                    "params": {
-                                                                                      "screenId": "$item.detailScreenId",
-                                                                                      "id": "$item.id"
+                                                                                  "spacing": 0,
+                                                                                  "children": [
+                                                                                    {
+                                                                                      "id": "himi_events.list.collection.compact-list.$item.collectionId/primary",
+                                                                                      "body": {
+                                                                                        "package": "himalaya",
+                                                                                        "type": "Button",
+                                                                                        "props": {
+                                                                                          "title": "$item.actionLabel",
+                                                                                          "style": "secondary",
+                                                                                          "fullWidth": false,
+                                                                                          "action": {
+                                                                                            "actionId": "himi.open",
+                                                                                            "params": {
+                                                                                              "screenId": "$item.detailScreenId",
+                                                                                              "id": "$item.id"
+                                                                                            }
+                                                                                          }
+                                                                                        }
+                                                                                      },
+                                                                                      "modifiers": {
+                                                                                        "hiddenPath": "$item.noAction"
+                                                                                      }
                                                                                     }
-                                                                                  }
+                                                                                  ]
                                                                                 }
                                                                               },
                                                                               "modifiers": {
@@ -22908,11 +24311,22 @@ const SCREENS = runtimeSetting({
                                                                               }
                                                                             },
                                                                             {
-                                                                              "id": "save",
-                                                                              "label": "$item.collectionSaveLabel",
-                                                                              "icon": "bookmark",
+                                                                              "id": "save",
+                                                                              "label": "$item.collectionSaveLabel",
+                                                                              "icon": "bookmark",
+                                                                              "action": {
+                                                                                "actionId": "tier5.himiEvents.collectionSave",
+                                                                                "params": {
+                                                                                  "id": "$item.collectionId"
+                                                                                }
+                                                                              }
+                                                                            },
+                                                                            {
+                                                                              "id": "share",
+                                                                              "label": "Share",
+                                                                              "icon": "share",
                                                                               "action": {
-                                                                                "actionId": "tier5.himiEvents.collectionSave",
+                                                                                "actionId": "tier5.himiEvents.share",
                                                                                 "params": {
                                                                                   "id": "$item.collectionId"
                                                                                 }
@@ -23030,9 +24444,9 @@ const SCREENS = runtimeSetting({
                                                 "package": "himalaya",
                                                 "type": "Grid",
                                                 "props": {
-                                                  "columns": 2,
-                                                  "columnsMedium": 3,
-                                                  "columnsExpanded": 4,
+                                                  "columns": 1,
+                                                  "columnsMedium": 2,
+                                                  "columnsExpanded": 3,
                                                   "spacing": 8,
                                                   "staggerMs": 30,
                                                   "itemsPath": "$service:himiEvents.collection.items",
@@ -23123,14 +24537,74 @@ const SCREENS = runtimeSetting({
                                                                   "alignment": "leading",
                                                                   "children": [
                                                                     {
-                                                                      "id": "",
+                                                                      "id": "himi_events.list.collection.compact-grid.$item.collectionId/heading",
                                                                       "body": {
                                                                         "package": "himalaya",
-                                                                        "type": "Text",
+                                                                        "type": "HStack",
                                                                         "props": {
-                                                                          "text": "$item.collectionTitle",
-                                                                          "style": "bodyEmphasis",
-                                                                          "maxLines": 2
+                                                                          "spacing": 0,
+                                                                          "alignment": "center",
+                                                                          "children": [
+                                                                            {
+                                                                              "id": "himi_events.list.collection.compact-grid.$item.collectionId/date-badge-group",
+                                                                              "body": {
+                                                                                "package": "himalaya",
+                                                                                "type": "VStack",
+                                                                                "props": {
+                                                                                  "spacing": 0,
+                                                                                  "children": [
+                                                                                    {
+                                                                                      "id": "himi_events.list.collection.compact-grid.$item.collectionId/date-badge",
+                                                                                      "body": {
+                                                                                        "package": "himalaya",
+                                                                                        "type": "Text",
+                                                                                        "props": {
+                                                                                          "text": "$item.dateBadge",
+                                                                                          "style": "bodyEmphasis",
+                                                                                          "maxLines": 2,
+                                                                                          "collapseWhenEmpty": true,
+                                                                                          "textAlign": "center"
+                                                                                        }
+                                                                                      },
+                                                                                      "modifiers": {
+                                                                                        "padding": {
+                                                                                          "leading": 8,
+                                                                                          "trailing": 8,
+                                                                                          "top": 8,
+                                                                                          "bottom": 8
+                                                                                        },
+                                                                                        "background": {
+                                                                                          "token": "surfaceSecondary"
+                                                                                        },
+                                                                                        "cornerRadius": 8
+                                                                                      }
+                                                                                    }
+                                                                                  ]
+                                                                                }
+                                                                              },
+                                                                              "modifiers": {
+                                                                                "padding": {
+                                                                                  "trailing": 8
+                                                                                },
+                                                                                "hiddenPath": "$item.noDateBadge"
+                                                                              }
+                                                                            },
+                                                                            {
+                                                                              "id": "",
+                                                                              "body": {
+                                                                                "package": "himalaya",
+                                                                                "type": "Text",
+                                                                                "props": {
+                                                                                  "text": "$item.collectionTitle",
+                                                                                  "style": "bodyEmphasis",
+                                                                                  "maxLines": 2
+                                                                                }
+                                                                              },
+                                                                              "modifiers": {
+                                                                                "weight": 1
+                                                                              }
+                                                                            }
+                                                                          ]
                                                                         }
                                                                       }
                                                                     },
@@ -23260,21 +24734,36 @@ const SCREENS = runtimeSetting({
                                                                               }
                                                                             },
                                                                             {
-                                                                              "id": "himi_events.list.collection.compact-grid.$item.collectionId/primary",
+                                                                              "id": "",
                                                                               "body": {
                                                                                 "package": "himalaya",
-                                                                                "type": "Button",
+                                                                                "type": "HStack",
                                                                                 "props": {
-                                                                                  "title": "Register",
-                                                                                  "style": "secondary",
-                                                                                  "fullWidth": false,
-                                                                                  "action": {
-                                                                                    "actionId": "himi.open",
-                                                                                    "params": {
-                                                                                      "screenId": "$item.detailScreenId",
-                                                                                      "id": "$item.id"
+                                                                                  "spacing": 0,
+                                                                                  "children": [
+                                                                                    {
+                                                                                      "id": "himi_events.list.collection.compact-grid.$item.collectionId/primary",
+                                                                                      "body": {
+                                                                                        "package": "himalaya",
+                                                                                        "type": "Button",
+                                                                                        "props": {
+                                                                                          "title": "$item.actionLabel",
+                                                                                          "style": "secondary",
+                                                                                          "fullWidth": false,
+                                                                                          "action": {
+                                                                                            "actionId": "himi.open",
+                                                                                            "params": {
+                                                                                              "screenId": "$item.detailScreenId",
+                                                                                              "id": "$item.id"
+                                                                                            }
+                                                                                          }
+                                                                                        }
+                                                                                      },
+                                                                                      "modifiers": {
+                                                                                        "hiddenPath": "$item.noAction"
+                                                                                      }
                                                                                     }
-                                                                                  }
+                                                                                  ]
                                                                                 }
                                                                               },
                                                                               "modifiers": {
@@ -23335,6 +24824,17 @@ const SCREENS = runtimeSetting({
                                                                                         }
                                                                                       }
                                                                                     },
+                                                                                    {
+                                                                                      "id": "share",
+                                                                                      "label": "Share",
+                                                                                      "icon": "share",
+                                                                                      "action": {
+                                                                                        "actionId": "tier5.himiEvents.share",
+                                                                                        "params": {
+                                                                                          "id": "$item.collectionId"
+                                                                                        }
+                                                                                      }
+                                                                                    },
                                                                                     {
                                                                                       "id": "open",
                                                                                       "label": "Open details",
@@ -23876,14 +25376,74 @@ const SCREENS = runtimeSetting({
                                                         "alignment": "leading",
                                                         "children": [
                                                           {
-                                                            "id": "",
+                                                            "id": "himi_events.list.collection.preview.$item.collectionId/heading",
                                                             "body": {
                                                               "package": "himalaya",
-                                                              "type": "Text",
+                                                              "type": "HStack",
                                                               "props": {
-                                                                "text": "$item.collectionTitle",
-                                                                "style": "bodyEmphasis",
-                                                                "maxLines": 2
+                                                                "spacing": 0,
+                                                                "alignment": "center",
+                                                                "children": [
+                                                                  {
+                                                                    "id": "himi_events.list.collection.preview.$item.collectionId/date-badge-group",
+                                                                    "body": {
+                                                                      "package": "himalaya",
+                                                                      "type": "VStack",
+                                                                      "props": {
+                                                                        "spacing": 0,
+                                                                        "children": [
+                                                                          {
+                                                                            "id": "himi_events.list.collection.preview.$item.collectionId/date-badge",
+                                                                            "body": {
+                                                                              "package": "himalaya",
+                                                                              "type": "Text",
+                                                                              "props": {
+                                                                                "text": "$item.dateBadge",
+                                                                                "style": "bodyEmphasis",
+                                                                                "maxLines": 2,
+                                                                                "collapseWhenEmpty": true,
+                                                                                "textAlign": "center"
+                                                                              }
+                                                                            },
+                                                                            "modifiers": {
+                                                                              "padding": {
+                                                                                "leading": 8,
+                                                                                "trailing": 8,
+                                                                                "top": 8,
+                                                                                "bottom": 8
+                                                                              },
+                                                                              "background": {
+                                                                                "token": "surfaceSecondary"
+                                                                              },
+                                                                              "cornerRadius": 8
+                                                                            }
+                                                                          }
+                                                                        ]
+                                                                      }
+                                                                    },
+                                                                    "modifiers": {
+                                                                      "padding": {
+                                                                        "trailing": 8
+                                                                      },
+                                                                      "hiddenPath": "$item.noDateBadge"
+                                                                    }
+                                                                  },
+                                                                  {
+                                                                    "id": "",
+                                                                    "body": {
+                                                                      "package": "himalaya",
+                                                                      "type": "Text",
+                                                                      "props": {
+                                                                        "text": "$item.collectionTitle",
+                                                                        "style": "bodyEmphasis",
+                                                                        "maxLines": 2
+                                                                      }
+                                                                    },
+                                                                    "modifiers": {
+                                                                      "weight": 1
+                                                                    }
+                                                                  }
+                                                                ]
                                                               }
                                                             }
                                                           },
@@ -24013,21 +25573,36 @@ const SCREENS = runtimeSetting({
                                                                     }
                                                                   },
                                                                   {
-                                                                    "id": "himi_events.list.collection.preview.$item.collectionId/primary",
+                                                                    "id": "",
                                                                     "body": {
                                                                       "package": "himalaya",
-                                                                      "type": "Button",
+                                                                      "type": "HStack",
                                                                       "props": {
-                                                                        "title": "Register",
-                                                                        "style": "secondary",
-                                                                        "fullWidth": false,
-                                                                        "action": {
-                                                                          "actionId": "himi.open",
-                                                                          "params": {
-                                                                            "screenId": "$item.detailScreenId",
-                                                                            "id": "$item.id"
+                                                                        "spacing": 0,
+                                                                        "children": [
+                                                                          {
+                                                                            "id": "himi_events.list.collection.preview.$item.collectionId/primary",
+                                                                            "body": {
+                                                                              "package": "himalaya",
+                                                                              "type": "Button",
+                                                                              "props": {
+                                                                                "title": "$item.actionLabel",
+                                                                                "style": "secondary",
+                                                                                "fullWidth": false,
+                                                                                "action": {
+                                                                                  "actionId": "himi.open",
+                                                                                  "params": {
+                                                                                    "screenId": "$item.detailScreenId",
+                                                                                    "id": "$item.id"
+                                                                                  }
+                                                                                }
+                                                                              }
+                                                                            },
+                                                                            "modifiers": {
+                                                                              "hiddenPath": "$item.noAction"
+                                                                            }
                                                                           }
-                                                                        }
+                                                                        ]
                                                                       }
                                                                     },
                                                                     "modifiers": {
@@ -24088,6 +25663,17 @@ const SCREENS = runtimeSetting({
                                                                               }
                                                                             }
                                                                           },
+                                                                          {
+                                                                            "id": "share",
+                                                                            "label": "Share",
+                                                                            "icon": "share",
+                                                                            "action": {
+                                                                              "actionId": "tier5.himiEvents.share",
+                                                                              "params": {
+                                                                                "id": "$item.collectionId"
+                                                                              }
+                                                                            }
+                                                                          },
                                                                           {
                                                                             "id": "open",
                                                                             "label": "Open details",
@@ -24287,7 +25873,8 @@ const SCREENS = runtimeSetting({
       "contentType": "application/javascript+ts-bundle",
       "declaredCapabilities": [
         "wix_api",
-        "local_database"
+        "local_database",
+        "share"
       ],
       "minBinaryVersion": "0.1.0",
       "bundleVersion": "0.0.1"
@@ -28778,7 +30365,20 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                           "alignment": "leading",
                           "children": [
                             {
-                              "id": "",
+                              "id": "himi_service.title",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Text",
+                                "props": {
+                                  "text": "$service:himiBookingService.name",
+                                  "style": "pageTitle",
+                                  "maxLines": 3,
+                                  "collapseWhenEmpty": true
+                                }
+                              }
+                            },
+                            {
+                              "id": "himi_service.session_when",
                               "body": {
                                 "package": "himalaya",
                                 "type": "HStack",
@@ -28787,62 +30387,59 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                                   "alignment": "center",
                                   "children": [
                                     {
-                                      "id": "himi_service.category",
+                                      "id": "",
                                       "body": {
                                         "package": "himalaya",
-                                        "type": "Text",
+                                        "type": "Icon",
                                         "props": {
-                                          "text": "$service:himiBookingService.category",
-                                          "style": "footnote",
-                                          "color": "textSecondary",
-                                          "maxLines": 1
+                                          "name": "calendar",
+                                          "size": 20,
+                                          "tint": "textSecondary"
                                         }
                                       },
                                       "modifiers": {
-                                        "hiddenPath": "$service:himiBookingService.noCategory"
+                                        "accessibilityRole": "decorative"
                                       }
                                     },
                                     {
-                                      "id": "himi_service.type_tag",
+                                      "id": "",
                                       "body": {
                                         "package": "himalaya",
                                         "type": "Text",
                                         "props": {
-                                          "text": "$service:himiBookingService.typeTag",
-                                          "style": "caption",
-                                          "color": "textSecondary",
-                                          "maxLines": 1
+                                          "text": "$service:himiBookingService.sessionWhen",
+                                          "style": "bodyEmphasis",
+                                          "maxLines": 2
                                         }
                                       },
                                       "modifiers": {
-                                        "background": {
-                                          "token": "surfaceTertiary"
-                                        },
-                                        "cornerRadius": 4,
-                                        "padding": {
-                                          "leading": 8,
-                                          "trailing": 8,
-                                          "top": 2,
-                                          "bottom": 2
-                                        },
-                                        "hiddenPath": "$service:himiBookingService.noTypeTag"
+                                        "weight": 1
+                                      }
+                                    },
+                                    {
+                                      "id": "himi_service.change_time",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Button",
+                                        "props": {
+                                          "title": "Change Time",
+                                          "style": "tertiary",
+                                          "size": "sm",
+                                          "action": {
+                                            "actionId": "tier5.himiBookingService.changeTime"
+                                          }
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "hiddenPath": "$service:himiBookingService.noChangeTime"
                                       }
                                     }
                                   ]
                                 }
-                              }
-                            },
-                            {
-                              "id": "himi_service.title",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "Text",
-                                "props": {
-                                  "text": "$service:himiBookingService.name",
-                                  "style": "pageTitle",
-                                  "maxLines": 3,
-                                  "collapseWhenEmpty": true
-                                }
+                              },
+                              "modifiers": {
+                                "fillMaxWidth": true,
+                                "hiddenPath": "$service:himiBookingService.noSession"
                               }
                             },
                             {
@@ -28953,6 +30550,104 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                                   "spacing": 16,
                                   "alignment": "leading",
                                   "children": [
+                                    {
+                                      "id": "himi_service.session",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "HStack",
+                                        "props": {
+                                          "spacing": 12,
+                                          "alignment": "center",
+                                          "children": [
+                                            {
+                                              "id": "",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "ZStack",
+                                                "props": {
+                                                  "alignment": "center",
+                                                  "children": [
+                                                    {
+                                                      "id": "",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "Icon",
+                                                        "props": {
+                                                          "name": "calendar",
+                                                          "size": 20,
+                                                          "tint": "textSecondary"
+                                                        }
+                                                      },
+                                                      "modifiers": {
+                                                        "accessibilityRole": "decorative"
+                                                      }
+                                                    }
+                                                  ]
+                                                }
+                                              },
+                                              "modifiers": {
+                                                "width": 20,
+                                                "height": 20
+                                              }
+                                            },
+                                            {
+                                              "id": "",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "VStack",
+                                                "props": {
+                                                  "spacing": 2,
+                                                  "alignment": "leading",
+                                                  "children": [
+                                                    {
+                                                      "id": "",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "Text",
+                                                        "props": {
+                                                          "text": "$service:himiBookingService.sessionDate",
+                                                          "style": "body",
+                                                          "color": "textPrimary",
+                                                          "maxLines": 2
+                                                        }
+                                                      }
+                                                    },
+                                                    {
+                                                      "id": "",
+                                                      "body": {
+                                                        "package": "himalaya",
+                                                        "type": "Text",
+                                                        "props": {
+                                                          "text": "$service:himiBookingService.sessionTime",
+                                                          "style": "caption",
+                                                          "color": "textSecondary",
+                                                          "maxLines": 1,
+                                                          "collapseWhenEmpty": true
+                                                        }
+                                                      }
+                                                    }
+                                                  ]
+                                                }
+                                              }
+                                            },
+                                            {
+                                              "id": "",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Spacer",
+                                                "props": {}
+                                              }
+                                            }
+                                          ]
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "fillMaxWidth": true,
+                                        "accessibilityLabel": "$service:himiBookingService.sessionDate",
+                                        "accessibilityValue": "$service:himiBookingService.sessionTime",
+                                        "hiddenPath": "$service:himiBookingService.noSession"
+                                      }
+                                    },
                                     {
                                       "id": "himi_service.course_dates",
                                       "body": {
@@ -30351,7 +32046,11 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
           "bottom": 24
         },
         "onAppear": {
-          "actionId": "tier5.himiBookingService.load"
+          "actionId": "tier5.himiBookingService.load",
+          "params": {
+            "signInScreenId": "himi_sign_in",
+            "signInPresentation": "sheet"
+          }
         }
       }
     },
@@ -30408,6 +32107,77 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                 "props": {
                   "spacing": 0,
                   "children": [
+                    {
+                      "id": "himi_service.session_message",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "HStack",
+                        "props": {
+                          "spacing": 8,
+                          "alignment": "center",
+                          "children": [
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Icon",
+                                "props": {
+                                  "name": "check",
+                                  "size": 20,
+                                  "tint": "success"
+                                }
+                              },
+                              "modifiers": {
+                                "accessibilityRole": "decorative",
+                                "hiddenPath": "$service:himiBookingService.sessionMessageFailed"
+                              }
+                            },
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Icon",
+                                "props": {
+                                  "name": "info",
+                                  "size": 20,
+                                  "tint": "accentPrimary"
+                                }
+                              },
+                              "modifiers": {
+                                "accessibilityRole": "decorative",
+                                "hiddenPath": "$service:himiBookingService.sessionMessageOk"
+                              }
+                            },
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Text",
+                                "props": {
+                                  "text": "$service:himiBookingService.sessionMessage",
+                                  "style": "footnote",
+                                  "color": "textPrimary",
+                                  "maxLines": 2
+                                }
+                              },
+                              "modifiers": {
+                                "weight": 1,
+                                "announce": {
+                                  "politeness": "polite"
+                                }
+                              }
+                            }
+                          ]
+                        }
+                      },
+                      "modifiers": {
+                        "fillMaxWidth": true,
+                        "padding": {
+                          "bottom": 12
+                        },
+                        "hiddenPath": "$service:himiBookingService.noSessionMessage"
+                      }
+                    },
                     {
                       "id": "himi_service.choose_time",
                       "body": {
@@ -30489,49 +32259,294 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                         }
                       },
                       "modifiers": {
-                        "cornerRadius": 8,
-                        "pressFeedback": "scale",
-                        "haptic": "medium",
-                        "height": 48,
-                        "hiddenPath": "$service:himiBookingService.noCourseCtaRequest"
+                        "cornerRadius": 8,
+                        "pressFeedback": "scale",
+                        "haptic": "medium",
+                        "height": 48,
+                        "hiddenPath": "$service:himiBookingService.noCourseCtaRequest"
+                      }
+                    },
+                    {
+                      "id": "himi_service.fully_booked",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Fully Booked",
+                          "style": "primary",
+                          "fullWidth": true,
+                          "disabled": true,
+                          "action": {
+                            "actionId": "tier5.himiBookingService.chooseTime"
+                          }
+                        }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiBookingService.noCourseCtaFull"
+                      }
+                    },
+                    {
+                      "id": "himi_service.booking_closed",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Booking Closed",
+                          "style": "primary",
+                          "fullWidth": true,
+                          "disabled": true,
+                          "action": {
+                            "actionId": "tier5.himiBookingService.chooseTime"
+                          }
+                        }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiBookingService.noCourseCtaClosed"
+                      }
+                    },
+                    {
+                      "id": "himi_service.session_book",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Book",
+                          "style": "primary",
+                          "fullWidth": true,
+                          "action": {
+                            "actionId": "tier5.himiBookingService.book"
+                          }
+                        }
+                      },
+                      "modifiers": {
+                        "cornerRadius": 8,
+                        "pressFeedback": "scale",
+                        "haptic": "medium",
+                        "height": 48,
+                        "hiddenPath": "$service:himiBookingService.noSessionBook"
+                      }
+                    },
+                    {
+                      "id": "himi_service.session_request",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Request to Book",
+                          "style": "primary",
+                          "fullWidth": true,
+                          "action": {
+                            "actionId": "tier5.himiBookingService.book"
+                          }
+                        }
+                      },
+                      "modifiers": {
+                        "cornerRadius": 8,
+                        "pressFeedback": "scale",
+                        "haptic": "medium",
+                        "height": 48,
+                        "hiddenPath": "$service:himiBookingService.noSessionRequest"
+                      }
+                    },
+                    {
+                      "id": "himi_service.session_waitlist",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Join Waitlist",
+                          "style": "primary",
+                          "fullWidth": true,
+                          "action": {
+                            "actionId": "tier5.himiBookingService.joinWaitlist"
+                          }
+                        }
+                      },
+                      "modifiers": {
+                        "cornerRadius": 8,
+                        "pressFeedback": "scale",
+                        "haptic": "medium",
+                        "height": 48,
+                        "hiddenPath": "$service:himiBookingService.noSessionWaitlist"
+                      }
+                    },
+                    {
+                      "id": "himi_service.session_closed",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "VStack",
+                        "props": {
+                          "spacing": 8,
+                          "alignment": "center",
+                          "children": [
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Text",
+                                "props": {
+                                  "text": "$service:himiBookingService.closedLabel",
+                                  "style": "footnote",
+                                  "color": "textSecondary",
+                                  "maxLines": 1,
+                                  "textAlign": "center"
+                                }
+                              },
+                              "modifiers": {
+                                "accessibilityHidden": true
+                              }
+                            },
+                            {
+                              "id": "himi_service.session_book_closed",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Button",
+                                "props": {
+                                  "title": "Book",
+                                  "style": "primary",
+                                  "fullWidth": true,
+                                  "disabled": true,
+                                  "action": {
+                                    "actionId": "tier5.himiBookingService.book"
+                                  }
+                                }
+                              },
+                              "modifiers": {
+                                "height": 48,
+                                "cornerRadius": 8,
+                                "accessibilityValue": "$service:himiBookingService.closedLabel"
+                              }
+                            }
+                          ]
+                        }
+                      },
+                      "modifiers": {
+                        "fillMaxWidth": true,
+                        "hiddenPath": "$service:himiBookingService.noSessionClosed"
                       }
                     },
                     {
-                      "id": "himi_service.fully_booked",
+                      "id": "himi_service.session_booked",
                       "body": {
                         "package": "himalaya",
-                        "type": "Button",
+                        "type": "ZStack",
                         "props": {
-                          "title": "Fully Booked",
-                          "style": "primary",
-                          "fullWidth": true,
-                          "disabled": true,
-                          "action": {
-                            "actionId": "tier5.himiBookingService.chooseTime"
-                          }
+                          "alignment": "center",
+                          "children": [
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "HStack",
+                                "props": {
+                                  "spacing": 8,
+                                  "alignment": "center",
+                                  "children": [
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Icon",
+                                        "props": {
+                                          "name": "check",
+                                          "size": 20,
+                                          "tint": "success"
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "accessibilityRole": "decorative"
+                                      }
+                                    },
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "Booked",
+                                          "style": "bodyEmphasis",
+                                          "color": "textPrimary",
+                                          "maxLines": 1
+                                        }
+                                      }
+                                    }
+                                  ]
+                                }
+                              }
+                            }
+                          ]
                         }
                       },
                       "modifiers": {
-                        "hiddenPath": "$service:himiBookingService.noCourseCtaFull"
+                        "fillMaxWidth": true,
+                        "height": 48,
+                        "background": {
+                          "token": "surfaceSecondary"
+                        },
+                        "cornerRadius": 8,
+                        "hiddenPath": "$service:himiBookingService.noSessionBooked"
                       }
                     },
                     {
-                      "id": "himi_service.booking_closed",
+                      "id": "himi_service.session_waitlisted",
                       "body": {
                         "package": "himalaya",
-                        "type": "Button",
+                        "type": "ZStack",
                         "props": {
-                          "title": "Booking Closed",
-                          "style": "primary",
-                          "fullWidth": true,
-                          "disabled": true,
-                          "action": {
-                            "actionId": "tier5.himiBookingService.chooseTime"
-                          }
+                          "alignment": "center",
+                          "children": [
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "HStack",
+                                "props": {
+                                  "spacing": 8,
+                                  "alignment": "center",
+                                  "children": [
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Icon",
+                                        "props": {
+                                          "name": "clock",
+                                          "size": 20,
+                                          "tint": "textSecondary"
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "accessibilityRole": "decorative"
+                                      }
+                                    },
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "On waitlist",
+                                          "style": "bodyEmphasis",
+                                          "color": "textPrimary",
+                                          "maxLines": 1
+                                        }
+                                      }
+                                    }
+                                  ]
+                                }
+                              }
+                            }
+                          ]
                         }
                       },
                       "modifiers": {
-                        "hiddenPath": "$service:himiBookingService.noCourseCtaClosed"
+                        "fillMaxWidth": true,
+                        "height": 48,
+                        "background": {
+                          "token": "surfaceSecondary"
+                        },
+                        "cornerRadius": 8,
+                        "hiddenPath": "$service:himiBookingService.noSessionWaitlisted"
                       }
                     }
                   ]
@@ -33415,6 +35430,41 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                   "spacing": 8,
                   "alignment": "leading",
                   "children": [
+                    {
+                      "id": "himi_program.loading_media",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Skeleton",
+                        "props": {
+                          "height": 210,
+                          "cornerRadius": 8
+                        }
+                      }
+                    },
+                    {
+                      "id": "himi_program.loading_title",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Skeleton",
+                        "props": {
+                          "width": 220,
+                          "height": 24,
+                          "cornerRadius": 4
+                        }
+                      }
+                    },
+                    {
+                      "id": "himi_program.loading_facts",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Skeleton",
+                        "props": {
+                          "height": 52,
+                          "cornerRadius": 4,
+                          "count": 3
+                        }
+                      }
+                    },
                     {
                       "id": "",
                       "body": {
@@ -33422,7 +35472,7 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                         "type": "Text",
                         "props": {
                           "text": "Loading program...",
-                          "style": "body",
+                          "style": "footnote",
                           "color": "textSecondary"
                         }
                       }
@@ -33639,6 +35689,90 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                         "hiddenPath": "$service:himiBrandedProgram.hidePriceRetry"
                       }
                     },
+                    {
+                      "id": "himi_program.facts",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Grid",
+                        "props": {
+                          "columns": 1,
+                          "spacing": 16,
+                          "itemsPath": "$service:himiBrandedProgram.facts",
+                          "items": [
+                            {
+                              "id": "himi_program.fact",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "HStack",
+                                "props": {
+                                  "spacing": 12,
+                                  "alignment": "leading",
+                                  "children": [
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Icon",
+                                        "props": {
+                                          "name": "$item.icon",
+                                          "size": 20,
+                                          "tint": "textSecondary"
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "accessibilityRole": "decorative"
+                                      }
+                                    },
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "VStack",
+                                        "props": {
+                                          "spacing": 4,
+                                          "alignment": "leading",
+                                          "children": [
+                                            {
+                                              "id": "",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Text",
+                                                "props": {
+                                                  "text": "$item.title",
+                                                  "style": "bodyEmphasis"
+                                                }
+                                              }
+                                            },
+                                            {
+                                              "id": "",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Text",
+                                                "props": {
+                                                  "text": "$item.body",
+                                                  "style": "footnote",
+                                                  "color": "textSecondary"
+                                                }
+                                              }
+                                            }
+                                          ]
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "fillMaxWidth": true
+                                      }
+                                    }
+                                  ]
+                                }
+                              }
+                            }
+                          ]
+                        }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiBrandedProgram.hideFacts"
+                      }
+                    },
                     {
                       "id": "himi_program.description_rich",
                       "body": {
@@ -33684,22 +35818,7 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                 }
               },
               "modifiers": {
-                "background": {
-                  "token": "surfaceElevated"
-                },
-                "border": {
-                  "width": 1,
-                  "color": {
-                    "token": "border"
-                  }
-                },
-                "cornerRadius": 4,
-                "padding": {
-                  "leading": 16,
-                  "trailing": 16,
-                  "top": 16,
-                  "bottom": 16
-                },
+                "fillMaxWidth": true,
                 "hiddenPath": "$service:himiBrandedProgram.hideContent"
               }
             },