diff --git a/demo/.eleventyignore b/demo/.eleventyignore
index b906f1b97..2d9d99fa7 100644
--- a/demo/.eleventyignore
+++ b/demo/.eleventyignore
@@ -1,7 +1,191 @@
-backend/**/styles.xml.njk
-backend/**/style.xml.njk
-backend/**/rating.xml.njk
-backend/**/compliment.xml.njk
-backend/**/user.xml.njk
-backend/**/select-multiple-content.xml.njk
-backend/**/tab.xml.njk
+backend/ui/styling/shadows/radius/index.xml.njk
+backend/ui/styling/shadows/offset/index.xml.njk
+backend/ui/styling/shadows/shadow-color/index.xml.njk
+backend/ui/styling/shadows/regular/index.xml.njk
+backend/ui/styling/button/shadow/index.xml.njk
+backend/ui/styling/button/shadow/styles.xml.njk
+backend/ui/styling/button/disabled/index.xml.njk
+backend/ui/styling/button/disabled/styles.xml.njk
+backend/ui/styling/button/regular/index.xml.njk
+backend/ui/styling/button/regular/styles.xml.njk
+backend/ui/styling/elevation/elevation-10/index.xml.njk
+backend/ui/styling/elevation/elevation-10/styles.xml.njk
+backend/ui/styling/elevation/elevation-3/index.xml.njk
+backend/ui/styling/elevation/elevation-3/styles.xml.njk
+backend/ui/styling/flex/flex-horizontal-justify-end/index.xml.njk
+backend/ui/styling/flex/flex-vertical-justify-center-align-end/index.xml.njk
+backend/ui/styling/flex/flex-horizontal-justify-center-align-center/index.xml.njk
+backend/ui/styling/flex/flex-horizontal/index.xml.njk
+backend/ui/styling/flex/flex-vertical/index.xml.njk
+backend/ui/styling/flex/flex-horizontal-justify-center/index.xml.njk
+backend/ui/styling/flex/flex-horizontal-justify-center-align-end/index.xml.njk
+backend/ui/styling/flex/flex-vertical-justify-center/index.xml.njk
+backend/ui/styling/flex/flex-vertical-justify-center-align-center/index.xml.njk
+backend/ui/styling/flex/flex-vertical-justify-end/index.xml.njk
+backend/ui/ui-elements/forms/date-field/label-format/index.xml.njk
+backend/ui/ui-elements/forms/date-field/validation-error/index.xml.njk
+backend/ui/ui-elements/forms/date-field/default/index.xml.njk
+backend/ui/ui-elements/forms/date-field/spinner/index.xml.njk
+backend/ui/ui-elements/forms/date-field/filled/index.xml.njk
+backend/ui/ui-elements/forms/date-field/min-date/index.xml.njk
+backend/ui/ui-elements/forms/date-field/max-date/index.xml.njk
+backend/ui/ui-elements/forms/date-field/customized/index.xml.njk
+backend/ui/ui-elements/forms/date-field/min-max-date/index.xml.njk
+backend/ui/ui-elements/forms/date-field/animations/index.xml.njk
+backend/ui/ui-elements/forms/date-field/filled-validation-error/index.xml.njk
+backend/ui/ui-elements/forms/index.xml.njk
+backend/ui/ui-elements/forms/picker/de-selectable/index.xml.njk
+backend/ui/ui-elements/forms/picker/validation-error/index.xml.njk
+backend/ui/ui-elements/forms/picker/default/index.xml.njk
+backend/ui/ui-elements/forms/picker/filled/index.xml.njk
+backend/ui/ui-elements/forms/picker/customized/index.xml.njk
+backend/ui/ui-elements/forms/picker/animations/index.xml.njk
+backend/ui/ui-elements/forms/picker/filled-validation-error/index.xml.njk
+backend/ui/ui-elements/forms/select-multiple/pre-select/index.xml.njk
+backend/ui/ui-elements/forms/select-multiple/simple-select/index.xml.njk
+backend/ui/ui-elements/forms/select-multiple/custom/index.xml.njk
+backend/ui/ui-elements/forms/select-multiple/unselected.png.njk
+backend/ui/ui-elements/forms/select-single/pre-select/index.xml.njk
+backend/ui/ui-elements/forms/select-single/optional-select/index.xml.njk
+backend/ui/ui-elements/forms/select-single/simple-select/index.xml.njk
+backend/ui/ui-elements/forms/select-single/custom/index.xml.njk
+backend/ui/ui-elements/forms/select-single/unselected.png.njk
+backend/ui/ui-elements/forms/switch/styled/index.xml.njk
+backend/ui/ui-elements/forms/switch/on/index.xml.njk
+backend/ui/ui-elements/forms/switch/off/index.xml.njk
+backend/ui/ui-elements/section-list/index.xml.njk
+backend/ui/ui-elements/image/image.jpg.njk
+backend/ui/ui-elements/list/scroll-view/dismiss-keyboard/index.xml.njk
+backend/ui/ui-elements/list/scroll-view/horizontal/index.xml.njk
+backend/ui/ui-elements/list/scroll-view/vertical-hidden-scroll/index.xml.njk
+backend/ui/ui-elements/list/scroll-view/horizontal-hidden-scroll/index.xml.njk
+backend/ui/ui-elements/list/scroll-view/vertical-sticky-header/index.xml.njk
+backend/ui/ui-elements/list/scroll-view/vertical/index.xml.njk
+backend/ui/ui-elements/list/index.xml.njk
+backend/ui/ui-elements/web-view/index.xml.njk
+backend/ui/ui-elements/text/index.xml.njk
+backend/advanced/case-studies/feedback-widget/styles.xml.njk
+backend/advanced/case-studies/feedback-widget/compliment.xml.njk
+backend/advanced/case-studies/advanced-forms/location/index.xml.njk
+backend/advanced/case-studies/advanced-forms/styles.xml.njk
+backend/advanced/case-studies/advanced-forms/food/index.xml.njk
+backend/advanced/case-studies/advanced-forms/parking/index.xml.njk
+backend/advanced/case-studies/cascader/styles.xml.njk
+backend/advanced/case-studies/basic-forms/styles.xml.njk
+backend/advanced/case-studies/photos/comments.xml.njk
+backend/advanced/case-studies/photos/user/styles.xml.njk
+backend/advanced/case-studies/photos/styles.xml.njk
+backend/advanced/case-studies/photos/section-1/index.xml.njk
+backend/advanced/case-studies/photos/section-1/user.xml.njk
+backend/advanced/case-studies/photos/avatars/riker.jpg.njk
+backend/advanced/case-studies/photos/avatars/geordi.jpg.njk
+backend/advanced/case-studies/photos/avatars/worf.jpg.njk
+backend/advanced/case-studies/photos/photos/coffee.jpeg.njk
+backend/advanced/case-studies/photos/photos/feet.jpeg.njk
+backend/advanced/case-studies/photos/photos/water.jpeg.njk
+backend/advanced/case-studies/photos/photos/concert.jpeg.njk
+backend/advanced/case-studies/photos/photos/inspiration1.jpeg.njk
+backend/advanced/case-studies/photos/photos/dinner.jpeg.njk
+backend/advanced/case-studies/photos/photos/salad.jpg.njk
+backend/advanced/case-studies/photos/photos/sign.jpeg.njk
+backend/advanced/case-studies/photos/section-3/index.xml.njk
+backend/advanced/case-studies/photos/section-4/index.xml.njk
+backend/advanced/case-studies/photos/section-5/index.xml.njk
+backend/advanced/case-studies/photos/section-2/index.xml.njk
+backend/advanced/case-studies/business-rating/styles.xml.njk
+backend/advanced/case-studies/business-rating/star_empty@2x.png.njk
+backend/advanced/case-studies/business-rating/star_empty.png.njk
+backend/advanced/case-studies/business-rating/star_filled@2x.png.njk
+backend/advanced/case-studies/business-rating/rating-modal/styles.xml.njk
+backend/advanced/case-studies/business-rating/rating-modal/rating.xml.njk
+backend/advanced/case-studies/business-rating/image.jpg.njk
+backend/navigation/actions/close/close-previous-screen/index.xml.njk
+backend/navigation/actions/close/close-query-params/index.xml.njk
+backend/navigation/actions/close/close-different-screen/index.xml.njk
+backend/navigation/actions/close/close-loading/index.xml.njk
+backend/navigation/actions/back/different-screen/index.xml.njk
+backend/navigation/actions/back/loading/index.xml.njk
+backend/navigation/actions/back/previous-screen/index.xml.njk
+backend/behaviors/advanced/scroll/section-list/section-list-content.xml.njk
+backend/behaviors/advanced/scroll/list/list-content.xml.njk
+backend/behaviors/advanced/set-value/date-field/index.xml.njk
+backend/behaviors/advanced/set-value/set-indicator/index.xml.njk
+backend/behaviors/advanced/set-value/picker-field/index.xml.njk
+backend/behaviors/advanced/set-value/select-single/index.xml.njk
+backend/behaviors/advanced/set-value/text-area/index.xml.njk
+backend/behaviors/advanced/set-value/set-delay/index.xml.njk
+backend/behaviors/advanced/set-value/clear/index.xml.njk
+backend/behaviors/advanced/set-value/clear-indicator/index.xml.njk
+backend/behaviors/advanced/set-value/switch/index.xml.njk
+backend/behaviors/advanced/set-value/text-field/index.xml.njk
+backend/behaviors/advanced/set-value/set/index.xml.njk
+backend/behaviors/advanced/set-value/clear-delay/index.xml.njk
+backend/behaviors/advanced/share/message-url/index.xml.njk
+backend/behaviors/advanced/share/all/index.xml.njk
+backend/behaviors/advanced/share/message/index.xml.njk
+backend/behaviors/advanced/share/url/index.xml.njk
+backend/behaviors/basic/fragments/fragment-replace/visible/index.xml.njk
+backend/behaviors/basic/fragments/fragment-replace/hidden/index.xml.njk
+backend/behaviors/basic/triggers/long-press/long-press-link/index.xml.njk
+backend/behaviors/basic/triggers/long-press/long-press-button/index.xml.njk
+backend/behaviors/basic/triggers/change/date-field/index.xml.njk
+backend/behaviors/basic/triggers/change/picker-field/index.xml.njk
+backend/behaviors/basic/triggers/change/text-area/index.xml.njk
+backend/behaviors/basic/triggers/change/switch/index.xml.njk
+backend/behaviors/basic/triggers/change/text-field/index.xml.njk
+backend/behaviors/basic/triggers/press/button/index.xml.njk
+backend/behaviors/basic/triggers/press/link/index.xml.njk
+backend/behaviors/basic/triggers/deselect/deselect-multiple/index.xml.njk
+backend/behaviors/basic/triggers/deselect/deselect-single/index.xml.njk
+backend/behaviors/basic/triggers/press-out/button-press-out/index.xml.njk
+backend/behaviors/basic/triggers/press-out/link/index.xml.njk
+backend/behaviors/basic/triggers/focus/date-field/index.xml.njk
+backend/behaviors/basic/triggers/focus/picker-field/index.xml.njk
+backend/behaviors/basic/triggers/focus/text-area/index.xml.njk
+backend/behaviors/basic/triggers/focus/text-field/index.xml.njk
+backend/behaviors/basic/triggers/press-in/button-press-in/index.xml.njk
+backend/behaviors/basic/triggers/press-in/link/index.xml.njk
+backend/behaviors/basic/triggers/load/press/index.xml.njk
+backend/behaviors/basic/triggers/load/on-load/index.xml.njk
+backend/behaviors/basic/triggers/load/on-load/styles.xml.njk
+backend/behaviors/basic/triggers/blur/date-field/index.xml.njk
+backend/behaviors/basic/triggers/blur/picker-field/index.xml.njk
+backend/behaviors/basic/triggers/blur/text-area/index.xml.njk
+backend/behaviors/basic/triggers/blur/text-field/index.xml.njk
+backend/behaviors/basic/triggers/select/multiple/index.xml.njk
+backend/behaviors/basic/triggers/select/single/index.xml.njk
+backend/behaviors/basic/indicators/shimmer-indicator/image.jpg.njk
+backend/behaviors/basic/actions/select-all/indicator/index.xml.njk
+backend/behaviors/basic/actions/select-all/tap/index.xml.njk
+backend/behaviors/basic/actions/select-all/delay/index.xml.njk
+backend/behaviors/basic/actions/unselect-all/indicator/index.xml.njk
+backend/behaviors/basic/actions/unselect-all/single-select/index.xml.njk
+backend/behaviors/basic/actions/unselect-all/tap/index.xml.njk
+backend/behaviors/basic/actions/unselect-all/select-multiple-content.xml.njk
+backend/behaviors/basic/actions/unselect-all/delay/index.xml.njk
+backend/behaviors/basic/actions/append/once/index.xml.njk
+backend/behaviors/basic/actions/append/once/styles.xml.njk
+backend/behaviors/basic/actions/append/nested/index.xml.njk
+backend/behaviors/basic/actions/append/nested/styles.xml.njk
+backend/behaviors/basic/actions/show/indicator/index.xml.njk
+backend/behaviors/basic/actions/show/multiple/index.xml.njk
+backend/behaviors/basic/actions/show/tap/index.xml.njk
+backend/behaviors/basic/actions/show/delay/index.xml.njk
+backend/behaviors/basic/actions/prepend/prepend-nested/index.xml.njk
+backend/behaviors/basic/actions/prepend/prepend-nested/styles.xml.njk
+backend/behaviors/basic/actions/prepend/prepend-once/index.xml.njk
+backend/behaviors/basic/actions/prepend/prepend-once/styles.xml.njk
+backend/behaviors/basic/actions/hide/indicator/index.xml.njk
+backend/behaviors/basic/actions/hide/multiple/index.xml.njk
+backend/behaviors/basic/actions/hide/tap/index.xml.njk
+backend/behaviors/basic/actions/hide/delay/index.xml.njk
+backend/behaviors/basic/actions/toggle/multiple/index.xml.njk
+backend/behaviors/basic/actions/toggle/spinner/index.xml.njk
+backend/behaviors/basic/actions/toggle/spinner/styles.xml.njk
+backend/behaviors/basic/actions/toggle/tap/index.xml.njk
+backend/behaviors/basic/actions/toggle/tap/styles.xml.njk
+backend/behaviors/basic/actions/toggle/delay/index.xml.njk
+backend/behaviors/basic/actions/replace-inner/once/index.xml.njk
+backend/behaviors/basic/actions/replace-inner/nested/index.xml.njk
+backend/behaviors/basic/actions/replace/once/index.xml.njk
+backend/behaviors/basic/actions/replace/twice/index.xml.njk
diff --git a/demo/backend/_includes/macros/tabbar-bottom/index.xml.njk b/demo/backend/_includes/macros/tabbar-bottom/index.xml.njk
index b720b1757..a482b32fc 100644
--- a/demo/backend/_includes/macros/tabbar-bottom/index.xml.njk
+++ b/demo/backend/_includes/macros/tabbar-bottom/index.xml.njk
@@ -1,6 +1,6 @@
 {% macro tabbar_bottom(target) %}
   <navigation:bottom-tab-bar
-    xmlns:navigation="https://instawork.com/hyperview-navigation"
+    xmlns:navigation="https://hyperview.org/navigation"
     navigation:navigator="{{ target }}"
   >
     <select-single style="tabbar-bottom" name="tabbar-bottom">
diff --git a/demo/backend/_includes/templates/list.xml.njk b/demo/backend/_includes/templates/list.xml.njk
index e4268104d..0c26a3e26 100644
--- a/demo/backend/_includes/templates/list.xml.njk
+++ b/demo/backend/_includes/templates/list.xml.njk
@@ -1,8 +1,3 @@
----
-permalink: "list.xml"
-hv_list_tag: "root"
----
-
 {# Standard template for showing a list of links to other screens. List is generated from a collection of screens with the given "hv_list_tag" #}
 <list
   action="replace"
diff --git a/demo/backend/_includes/templates/section-list.xml.njk b/demo/backend/_includes/templates/section-list.xml.njk
index 9d10132f8..b5a0675b8 100644
--- a/demo/backend/_includes/templates/section-list.xml.njk
+++ b/demo/backend/_includes/templates/section-list.xml.njk
@@ -1,8 +1,3 @@
----
-permalink: "section-list.xml"
-hv_section_list_tag: "root"
----
-
 {# Standard template for showing a section list of links to other screens. List is generated from a collection of screens with the given "hv_section_list_tag" #}
 <section-list
   action="replace"
@@ -14,7 +9,6 @@ hv_section_list_tag: "root"
   trigger="refresh"
   xmlns="https://hyperview.org/hyperview"
 >
-  <text>{{hv_section_list_tag}}</text>
   {% for section_tag in hv_section_list_tag.split(',') %}
     <section-title style="list-header item-first">
       <text style="list-header-text">{{section_tag}}</text>
diff --git a/demo/backend/advanced/case-studies/business-rating/index.xml.njk b/demo/backend/advanced/case-studies/business-rating/index.xml.njk
index 5b2a18ae5..32927c77d 100644
--- a/demo/backend/advanced/case-studies/business-rating/index.xml.njk
+++ b/demo/backend/advanced/case-studies/business-rating/index.xml.njk
@@ -6,12 +6,6 @@ hv_button_behavior: "back"
 ---
 {% extends 'templates/base.xml.njk' %}
 
-{# TODO rohanbayya: Fix Report Issue #}
-
-{% block custom_ns %}
-  xmlns:ns1="https://instawork.com/hyperview-intercom"
-{% endblock %}
-
 {% block styles %}
   {% include './styles.xml.njk' %}
 {% endblock %}
@@ -21,7 +15,6 @@ hv_button_behavior: "back"
     <view style="section-top">
       <text style="section-header">Instaworkers</text>
       <text style="section-action">
-        <behavior action="intercom" ns1:action="open" trigger="press" />
         Report Issue
       </text>
     </view>
diff --git a/demo/backend/advanced/case-studies/business-rating/rating_save.xml b/demo/backend/advanced/case-studies/business-rating/rating_save.xml
index 0ea57dce4..4d12ffe4f 100644
--- a/demo/backend/advanced/case-studies/business-rating/rating_save.xml
+++ b/demo/backend/advanced/case-studies/business-rating/rating_save.xml
@@ -2,7 +2,6 @@
   id="savedButton"
   style="bottomsheet-button"
   xmlns="https://hyperview.org/hyperview"
-  xmlns:ns1="https://instawork.com/hyperview-redux"
 >
   <behavior
     action="close"
@@ -10,11 +9,5 @@
     href="/hyperview/public/advanced/case-studies/business-rating/index.xml"
     trigger="load"
   />
-  <behavior
-    action="redux"
-    ns1:action="TOAST/SHOW_TOAST"
-    ns1:extra="{&quot;payload&quot;:{&quot;toast&quot;:{&quot;colorScheme&quot;:&quot;positive&quot;,&quot;message&quot;:&quot;Thank you for your rating&quot;}}}"
-    trigger="load"
-  />
   <text style="bottomsheet-button-label">Saved!!!</text>
 </view>
diff --git a/demo/backend/advanced/case-studies/content.xml.njk b/demo/backend/advanced/case-studies/content.xml.njk
new file mode 100644
index 000000000..54087c608
--- /dev/null
+++ b/demo/backend/advanced/case-studies/content.xml.njk
@@ -0,0 +1,2 @@
+{% set hv_list_tag = "case_studies" %}
+{% include "templates/list.xml.njk" %}
diff --git a/demo/backend/advanced/case-studies/index.xml.njk b/demo/backend/advanced/case-studies/index.xml.njk
index 92764fecd..ae06a4d97 100644
--- a/demo/backend/advanced/case-studies/index.xml.njk
+++ b/demo/backend/advanced/case-studies/index.xml.njk
@@ -2,5 +2,4 @@
 permalink: "/advanced/case-studies/index.xml"
 ---
 
-{% set hv_list_tag = "case_studies" %}
-{% include "templates/list.xml.njk" %}
+{% include "./content.xml.njk" %}
diff --git a/demo/backend/advanced/case-studies/photos/comments.xml.njk b/demo/backend/advanced/case-studies/photos/comments.xml.njk
index 002334a73..10777973a 100644
--- a/demo/backend/advanced/case-studies/photos/comments.xml.njk
+++ b/demo/backend/advanced/case-studies/photos/comments.xml.njk
@@ -1,7 +1,3 @@
----
-permalink: "/advanced/case-studies/photos/comments.xml"
----
-
 <view style="comments">
   <text id="image1-num-likes" style="comments-likes">7 likes</text>
   <text
diff --git a/demo/backend/advanced/custom-components/content.xml.njk b/demo/backend/advanced/custom-components/content.xml.njk
new file mode 100644
index 000000000..33fadc27f
--- /dev/null
+++ b/demo/backend/advanced/custom-components/content.xml.njk
@@ -0,0 +1,2 @@
+{% set hv_list_tag = "custom_components" %}
+{% include "templates/list.xml.njk" %}
diff --git a/demo/backend/advanced/custom-components/index.xml.njk b/demo/backend/advanced/custom-components/index.xml.njk
index 445098108..8d78dfa7e 100644
--- a/demo/backend/advanced/custom-components/index.xml.njk
+++ b/demo/backend/advanced/custom-components/index.xml.njk
@@ -2,5 +2,4 @@
 permalink: "/custom_components/index.xml"
 ---
 
-{% set hv_list_tag = "custom_components" %}
-{% include "templates/list.xml.njk" %}
+{% include "./content.xml.njk" %}
diff --git a/demo/backend/advanced/index.xml.njk b/demo/backend/advanced/index.xml.njk
index 19b8660ff..23949ea05 100644
--- a/demo/backend/advanced/index.xml.njk
+++ b/demo/backend/advanced/index.xml.njk
@@ -16,10 +16,10 @@ hv_button_behavior: "none"
   )
   }}
   {% call tab("tab-case-studies") -%}
-    {% include "./case-studies/index.xml.njk" %}
+    {% include "./case-studies/content.xml.njk" %}
   {%- endcall %}
   {% call tab("tab-custom-components") -%}
-    {% include "./custom-components/index.xml.njk" %}
+    {% include "./custom-components/content.xml.njk" %}
   {%- endcall %}
   <behavior
     action="set-value"
diff --git a/demo/backend/behaviors/advanced/content.xml.njk b/demo/backend/behaviors/advanced/content.xml.njk
new file mode 100644
index 000000000..c49be1cd2
--- /dev/null
+++ b/demo/backend/behaviors/advanced/content.xml.njk
@@ -0,0 +1,2 @@
+{% set hv_list_tag = "advanced" %}
+{% include "templates/list.xml.njk" %}
diff --git a/demo/backend/behaviors/advanced/index.xml.njk b/demo/backend/behaviors/advanced/index.xml.njk
index 2ca8d0db4..363ce95a5 100644
--- a/demo/backend/behaviors/advanced/index.xml.njk
+++ b/demo/backend/behaviors/advanced/index.xml.njk
@@ -4,5 +4,4 @@ hv_title: "Advanced"
 hv_button_behavior: "back"
 ---
 
-{% set hv_list_tag = "advanced" %}
-{% include "templates/list.xml.njk" %}
+{% include "./content.xml.njk" %}
diff --git a/demo/backend/behaviors/advanced/scroll/list/list-content.xml.njk b/demo/backend/behaviors/advanced/scroll/list/list-content.xml.njk
index 279379566..4151c99e6 100644
--- a/demo/backend/behaviors/advanced/scroll/list/list-content.xml.njk
+++ b/demo/backend/behaviors/advanced/scroll/list/list-content.xml.njk
@@ -1,6 +1,3 @@
----
-permalink: "/behaviors/advanced/scroll/list/list-content.xml"
----
 {% from 'macros/link/index.xml.njk' import link %}
 
 {% for i in range(1, 51) %}
diff --git a/demo/backend/behaviors/advanced/scroll/section-list/section-list-content.xml.njk b/demo/backend/behaviors/advanced/scroll/section-list/section-list-content.xml.njk
index dc3a51a21..74c3f1206 100644
--- a/demo/backend/behaviors/advanced/scroll/section-list/section-list-content.xml.njk
+++ b/demo/backend/behaviors/advanced/scroll/section-list/section-list-content.xml.njk
@@ -1,7 +1,3 @@
----
-permalink: "/behaviors/advanced/scroll/section-list/section-list-content.xml"
----
-
 {% from 'macros/link/index.xml.njk' import link %}
 
 <section-title style="list-header">
diff --git a/demo/backend/behaviors/basic/actions/select-all/indicator/index.xml.njk b/demo/backend/behaviors/basic/actions/select-all/indicator/index.xml.njk
index f0efd2421..0e857b02c 100644
--- a/demo/backend/behaviors/basic/actions/select-all/indicator/index.xml.njk
+++ b/demo/backend/behaviors/basic/actions/select-all/indicator/index.xml.njk
@@ -11,7 +11,6 @@
     action="select-all"
     delay="1000"
     show-during-load="show3-spinner"
-    style="Button"
     target="id_sm_indicator"
   />
   <view id="show3-spinner" hide="true">
diff --git a/demo/backend/behaviors/basic/actions/unselect-all/indicator/index.xml.njk b/demo/backend/behaviors/basic/actions/unselect-all/indicator/index.xml.njk
index c4bc53744..abbd228b5 100644
--- a/demo/backend/behaviors/basic/actions/unselect-all/indicator/index.xml.njk
+++ b/demo/backend/behaviors/basic/actions/unselect-all/indicator/index.xml.njk
@@ -11,7 +11,6 @@
     action="unselect-all"
     delay="1000"
     show-during-load="show3-spinner"
-    style="Button"
     target="id_sm_indicator"
   />
   <view id="show3-spinner" hide="true">
diff --git a/demo/backend/behaviors/basic/content.xml.njk b/demo/backend/behaviors/basic/content.xml.njk
new file mode 100644
index 000000000..1681bf092
--- /dev/null
+++ b/demo/backend/behaviors/basic/content.xml.njk
@@ -0,0 +1,2 @@
+{% set hv_section_list_tag = "Actions,Triggers,Target,Indicators,Fragments,Once" %}
+{% include "templates/section-list.xml.njk" %}
diff --git a/demo/backend/behaviors/basic/index.xml.njk b/demo/backend/behaviors/basic/index.xml.njk
index 8a1ca7bdc..74d200444 100644
--- a/demo/backend/behaviors/basic/index.xml.njk
+++ b/demo/backend/behaviors/basic/index.xml.njk
@@ -4,5 +4,4 @@ hv_title: "Basic"
 hv_button_behavior: "back"
 ---
 
-{% set hv_section_list_tag = "Actions,Triggers,Target,Indicators,Fragments,Once" %}
-{% include "templates/section-list.xml.njk" %}
+{% include "./content.xml.njk" %}
diff --git a/demo/backend/behaviors/content.xml.njk b/demo/backend/behaviors/content.xml.njk
new file mode 100644
index 000000000..73d28b60c
--- /dev/null
+++ b/demo/backend/behaviors/content.xml.njk
@@ -0,0 +1,22 @@
+{% extends 'templates/tab-route.xml.njk' %}
+{% from 'macros/tab/index.xml.njk' import tab, tab_bar %}
+
+{% block tab_route_content %}
+  {{ tab_bar([
+  {label: "Advanced", id: "tab-advanced"},
+  {label: "Basic", id: "tab-basic"}
+  ]) }}
+  {% call tab("tab-advanced") -%}
+    {% include "./advanced/content.xml.njk" %}
+  {%- endcall %}
+  {% call tab("tab-basic") -%}
+    {% include "./basic/content.xml.njk" %}
+  {%- endcall %}
+  <behavior
+    action="set-value"
+    new-value="tab-advanced"
+    once="true"
+    trigger="load"
+    target="tab-bar"
+  />
+{% endblock %}
diff --git a/demo/backend/behaviors/index.xml.njk b/demo/backend/behaviors/index.xml.njk
index 30e433341..a13b2f194 100644
--- a/demo/backend/behaviors/index.xml.njk
+++ b/demo/backend/behaviors/index.xml.njk
@@ -4,25 +4,4 @@ hv_title: "Behaviors"
 hv_tab_id: "behaviors"
 hv_button_behavior: "none"
 ---
-{% extends 'templates/tab-route.xml.njk' %}
-{% from 'macros/tab/index.xml.njk' import tab, tab_bar %}
-
-{% block tab_route_content %}
-  {{ tab_bar([
-  {label: "Advanced", id: "tab-advanced"},
-  {label: "Basic", id: "tab-basic"}
-  ]) }}
-  {% call tab("tab-advanced") -%}
-    {% include "./advanced/index.xml.njk" %}
-  {%- endcall %}
-  {% call tab("tab-basic") -%}
-    {% include "./basic/index.xml.njk" %}
-  {%- endcall %}
-  <behavior
-    action="set-value"
-    new-value="tab-advanced"
-    once="true"
-    trigger="load"
-    target="tab-bar"
-  />
-{% endblock %}
+{% include './content.xml.njk' %}
diff --git a/demo/backend/navigation/actions/content.xml.njk b/demo/backend/navigation/actions/content.xml.njk
new file mode 100644
index 000000000..d3f2bb670
--- /dev/null
+++ b/demo/backend/navigation/actions/content.xml.njk
@@ -0,0 +1,2 @@
+{% set hv_list_tag = "actions" %}
+{% include "templates/list.xml.njk" %}
diff --git a/demo/backend/navigation/actions/index.xml.njk b/demo/backend/navigation/actions/index.xml.njk
index 2e68e06db..2fa33da89 100644
--- a/demo/backend/navigation/actions/index.xml.njk
+++ b/demo/backend/navigation/actions/index.xml.njk
@@ -3,4 +3,4 @@ permalink: "/navigation/actions/index.xml"
 ---
 
 {% set hv_list_tag = "actions" %}
-{% include "templates/list.xml.njk" %}
+{% include "./content.xml.njk" %}
diff --git a/demo/backend/navigation/index.xml.njk b/demo/backend/navigation/index.xml.njk
index d6196f8ce..42b45aafc 100644
--- a/demo/backend/navigation/index.xml.njk
+++ b/demo/backend/navigation/index.xml.njk
@@ -13,10 +13,10 @@ hv_button_behavior: "none"
   {label: "Navigator", id: "tab-navigator"}
   ]) }}
   {% call tab("tab-actions") -%}
-    {% include "./actions/index.xml.njk" %}
+    {% include "./actions/content.xml.njk" %}
   {%- endcall %}
   {% call tab("tab-navigator") -%}
-    {% include "./navigator/index.xml.njk" %}
+    {% include "./navigator/content.xml.njk" %}
   {%- endcall %}
   <behavior
     action="set-value"
diff --git a/demo/backend/navigation/navigator/bottom-tabs/index.xml.njk b/demo/backend/navigation/navigator/bottom-tabs/index.xml.njk
index b3c0ff991..b37a26583 100644
--- a/demo/backend/navigation/navigator/bottom-tabs/index.xml.njk
+++ b/demo/backend/navigation/navigator/bottom-tabs/index.xml.njk
@@ -7,7 +7,7 @@ hv_button_behavior: "back"
 {# Example tab navigator inside a stack navigator #}
 <doc xmlns="https://hyperview.org/hyperview">
   <navigator id="custom-stack" type="stack">
-    <nav-route id="custom-bottom-tabs-route" href="">
+    <nav-route id="custom-bottom-tabs-route">
       <navigator id="custom-bottom-tabs-navigator" type="tab">
         <nav-route id="custom-bottom-tabs-tab-1" href="/hyperview/public/navigation/navigator/bottom-tabs/tab-1.xml"/>
         <nav-route id="custom-bottom-tabs-tab-2" href="/hyperview/public/navigation/navigator/bottom-tabs/tab-2.xml"/>
diff --git a/demo/backend/navigation/navigator/bottom-tabs/tab-1.xml.njk b/demo/backend/navigation/navigator/bottom-tabs/tab-1.xml.njk
index 60da73d3e..c47632ab2 100644
--- a/demo/backend/navigation/navigator/bottom-tabs/tab-1.xml.njk
+++ b/demo/backend/navigation/navigator/bottom-tabs/tab-1.xml.njk
@@ -9,7 +9,7 @@ hv_button_behavior: "back"
 {% block container %}
   {{ description('This is the content for tab 1.') }}
   <navigation:bottom-tab-bar
-    xmlns:navigation="https://instawork.com/hyperview-navigation"
+    xmlns:navigation="https://hyperview.org/navigation"
     navigation:navigator="custom-bottom-tabs-navigator"
   >
     <select-single style="tabbar-bottom" name="custom-tab-bar">
diff --git a/demo/backend/navigation/navigator/bottom-tabs/tab-2.xml.njk b/demo/backend/navigation/navigator/bottom-tabs/tab-2.xml.njk
index 6ffdbd7b3..0f8559626 100644
--- a/demo/backend/navigation/navigator/bottom-tabs/tab-2.xml.njk
+++ b/demo/backend/navigation/navigator/bottom-tabs/tab-2.xml.njk
@@ -9,7 +9,7 @@ hv_button_behavior: "back"
 {% block container %}
   {{ description('This is the content for tab 2.') }}
   <navigation:bottom-tab-bar
-    xmlns:navigation="https://instawork.com/hyperview-navigation"
+    xmlns:navigation="https://hyperview.org/navigation"
     navigation:navigator="custom-bottom-tabs-navigator"
   >
     <select-single style="tabbar-bottom" name="custom-tab-bar">
diff --git a/demo/backend/navigation/navigator/content.xml.njk b/demo/backend/navigation/navigator/content.xml.njk
new file mode 100644
index 000000000..f3c0f9527
--- /dev/null
+++ b/demo/backend/navigation/navigator/content.xml.njk
@@ -0,0 +1,2 @@
+{% set hv_list_tag = "navigator" %}
+{% include "templates/list.xml.njk" %}
diff --git a/demo/backend/navigation/navigator/index.xml.njk b/demo/backend/navigation/navigator/index.xml.njk
index ec8c0097e..2d0a1ccb5 100644
--- a/demo/backend/navigation/navigator/index.xml.njk
+++ b/demo/backend/navigation/navigator/index.xml.njk
@@ -2,5 +2,4 @@
 permalink: "/navigation/navigator/index.xml"
 ---
 
-{% set hv_list_tag = "navigator" %}
-{% include "templates/list.xml.njk" %}
+{% include "./content.xml.njk" %}
diff --git a/demo/backend/navigation/navigator/simple-tab/index.xml.njk b/demo/backend/navigation/navigator/simple-tab/index.xml.njk
index 6c9fdab81..56218f4a2 100644
--- a/demo/backend/navigation/navigator/simple-tab/index.xml.njk
+++ b/demo/backend/navigation/navigator/simple-tab/index.xml.njk
@@ -7,7 +7,7 @@ hv_button_behavior: "back"
 {# Example tab navigator inside a stack navigator #}
 <doc xmlns="https://hyperview.org/hyperview">
   <navigator id="top-stack" type="stack">
-    <nav-route id="tabs-route" href="">
+    <nav-route id="tabs-route">
       <navigator id="simple-tab-navigator" type="tab">
         <nav-route id="tab-1" href="/hyperview/public/navigation/navigator/simple-tab/tab-1.xml"/>
         <nav-route id="tab-2" href="/hyperview/public/navigation/navigator/simple-tab/tab-2.xml"/>
diff --git a/demo/backend/ui/index.xml.njk b/demo/backend/ui/index.xml.njk
index 781e7197b..439135407 100644
--- a/demo/backend/ui/index.xml.njk
+++ b/demo/backend/ui/index.xml.njk
@@ -13,10 +13,10 @@ hv_button_behavior: "none"
   {label: "UI Elements", id: "tab-ui-elements"}
   ]) }}
   {% call tab("tab-styling") -%}
-    {% include "./styling/index.xml.njk" %}
+    {% include "./styling/content.xml.njk" %}
   {%- endcall %}
   {% call tab("tab-ui-elements") -%}
-    {% include "./ui-elements/index.xml.njk" %}
+    {% include "./ui-elements/content.xml.njk" %}
   {%- endcall %}
   <behavior
     action="set-value"
diff --git a/demo/backend/ui/styling/content.xml.njk b/demo/backend/ui/styling/content.xml.njk
new file mode 100644
index 000000000..9198c83ba
--- /dev/null
+++ b/demo/backend/ui/styling/content.xml.njk
@@ -0,0 +1,2 @@
+{% set hv_list_tag = "styling" %}
+{% include "templates/list.xml.njk" %}
diff --git a/demo/backend/ui/styling/index.xml.njk b/demo/backend/ui/styling/index.xml.njk
index 4926f8911..5712b4aed 100644
--- a/demo/backend/ui/styling/index.xml.njk
+++ b/demo/backend/ui/styling/index.xml.njk
@@ -4,5 +4,4 @@ hv_title: "Styling"
 hv_button_behavior: "back"
 ---
 
-{% set hv_list_tag = "styling" %}
-{% include "templates/list.xml.njk" %}
+{% include "./content.xml.njk" %}
diff --git a/demo/backend/ui/ui-elements/content.xml.njk b/demo/backend/ui/ui-elements/content.xml.njk
new file mode 100644
index 000000000..85b6febcc
--- /dev/null
+++ b/demo/backend/ui/ui-elements/content.xml.njk
@@ -0,0 +1,2 @@
+{% set hv_section_list_tag = "Forms,Image,Keyboard Avoiding View,List,Section List,Text,View,Web View" %}
+{% include "templates/section-list.xml.njk" %}
diff --git a/demo/backend/ui/ui-elements/index.xml.njk b/demo/backend/ui/ui-elements/index.xml.njk
index d8978e4f6..3d889c10b 100644
--- a/demo/backend/ui/ui-elements/index.xml.njk
+++ b/demo/backend/ui/ui-elements/index.xml.njk
@@ -4,5 +4,4 @@ hv_title: "UI Elements"
 hv_button_behavior: "back"
 ---
 
-{% set hv_section_list_tag = "Forms,Image,Keyboard Avoiding View,List,Section List,Text,View,Web View" %}
-{% include "templates/section-list.xml.njk" %}
+{% include "./content.xml.njk" %}
diff --git a/demo/backend/ui/ui-elements/web-view/html/index.xml.njk b/demo/backend/ui/ui-elements/web-view/html/index.xml.njk
index 613fd46b5..5c615b9ff 100644
--- a/demo/backend/ui/ui-elements/web-view/html/index.xml.njk
+++ b/demo/backend/ui/ui-elements/web-view/html/index.xml.njk
@@ -13,4 +13,5 @@ hv_button_behavior: "back"
 {% block container %}
   <view style="flex">
     <web-view html="&lt;h1&gt;Hello world!&lt;/h1&gt;" activity-indicator-color="red"/>
+  </view>
 {% endblock %}
diff --git a/demo/package.json b/demo/package.json
index e9dbbebd0..d7c23fb21 100644
--- a/demo/package.json
+++ b/demo/package.json
@@ -15,7 +15,7 @@
     "server": "eleventy --serve --port=8085",
     "test:lint": "eslint src && prettier --check '**/*.md' && yarn format-njk -c",
     "test:ts": "tsc",
-    "test:validate-xml": "rm -rf hyperview/public; eleventy; find hyperview/public -name '*.xml' -not -path '*/advanced/scroll/*.xml' -not -path '*/case-studies/business-rating/index.xml' -not -path '*/case-studies/business-rating/rating_save.xml' -not -path '*/case-studies/photos/comments.xml' -not -path '*/index.xml' | xargs xmlschema-validate --schema schema/hyperview.xsd --version 1.1",
+    "test:validate-xml": "rm -rf hyperview/public; eleventy; find hyperview/public -name '*.xml' -not -path 'hyperview/public/behaviors/advanced/share/index.xml' | xargs xmlschema-validate --schema schema/hyperview.xsd --version 1.1",
     "test": "yarn test:ts && yarn test:lint && yarn test:validate-xml"
   },
   "dependencies": {
diff --git a/demo/schema/hyperview.xsd b/demo/schema/hyperview.xsd
index 1a876908a..6aebe0901 100644
--- a/demo/schema/hyperview.xsd
+++ b/demo/schema/hyperview.xsd
@@ -5,6 +5,7 @@
   targetNamespace="https://hyperview.org/hyperview"
   xmlns:hv="https://hyperview.org/hyperview"
   xmlns:alert="https://hyperview.org/hyperview-alert"
+  xmlns:filter="https://hyperview.org/filter"
 >
   <xs:import
     namespace="https://hyperview.org/hyperview-alert"
@@ -41,6 +42,7 @@
         <xs:enumeration value="toggle" />
         <xs:enumeration value="set-value" />
         <xs:enumeration value="alert" />
+        <xs:enumeration value="copy-to-clipboard" />
         <xs:enumeration value="select-all" />
         <xs:enumeration value="unselect-all" />
         <xs:enumeration value="scroll" />
@@ -55,7 +57,7 @@
       <xs:attributeGroup ref="hv:behaviorAttributes" />
 
       <!-- Hyperview demo extensions -->
-      <!-- None yet, add future custom behavior attributes here -->
+      <xs:attributeGroup ref="filter:filterAttributes" />
     </xs:attributeGroup>
 
     <!-- This redefines the behavior element with our custom actions / attributes -->
diff --git a/demo/schema/navigation.xsd b/demo/schema/navigation.xsd
index caa0e9161..5d59bd913 100644
--- a/demo/schema/navigation.xsd
+++ b/demo/schema/navigation.xsd
@@ -14,7 +14,7 @@
       <xs:sequence>
         <xs:any minOccurs="1" maxOccurs="1" />
       </xs:sequence>
-      <xs:attribute name="navigator" type="hv:ID" form="unqualified" />
+      <xs:attribute name="navigator" type="xs:string" />
     </xs:complexType>
   </xs:element>
 </xs:schema>
diff --git a/demo/src/Components/BottomTabBar.tsx b/demo/src/Components/BottomTabBar.tsx
index cfca86e0d..6154fbfb6 100644
--- a/demo/src/Components/BottomTabBar.tsx
+++ b/demo/src/Components/BottomTabBar.tsx
@@ -2,7 +2,7 @@ import type { HvComponentProps, LocalName } from 'hyperview';
 import { useContext, useEffect } from 'react';
 import { BottomTabBarContext } from '../Contexts';
 
-const namespaceURI = 'https://instawork.com/hyperview-navigation';
+const namespaceURI = 'https://hyperview.org/navigation';
 
 /**
  * This component's only job is to associate its own props with a
@@ -12,7 +12,7 @@ const namespaceURI = 'https://instawork.com/hyperview-navigation';
  *
  * Usage:
  * <navigation:bottom-tab-bar
- *   xmlns:navigation="https://instawork.com/hyperview-navigation"
+ *   xmlns:navigation="https://hyperview.org/navigation"
  *   navigation:navigator="some-tab-navigator-id"
  * >
  *   ...
diff --git a/schema/core.xsd b/schema/core.xsd
index 335ee29e6..7f2fd340d 100644
--- a/schema/core.xsd
+++ b/schema/core.xsd
@@ -1139,6 +1139,11 @@
 
   <xs:element name="text-area">
     <xs:complexType>
+      <xs:sequence>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="hv:behavior" />
+        </xs:choice>
+      </xs:sequence>
       <xs:attribute name="name" use="required" type="xs:string" />
       <xs:attribute name="value" type="xs:string" />
       <xs:attribute name="placeholder" type="xs:string" />