@customviews-js/customviews 1.1.10 → 1.2.0

package/dist/custom-views.js

@@ -1,5 +1,5 @@
 /*!
- * @customviews-js/customviews v1.1.10
+ * @customviews-js/customviews v1.2.0
  * (c) 2025 Chan Ger Teck
  * Released under the MIT License.
  */
@@ -303,8 +303,124 @@
         }
     }
 
+    /**
+     * Icon utilities for CustomViews widget
+     * Centralized SVG icons for better maintainability and reusability
+     */
+    /**
+     * Settings gear icon for modal header
+     */
+    function getGearIcon() {
+        return `<svg class="cv-modal-icon-svg" fill="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <path xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" d="M12 8.00002C9.79085 8.00002 7.99999 9.79088 7.99999 12C7.99999 14.2092 9.79085 16 12 16C14.2091 16 16 14.2092 16 12C16 9.79088 14.2091 8.00002 12 8.00002ZM9.99999 12C9.99999 10.8955 10.8954 10 12 10C13.1046 10 14 10.8955 14 12C14 13.1046 13.1046 14 12 14C10.8954 14 9.99999 13.1046 9.99999 12Z" fill="#0F1729"/>
+  <path xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" d="M10.7673 1.01709C10.9925 0.999829 11.2454 0.99993 11.4516 1.00001L12.5484 1.00001C12.7546 0.99993 13.0075 0.999829 13.2327 1.01709C13.4989 1.03749 13.8678 1.08936 14.2634 1.26937C14.7635 1.49689 15.1915 1.85736 15.5007 2.31147C15.7454 2.67075 15.8592 3.0255 15.9246 3.2843C15.9799 3.50334 16.0228 3.75249 16.0577 3.9557L16.1993 4.77635L16.2021 4.77788C16.2369 4.79712 16.2715 4.81659 16.306 4.8363L16.3086 4.83774L17.2455 4.49865C17.4356 4.42978 17.6693 4.34509 17.8835 4.28543C18.1371 4.2148 18.4954 4.13889 18.9216 4.17026C19.4614 4.20998 19.9803 4.39497 20.4235 4.70563C20.7734 4.95095 21.0029 5.23636 21.1546 5.4515C21.2829 5.63326 21.4103 5.84671 21.514 6.02029L22.0158 6.86003C22.1256 7.04345 22.2594 7.26713 22.3627 7.47527C22.4843 7.7203 22.6328 8.07474 22.6777 8.52067C22.7341 9.08222 22.6311 9.64831 22.3803 10.1539C22.1811 10.5554 21.9171 10.8347 21.7169 11.0212C21.5469 11.1795 21.3428 11.3417 21.1755 11.4746L20.5 12L21.1755 12.5254C21.3428 12.6584 21.5469 12.8205 21.7169 12.9789C21.9171 13.1653 22.1811 13.4446 22.3802 13.8461C22.631 14.3517 22.7341 14.9178 22.6776 15.4794C22.6328 15.9253 22.4842 16.2797 22.3626 16.5248C22.2593 16.7329 22.1255 16.9566 22.0158 17.14L21.5138 17.9799C21.4102 18.1535 21.2828 18.3668 21.1546 18.5485C21.0028 18.7637 20.7734 19.0491 20.4234 19.2944C19.9803 19.6051 19.4613 19.7901 18.9216 19.8298C18.4954 19.8612 18.1371 19.7852 17.8835 19.7146C17.6692 19.6549 17.4355 19.5703 17.2454 19.5014L16.3085 19.1623L16.306 19.1638C16.2715 19.1835 16.2369 19.2029 16.2021 19.2222L16.1993 19.2237L16.0577 20.0443C16.0228 20.2475 15.9799 20.4967 15.9246 20.7157C15.8592 20.9745 15.7454 21.3293 15.5007 21.6886C15.1915 22.1427 14.7635 22.5032 14.2634 22.7307C13.8678 22.9107 13.4989 22.9626 13.2327 22.983C13.0074 23.0002 12.7546 23.0001 12.5484 23H11.4516C11.2454 23.0001 10.9925 23.0002 10.7673 22.983C10.5011 22.9626 10.1322 22.9107 9.73655 22.7307C9.23648 22.5032 8.80849 22.1427 8.49926 21.6886C8.25461 21.3293 8.14077 20.9745 8.07542 20.7157C8.02011 20.4967 7.97723 20.2475 7.94225 20.0443L7.80068 19.2237L7.79791 19.2222C7.7631 19.2029 7.72845 19.1835 7.69396 19.1637L7.69142 19.1623L6.75458 19.5014C6.5645 19.5702 6.33078 19.6549 6.11651 19.7146C5.86288 19.7852 5.50463 19.8611 5.07841 19.8298C4.53866 19.7901 4.01971 19.6051 3.57654 19.2944C3.2266 19.0491 2.99714 18.7637 2.84539 18.5485C2.71718 18.3668 2.58974 18.1534 2.4861 17.9798L1.98418 17.14C1.87447 16.9566 1.74067 16.7329 1.63737 16.5248C1.51575 16.2797 1.36719 15.9253 1.32235 15.4794C1.26588 14.9178 1.36897 14.3517 1.61976 13.8461C1.81892 13.4446 2.08289 13.1653 2.28308 12.9789C2.45312 12.8205 2.65717 12.6584 2.82449 12.5254L3.47844 12.0054V11.9947L2.82445 11.4746C2.65712 11.3417 2.45308 11.1795 2.28304 11.0212C2.08285 10.8347 1.81888 10.5554 1.61972 10.1539C1.36893 9.64832 1.26584 9.08224 1.3223 8.52069C1.36714 8.07476 1.51571 7.72032 1.63732 7.47528C1.74062 7.26715 1.87443 7.04347 1.98414 6.86005L2.48605 6.02026C2.58969 5.84669 2.71714 5.63326 2.84534 5.45151C2.9971 5.23637 3.22655 4.95096 3.5765 4.70565C4.01966 4.39498 4.53862 4.20999 5.07837 4.17027C5.50458 4.1389 5.86284 4.21481 6.11646 4.28544C6.33072 4.34511 6.56444 4.4298 6.75451 4.49867L7.69141 4.83775L7.69394 4.8363C7.72844 4.8166 7.7631 4.79712 7.79791 4.77788L7.80068 4.77635L7.94225 3.95571C7.97723 3.7525 8.02011 3.50334 8.07542 3.2843C8.14077 3.0255 8.25461 2.67075 8.49926 2.31147C8.80849 1.85736 9.23648 1.49689 9.73655 1.26937C10.1322 1.08936 10.5011 1.03749 10.7673 1.01709ZM14.0938 4.3363C14.011 3.85634 13.9696 3.61637 13.8476 3.43717C13.7445 3.2858 13.6019 3.16564 13.4352 3.0898C13.2378 3.00002 12.9943 3.00002 12.5073 3.00002H11.4927C11.0057 3.00002 10.7621 3.00002 10.5648 3.0898C10.3981 3.16564 10.2555 3.2858 10.1524 3.43717C10.0304 3.61637 9.98895 3.85634 9.90615 4.3363L9.75012 5.24064C9.69445 5.56333 9.66662 5.72467 9.60765 5.84869C9.54975 5.97047 9.50241 6.03703 9.40636 6.13166C9.30853 6.22804 9.12753 6.3281 8.76554 6.52822C8.73884 6.54298 8.71227 6.55791 8.68582 6.57302C8.33956 6.77078 8.16643 6.86966 8.03785 6.90314C7.91158 6.93602 7.83293 6.94279 7.70289 6.93196C7.57049 6.92094 7.42216 6.86726 7.12551 6.7599L6.11194 6.39308C5.66271 6.2305 5.43809 6.14921 5.22515 6.16488C5.04524 6.17811 4.87225 6.23978 4.72453 6.34333C4.5497 6.46589 4.42715 6.67094 4.18206 7.08103L3.72269 7.84965C3.46394 8.2826 3.33456 8.49907 3.31227 8.72078C3.29345 8.90796 3.32781 9.09665 3.41141 9.26519C3.51042 9.4648 3.7078 9.62177 4.10256 9.9357L4.82745 10.5122C5.07927 10.7124 5.20518 10.8126 5.28411 10.9199C5.36944 11.036 5.40583 11.1114 5.44354 11.2504C5.47844 11.379 5.47844 11.586 5.47844 12C5.47844 12.414 5.47844 12.621 5.44354 12.7497C5.40582 12.8887 5.36944 12.9641 5.28413 13.0801C5.20518 13.1875 5.07927 13.2876 4.82743 13.4879L4.10261 14.0643C3.70785 14.3783 3.51047 14.5352 3.41145 14.7349C3.32785 14.9034 3.29349 15.0921 3.31231 15.2793C3.33461 15.501 3.46398 15.7174 3.72273 16.1504L4.1821 16.919C4.4272 17.3291 4.54974 17.5342 4.72457 17.6567C4.8723 17.7603 5.04528 17.8219 5.2252 17.8352C5.43813 17.8508 5.66275 17.7695 6.11199 17.607L7.12553 17.2402C7.42216 17.1328 7.5705 17.0791 7.7029 17.0681C7.83294 17.0573 7.91159 17.064 8.03786 17.0969C8.16644 17.1304 8.33956 17.2293 8.68582 17.427C8.71228 17.4421 8.73885 17.4571 8.76554 17.4718C9.12753 17.6719 9.30853 17.772 9.40635 17.8684C9.50241 17.963 9.54975 18.0296 9.60765 18.1514C9.66662 18.2754 9.69445 18.4367 9.75012 18.7594L9.90615 19.6637C9.98895 20.1437 10.0304 20.3837 10.1524 20.5629C10.2555 20.7142 10.3981 20.8344 10.5648 20.9102C10.7621 21 11.0057 21 11.4927 21H12.5073C12.9943 21 13.2378 21 13.4352 20.9102C13.6019 20.8344 13.7445 20.7142 13.8476 20.5629C13.9696 20.3837 14.011 20.1437 14.0938 19.6637L14.2499 18.7594C14.3055 18.4367 14.3334 18.2754 14.3923 18.1514C14.4502 18.0296 14.4976 17.963 14.5936 17.8684C14.6915 17.772 14.8725 17.6719 15.2344 17.4718C15.2611 17.4571 15.2877 17.4421 15.3141 17.427C15.6604 17.2293 15.8335 17.1304 15.9621 17.0969C16.0884 17.064 16.167 17.0573 16.2971 17.0681C16.4295 17.0791 16.5778 17.1328 16.8744 17.2402L17.888 17.607C18.3372 17.7696 18.5619 17.8509 18.7748 17.8352C18.9547 17.8219 19.1277 17.7603 19.2754 17.6567C19.4502 17.5342 19.5728 17.3291 19.8179 16.919L20.2773 16.1504C20.536 15.7175 20.6654 15.501 20.6877 15.2793C20.7065 15.0921 20.6721 14.9034 20.5885 14.7349C20.4895 14.5353 20.2921 14.3783 19.8974 14.0643L19.1726 13.4879C18.9207 13.2876 18.7948 13.1875 18.7159 13.0801C18.6306 12.9641 18.5942 12.8887 18.5564 12.7497C18.5215 12.6211 18.5215 12.414 18.5215 12C18.5215 11.586 18.5215 11.379 18.5564 11.2504C18.5942 11.1114 18.6306 11.036 18.7159 10.9199C18.7948 10.8126 18.9207 10.7124 19.1725 10.5122L19.8974 9.9357C20.2922 9.62176 20.4896 9.46479 20.5886 9.26517C20.6722 9.09664 20.7065 8.90795 20.6877 8.72076C20.6654 8.49906 20.5361 8.28259 20.2773 7.84964L19.8179 7.08102C19.5728 6.67093 19.4503 6.46588 19.2755 6.34332C19.1277 6.23977 18.9548 6.1781 18.7748 6.16486C18.5619 6.14919 18.3373 6.23048 17.888 6.39307L16.8745 6.75989C16.5778 6.86725 16.4295 6.92093 16.2971 6.93195C16.167 6.94278 16.0884 6.93601 15.9621 6.90313C15.8335 6.86965 15.6604 6.77077 15.3142 6.57302C15.2877 6.55791 15.2611 6.54298 15.2345 6.52822C14.8725 6.3281 14.6915 6.22804 14.5936 6.13166C14.4976 6.03703 14.4502 5.97047 14.3923 5.84869C14.3334 5.72467 14.3055 5.56332 14.2499 5.24064L14.0938 4.3363Z" fill="#0F1729"/>
+</svg>`;
+    }
+    /**
+     * Close/X icon for modal close button
+     */
+    function getCloseIcon() {
+        return `<svg class="cv-modal-close-icon" fill="currentColor" height="20px" viewBox="0 0 256 256" width="20px" xmlns="http://www.w3.org/2000/svg">
+    <path d="M205.66,194.34a8,8,0,0,1-11.32,11.32L128,139.31,61.66,205.66a8,8,0,0,1-11.32-11.32L116.69,128,50.34,61.66A8,8,0,0,1,61.66,50.34L128,116.69l66.34-66.35a8,8,0,0,1,11.32,11.32L139.31,128Z"></path>
+  </svg>`;
+    }
+    /**
+     * Reset/refresh icon for reset button
+     */
+    function getResetIcon() {
+        return `<svg class="cv-btn-icon" fill="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+    <path d="M22.719 12A10.719 10.719 0 0 1 1.28 12h.838a9.916 9.916 0 1 0 1.373-5H8v1H2V2h1v4.2A10.71 10.71 0 0 1 22.719 12z"/><path fill="none" d="M0 0h24v24H0z"/>
+  </svg>`;
+    }
+    /**
+     * Copy icon for sharing URL button
+     */
+    function getCopyIcon() {
+        return `<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="18" height="18" viewBox="0 0 18 18" version="1.1" fill="currentColor">
+              <g id="surface1">
+                <path d="M 11.273438 0 L 2.546875 0 C 1.746094 0 1.089844 0.613281 1.089844
+                1.363281 L 1.089844 10.910156 L 2.546875 10.910156 L 2.546875 1.363281 L 11.273438
+                1.363281 Z M 13.453125 2.726562 L 5.453125 2.726562 C 4.65625 2.726562 4 3.339844 4
+                4.089844 L 4 13.636719 C 4 14.386719 4.65625 15 5.453125 15 L 13.453125 15 C 14.253906
+                15 14.910156 14.386719 14.910156 13.636719 L 14.910156 4.089844 C 14.910156 3.339844
+                14.253906 2.726562 13.453125 2.726562 Z M 13.453125 13.636719 L 5.453125 13.636719 L
+                5.453125 4.089844 L 13.453125 4.089844 Z M 13.453125 13.636719 "></path>
+              </g>
+          </svg>`;
+    }
+    function getTickIcon() {
+        return `<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="2 2 22 22" fill="currentColor">
+            <path d="M 19.28125 5.28125 L 9 15.5625 L 4.71875 11.28125 L 3.28125 12.71875 L 8.28125 17.71875 
+            L 9 18.40625 L 9.71875 17.71875 L 20.71875 6.71875 Z"></path>
+          </svg>`;
+    }
+    function getNavHeadingOnIcon() {
+        return `<svg xmlns="http://www.w3.org/2000/svg" width="250" height="181" viewBox="0 0 250 181">
+            <rect y="34.5001" width="250" height="146" rx="4" stroke="currentColor" stroke-width="10" fill="none"/>
+            <line x1="27" y1="62.0001" x2="77" y2="62.0001" stroke="currentColor" stroke-width="5"/>
+            <line x1="27" y1="77.8888" x2="77" y2="77.8888" stroke="currentColor" stroke-width="5"/>
+            <line x1="27" y1="97.4454" x2="221" y2="97.4454" stroke="currentColor" stroke-width="5"/>
+            <line x1="27" y1="114.555" x2="221" y2="114.555" stroke="currentColor" stroke-width="5"/>
+            <line x1="27" y1="132.889" x2="221" y2="132.889" stroke="currentColor" stroke-width="5"/>
+            <line x1="27" y1="150" x2="221" y2="150" stroke="currentColor" stroke-width="5"/>
+            <line x1="247.5" y1="43.0001" x2="247.5" y2="13.0001" stroke="currentColor" stroke-width="5" stroke-linecap="round"/>
+            <path d="M185 12.5001L247 12.5001" stroke="currentColor" stroke-width="5" stroke-linecap="round"/>
+            <line x1="204.09" y1="36.6095" x2="181.698" y2="10.0228" stroke="currentColor" stroke-width="5" stroke-linecap="round"/>
+            <path d="M125 9.50012L181 9.50012" stroke="currentColor" stroke-width="5" stroke-linecap="round"/>
+            <path d="M144.305 35.2579L120.095 6.56679" stroke="currentColor" stroke-width="5" stroke-linecap="round"/>
+            <path d="M120 6.50037L64 6.50037" stroke="currentColor" stroke-width="5" stroke-linecap="round"/>
+            <path d="M87.1957 36.1024L59 2.50008" stroke="currentColor" stroke-width="5" stroke-linecap="round"/>
+            <path d="M59 2.50037L3 2.50037" stroke="currentColor" stroke-width="5" stroke-linecap="round"/>
+            <path d="M2.5 38.5001L2.5 3.00012" stroke="currentColor" stroke-width="5" stroke-linecap="round"/>
+          </svg>`;
+    }
+    function getNavHeadingOffIcon() {
+        return `<svg xmlns="http://www.w3.org/2000/svg" width="250" height="181" viewBox="0 0 250 181" fill="currentColor">
+            <rect y="34.5001" width="250" height="146" rx="4" stroke="currentColor" stroke-width="10" fill="none"/>
+            <line x1="27" y1="62" x2="77" y2="62" stroke="currentColor" stroke-width="5"/>
+            <line x1="27" y1="77.8887" x2="77" y2="77.8887" stroke="currentColor" stroke-width="5"/>
+            <line x1="27" y1="97.4453" x2="221" y2="97.4453" stroke="currentColor" stroke-width="5"/>
+            <line x1="27" y1="114.555" x2="221" y2="114.555" stroke="currentColor" stroke-width="5"/>
+            <line x1="27" y1="132.889" x2="221" y2="132.889" stroke="currentColor" stroke-width="5"/>
+            <line x1="27" y1="150" x2="221" y2="150" stroke="currentColor" stroke-width="5"/>
+          </svg>`;
+    }
+    /**
+     * Transition Icon for Navigation Headings
+     */
+    function getNavDashed() {
+        return `<svg xmlns="http://www.w3.org/2000/svg" width="250" height="181" viewBox="0 0 250 181">
+            <rect y="34.5001" width="250" height="146" rx="4" stroke="currentColor" stroke-width="10" fill="none"/>
+            <line x1="27" y1="62.0001" x2="77" y2="62.0001" stroke="currentColor" stroke-width="5"/>
+            <line x1="27" y1="77.8888" x2="77" y2="77.8888" stroke="currentColor" stroke-width="5"/>
+            <line x1="27" y1="97.4454" x2="221" y2="97.4454" stroke="currentColor" stroke-width="5"/>
+            <line x1="27" y1="114.555" x2="221" y2="114.555" stroke="currentColor" stroke-width="5"/>
+            <line x1="27" y1="132.889" x2="221" y2="132.889" stroke="currentColor" stroke-width="5"/>
+            <line x1="27" y1="150" x2="221" y2="150" stroke="currentColor" stroke-width="5"/>
+            <path d="M245 37.0001V39.5001H250V37.0001H247.5H245ZM250 13.0001C250 11.6194 248.881 10.5001 247.5 10.5001C246.119 10.5001 245 11.6194 245 13.0001H247.5H250ZM250 31.0001C250 29.6194 248.881 28.5001 247.5 28.5001C246.119 28.5001 245 29.6194 245 31.0001H247.5H250ZM245 19.0001C245 20.3808 246.119 21.5001 247.5 21.5001C248.881 21.5001 250 20.3808 250 19.0001H247.5H245ZM247.5 37.0001H250V31.0001H247.5H245V37.0001H247.5ZM247.5 19.0001H250V13.0001H247.5H245V19.0001H247.5Z" fill="currentColor"/>
+            <line x1="204.09" y1="36.6095" x2="181.698" y2="10.0228" stroke="currentColor" stroke-width="5" stroke-linecap="round" stroke-dasharray="10 10"/>
+            <path d="M125 9.50012L181 9.50012" stroke="currentColor" stroke-width="5" stroke-linecap="round" stroke-dasharray="10 10"/>
+            <path d="M144.305 35.2579L120.095 6.56679" stroke="currentColor" stroke-width="5" stroke-linecap="round" stroke-dasharray="10 10"/>
+            <path d="M120 6.50037L64 6.50037" stroke="currentColor" stroke-width="5" stroke-linecap="round" stroke-dasharray="10 10"/>
+            <path d="M87.1957 36.1024L59 2.50008" stroke="currentColor" stroke-width="5" stroke-linecap="round" stroke-dasharray="10 10"/>
+            <path d="M59 2.50037L3 2.50037" stroke="currentColor" stroke-width="5" stroke-linecap="round" stroke-dasharray="10 10"/>
+            <path d="M2.5 38.5001L2.5 3.00012" stroke="currentColor" stroke-width="5" stroke-linecap="round" stroke-dasharray="10 10"/>
+            <path d="M185 12.5001L247 12.5001" stroke="currentColor" stroke-width="5" stroke-linecap="round" stroke-dasharray="10 10"/>
+          </svg>`;
+    }
+    function getPinIcon(isPinned = false) {
+        const opacity = isPinned ? '1' : '0.6'; // Optional: additional dimming effect
+        return `
+    <svg width="16" height="16" viewBox="0 0 16 16" fill="currentColor" opacity="${opacity}" xmlns="http://www.w3.org/2000/svg">
+      <g transform="rotate(45 8 8)">
+        <path d="M10.5 2H12V0H4V2H5.5V6L4 7.5V9H7.2V15H8.8V9H12V7.5L10.5 6V2Z"/>
+      </g>
+    </svg>
+  `.trim();
+    }
+
     // Constants for selectors
-    const TABGROUP_SELECTOR = 'cv-tabgroup';
+    const TABGROUP_SELECTOR$1 = 'cv-tabgroup';
     const TAB_SELECTOR = 'cv-tab';
     const NAV_AUTO_SELECTOR = 'cv-tabgroup[nav="auto"], cv-tabgroup:not([nav])';
     const NAV_CONTAINER_CLASS = 'cv-tabs-nav';
@@ -320,21 +436,34 @@
             return trimmedIds;
         }
         /**
-         * Apply tab selections to all tab groups in the DOM
+         * Apply tab selections to a given list of tab group elements
          */
-        static applySelections(rootEl, tabs, cfgGroups) {
-            // Find all cv-tabgroup elements
-            const tabGroups = rootEl.querySelectorAll(TABGROUP_SELECTOR);
+        static applyTabSelections(tabGroups, tabs, cfgGroups) {
             tabGroups.forEach((groupEl) => {
                 const groupId = groupEl.getAttribute('id');
-                if (!groupId)
-                    return;
                 // Determine the active tab for this group
-                const activeTabId = this.resolveActiveTabForGroup(groupId, tabs, cfgGroups, groupEl);
+                let activeTabId;
+                if (groupId) {
+                    activeTabId = this.resolveActiveTabForGroup(groupId, tabs, cfgGroups, groupEl);
+                }
+                else {
+                    // For standalone groups without id, activate the first tab
+                    const tabElements = Array.from(groupEl.children).filter((child) => child.tagName.toLowerCase() === TAB_SELECTOR);
+                    const firstTab = tabElements[0];
+                    if (firstTab) {
+                        const firstTabId = firstTab.getAttribute('id') || firstTab.getAttribute('data-cv-internal-id') || '';
+                        const splitIds = this.splitTabIds(firstTabId);
+                        activeTabId = splitIds[0] || null;
+                    }
+                    else {
+                        activeTabId = null;
+                    }
+                }
                 // Apply visibility to direct child cv-tab elements only (not nested ones)
                 const tabElements = Array.from(groupEl.children).filter((child) => child.tagName.toLowerCase() === TAB_SELECTOR);
                 tabElements.forEach((tabEl) => {
-                    const tabId = tabEl.getAttribute('id');
+                    // Use id or internal id
+                    const tabId = tabEl.getAttribute('id') || tabEl.getAttribute('data-cv-internal-id');
                     if (!tabId)
                         return;
                     // Split IDs and check if any match the active tab
@@ -368,7 +497,9 @@
             // 3. Fallback to first direct cv-tab child in DOM
             const firstTab = Array.from(groupEl.children).find((child) => child.tagName.toLowerCase() === TAB_SELECTOR);
             if (firstTab) {
-                const splitIds = this.splitTabIds(firstTab.getAttribute('id') || '');
+                // Use id or internal id
+                const tabId = firstTab.getAttribute('id') || firstTab.getAttribute('data-cv-internal-id') || '';
+                const splitIds = this.splitTabIds(tabId);
                 return splitIds[0] || null;
             }
             return null;
@@ -410,15 +541,23 @@
             };
         }
         /**
-         * Build navigation for tab groups with nav="auto" (one-time setup)
+         * Build navigation for tab groups (one-time setup)
          */
-        static buildNavs(rootEl, cfgGroups, onTabClick, onTabDoubleClick) {
-            // Find all cv-tabgroup elements with nav="auto" or no nav attribute
-            const tabGroups = rootEl.querySelectorAll(NAV_AUTO_SELECTOR);
+        static buildNavs(tabGroups, cfgGroups, onTabClick, onTabDoubleClick) {
+            const rootEl = document.body; // Needed for NAV_HIDE_ROOT_CLASS check
             tabGroups.forEach((groupEl) => {
-                const groupId = groupEl.getAttribute('id');
-                if (!groupId)
+                // Prevent re-initialization
+                if (groupEl.hasAttribute('data-cv-initialized')) {
                     return;
+                }
+                groupEl.setAttribute('data-cv-initialized', 'true');
+                // Filter to only build for groups with nav="auto" or no nav attribute
+                if (!groupEl.matches(NAV_AUTO_SELECTOR)) {
+                    return;
+                }
+                const groupId = groupEl.getAttribute('id') || null;
+                // Note: groupId can be null for standalone tabgroups
+                // These won't sync with other groups or persist state
                 // Check if nav already exists - if so, skip building
                 let navContainer = groupEl.querySelector(`.${NAV_CONTAINER_CLASS}`);
                 if (navContainer)
@@ -442,10 +581,13 @@
                 }
                 groupEl.insertBefore(navContainer, groupEl.firstChild);
                 // Build nav items
-                tabElements.forEach((tabEl) => {
-                    const rawTabId = tabEl.getAttribute('id');
-                    if (!rawTabId)
-                        return;
+                tabElements.forEach((tabEl, index) => {
+                    let rawTabId = tabEl.getAttribute('id');
+                    // If tab has no id, generate one based on position
+                    if (!rawTabId) {
+                        rawTabId = `${groupId}-tab-${index}`;
+                        tabEl.setAttribute('data-cv-internal-id', rawTabId);
+                    }
                     const splitIds = this.splitTabIds(rawTabId);
                     // If multiple IDs, use the first as primary
                     const tabId = splitIds[0] || rawTabId;
@@ -463,8 +605,19 @@
                             header = headerAttr;
                         }
                         else {
-                            // Use config label or id as fallback
-                            header = this.getTabLabel(tabId, groupId, cfgGroups) || tabId || '';
+                            // Use config label if available (only if group has an id)
+                            const configLabel = groupId ? this.getTabLabel(tabId, groupId, cfgGroups) : null;
+                            if (configLabel) {
+                                header = configLabel;
+                            }
+                            else if (tabEl.getAttribute('id')) {
+                                // Use the original id if it exists
+                                header = tabId;
+                            }
+                            else {
+                                // Auto-generate label for tabs without id (Tab 1, Tab 2, etc.)
+                                header = `Tab ${index + 1}`;
+                            }
                         }
                     }
                     // Create a single nav link for this tab element
@@ -472,14 +625,30 @@
                     listItem.className = 'nav-item';
                     const navLink = document.createElement('a');
                     navLink.className = 'nav-link';
-                    navLink.innerHTML = header;
                     navLink.href = '#';
                     navLink.setAttribute('data-tab-id', tabId);
                     navLink.setAttribute('data-raw-tab-id', rawTabId);
-                    navLink.setAttribute('data-group-id', groupId);
+                    if (groupId) {
+                        navLink.setAttribute('data-group-id', groupId);
+                    }
                     navLink.setAttribute('role', 'tab');
+                    // Create header container with text and pin icon
+                    const headerContainer = document.createElement('span');
+                    headerContainer.className = 'cv-tab-header-container';
+                    const headerText = document.createElement('span');
+                    headerText.className = 'cv-tab-header-text';
+                    headerText.innerHTML = header;
+                    const pinIcon = document.createElement('span');
+                    pinIcon.className = 'cv-tab-pin-icon';
+                    pinIcon.innerHTML = getPinIcon(true);
+                    pinIcon.style.display = 'none'; // Hidden by default
+                    headerContainer.appendChild(headerText);
+                    headerContainer.appendChild(pinIcon);
+                    navLink.appendChild(headerContainer);
                     // Check if any of the split IDs is active
-                    const activeTabId = this.resolveActiveTabForGroup(groupId, {}, cfgGroups, groupEl); // Pass empty tabs for initial state
+                    const activeTabId = groupId
+                        ? this.resolveActiveTabForGroup(groupId, {}, cfgGroups, groupEl)
+                        : (index === 0 ? tabId : null); // For standalone groups, activate first tab
                     const isActive = splitIds.includes(activeTabId || '');
                     if (isActive) {
                         navLink.classList.add('active');
@@ -492,15 +661,14 @@
                     if (onTabClick) {
                         navLink.addEventListener('click', (e) => {
                             e.preventDefault();
-                            // console.log("Single-click detected");
-                            onTabClick(groupId, tabId, groupEl);
+                            // For standalone groups (no groupId), use empty string
+                            onTabClick(groupId || '', tabId, groupEl);
                         });
                     }
-                    // Add double-click handler for sync
-                    if (onTabDoubleClick) {
+                    // Add double-click handler for sync (only for groups with id)
+                    if (onTabDoubleClick && groupId) {
                         navLink.addEventListener('dblclick', (e) => {
                             e.preventDefault();
-                            // console.log("Double-click detected");
                             onTabDoubleClick(groupId, tabId, groupEl);
                         });
                     }
@@ -590,8 +758,7 @@
         /**
          * Update active states for all tab groups based on current state
          */
-        static updateAllNavActiveStates(rootEl, tabs, cfgGroups) {
-            const tabGroups = rootEl.querySelectorAll(TABGROUP_SELECTOR);
+        static updateAllNavActiveStates(tabGroups, tabs, cfgGroups) {
             tabGroups.forEach((groupEl) => {
                 const groupId = groupEl.getAttribute('id');
                 if (!groupId)
@@ -627,7 +794,8 @@
         static applyTabLocalOnly(groupEl, activeTabId) {
             const tabElements = Array.from(groupEl.children).filter((child) => child.tagName.toLowerCase() === TAB_SELECTOR);
             tabElements.forEach((tabEl) => {
-                const tabId = tabEl.getAttribute('id');
+                // Use id or internal id
+                const tabId = tabEl.getAttribute('id') || tabEl.getAttribute('data-cv-internal-id');
                 if (!tabId)
                     return;
                 const splitIds = this.splitTabIds(tabId);
@@ -642,7 +810,8 @@
         static groupHasTab(groupEl, tabId) {
             const tabElements = Array.from(groupEl.children).filter((child) => child.tagName.toLowerCase() === TAB_SELECTOR);
             return tabElements.some((tabEl) => {
-                const idAttr = tabEl.getAttribute('id') || '';
+                // Use id or internal id
+                const idAttr = tabEl.getAttribute('id') || tabEl.getAttribute('data-cv-internal-id') || '';
                 const splitIds = this.splitTabIds(idAttr);
                 return splitIds.includes(tabId);
             });
@@ -652,7 +821,7 @@
          */
         static getTabgroupsWithId(rootEl, sourceGroupId, tabId) {
             const syncedGroupEls = [];
-            const allGroupEls = Array.from(rootEl.querySelectorAll(`${TABGROUP_SELECTOR}[id="${sourceGroupId}"]`));
+            const allGroupEls = Array.from(rootEl.querySelectorAll(`${TABGROUP_SELECTOR$1}[id="${sourceGroupId}"]`));
             allGroupEls.forEach((targetGroupEl) => {
                 // Only sync if target group actually contains this tab
                 if (this.groupHasTab(targetGroupEl, tabId)) {
@@ -661,6 +830,35 @@
             });
             return syncedGroupEls;
         }
+        /**
+         * Update pin icon visibility for all tab groups based on current state.
+         * Shows pin icon for tabs that are in the persisted state (i.e., have been double-clicked).
+          */
+        static updatePinIcons(tabGroups, tabs) {
+            tabGroups.forEach((groupEl) => {
+                const groupId = groupEl.getAttribute('id');
+                if (!groupId)
+                    return;
+                const persistedTabId = tabs[groupId];
+                // Find all nav links in this group
+                const navLinks = groupEl.querySelectorAll('.nav-link');
+                navLinks.forEach((link) => {
+                    const rawTabId = link.getAttribute('data-raw-tab-id');
+                    const pinIcon = link.querySelector('.cv-tab-pin-icon');
+                    if (!pinIcon || !rawTabId)
+                        return;
+                    // Check if persisted tab ID matches any of the split IDs (for multi-ID tabs)
+                    const splitIds = this.splitTabIds(rawTabId);
+                    const shouldShowPin = persistedTabId && splitIds.includes(persistedTabId);
+                    if (shouldShowPin) {
+                        pinIcon.style.display = 'inline-block';
+                    }
+                    else {
+                        pinIcon.style.display = 'none';
+                    }
+                });
+            });
+        }
     }
 
     class AssetsManager {
@@ -786,33 +984,31 @@
         }
     }
 
-    // Constants for selectors
-    const TOGGLE_DATA_SELECTOR = "[data-cv-toggle], [data-customviews-toggle]";
-    const TOGGLE_ELEMENT_SELECTOR = "cv-toggle";
-    const TOGGLE_SELECTOR = `${TOGGLE_DATA_SELECTOR}, ${TOGGLE_ELEMENT_SELECTOR}`;
     /**
      * ToggleManager handles discovery, visibility, and asset rendering for toggle elements
      */
     class ToggleManager {
         /**
-         * Apply toggle visibility to all toggle elements in the DOM
+         * Apply toggle visibility to a given list of toggle elements
          */
-        static applyToggles(rootEl, activeToggles) {
-            rootEl.querySelectorAll(TOGGLE_SELECTOR).forEach(el => {
+        static applyToggles(elements, activeToggles) {
+            elements.forEach(el => {
                 const categories = this.getToggleCategories(el);
                 const shouldShow = categories.some(cat => activeToggles.includes(cat));
                 this.applyToggleVisibility(el, shouldShow);
             });
         }
         /**
-         * Render assets into toggle elements that are currently visible
+         * Render assets into a given list of toggle elements that are currently visible
          */
-        static renderAssets(rootEl, activeToggles, assetsManager) {
-            rootEl.querySelectorAll(TOGGLE_SELECTOR).forEach(el => {
+        static renderAssets(elements, activeToggles, assetsManager) {
+            elements.forEach(el => {
                 const categories = this.getToggleCategories(el);
                 const toggleId = this.getToggleId(el);
-                if (toggleId && categories.some(cat => activeToggles.includes(cat))) {
+                const isRendered = el.dataset.cvRendered === 'true';
+                if (toggleId && !isRendered && categories.some(cat => activeToggles.includes(cat))) {
                     renderAssetInto(el, toggleId, assetsManager);
+                    el.dataset.cvRendered = 'true';
                 }
             });
         }
@@ -848,193 +1044,329 @@
                 el.classList.remove('cv-visible');
             }
         }
+        /**
+         * Scans a given DOM subtree for toggle elements and initializes them.
+         * This includes applying visibility and rendering assets.
+         */
+        static initializeToggles(root, activeToggles, assetsManager) {
+            const elements = [];
+            if (root.matches('[data-cv-toggle], [data-customviews-toggle], cv-toggle')) {
+                elements.push(root);
+            }
+            root.querySelectorAll('[data-cv-toggle], [data-customviews-toggle], cv-toggle').forEach(el => elements.push(el));
+            if (elements.length === 0)
+                return;
+            this.applyToggles(elements, activeToggles);
+            this.renderAssets(elements, activeToggles, assetsManager);
+        }
+    }
+
+    // src/utils/scroll-manager.ts
+    class ScrollManager {
+        /**
+         * Finds the highest tab group currently in the viewport.
+         * This is intended to be called BEFORE the state changes, to identify which element to scroll to.
+         * @returns The HTMLElement of the highest visible tab group, or null if none are found.
+         */
+        static findHighestVisibleTabGroup() {
+            // console.log('[ScrollManager] Finding highest visible tab group.');
+            // 1. Detect fixed/sticky header and calculate its height for offset.
+            let headerOffset = 0;
+            const headerEl = document.querySelector('header');
+            let isHeaderFixedOrSticky = false;
+            if (headerEl) {
+                const headerStyle = window.getComputedStyle(headerEl);
+                isHeaderFixedOrSticky = ['fixed', 'sticky'].includes(headerStyle.position);
+                if (isHeaderFixedOrSticky) {
+                    headerOffset = headerEl.getBoundingClientRect().height;
+                }
+            }
+            const contentTop = headerOffset; // Viewport-relative position where content begins.
+            // 2. Find all tab groups, filtering out any inside the main header.
+            const allTabGroups = Array.from(document.querySelectorAll('cv-tabgroup'));
+            const candidateGroups = allTabGroups.filter(groupEl => {
+                if (isHeaderFixedOrSticky && headerEl && groupEl.closest('header') === headerEl) {
+                    return false;
+                }
+                return true;
+            });
+            // 3. Find the highest group that is visible in the content area (below the header).
+            let highestVisibleGroup = null;
+            let highestVisibleGroupTop = Infinity;
+            for (const groupEl of candidateGroups) {
+                const rect = groupEl.getBoundingClientRect();
+                // A group is "visible" if it's not completely above the content area or completely below the viewport.
+                const isVisibleInContentArea = rect.bottom > contentTop && rect.top < window.innerHeight;
+                if (isVisibleInContentArea) {
+                    // We want the one with the smallest 'top' value (closest to the top of the viewport).
+                    if (rect.top < highestVisibleGroupTop) {
+                        highestVisibleGroup = groupEl;
+                        highestVisibleGroupTop = rect.top;
+                    }
+                }
+            }
+            return highestVisibleGroup;
+        }
+        /**
+         * Scrolls the page to align the given tab group's header (or the group itself)
+         * to the top of the viewport, accounting for a fixed/sticky page header.
+         * This should be called AFTER the content has changed.
+         * @param groupEl The tab group element to scroll to.
+         */
+        static scrollToTabGroup(groupEl) {
+            // console.log('[ScrollManager] Scrolling to tab group:', groupEl);
+            // 1. Detect fixed/sticky header and calculate its height for offset.
+            let headerOffset = 0;
+            const headerEl = document.querySelector('header');
+            if (headerEl) {
+                const headerStyle = window.getComputedStyle(headerEl);
+                if (['fixed', 'sticky'].includes(headerStyle.position)) {
+                    headerOffset = headerEl.getBoundingClientRect().height;
+                }
+            }
+            const PADDING_BELOW_HEADER = 20; // Extra space.
+            // 2. Calculate the target position.
+            const targetElementRect = groupEl.getBoundingClientRect();
+            // Calculate the absolute top position of the target element in the document.
+            const scrollTargetY = targetElementRect.top + window.scrollY;
+            // Adjust for the header offset and padding to position it just below the header.
+            const finalScrollY = scrollTargetY - headerOffset - PADDING_BELOW_HEADER;
+            // change to 'auto' if instant scroll is preferred.
+            window.scrollTo({
+                top: finalScrollY,
+                behavior: 'smooth',
+            });
+        }
+        /**
+         * Adjusts the scroll position to keep a specific element in the same visual location
+         * after a content change. This is useful for preventing the page from jumping when
+         * content above the element is added or removed.
+         * @param scrollAnchor An object containing the element to anchor and its initial top position.
+         */
+        static handleScrollAnchor(scrollAnchor) {
+            requestAnimationFrame(() => {
+                const { element, top: initialTop } = scrollAnchor;
+                const newTop = element.getBoundingClientRect().top;
+                const scrollDelta = newTop - initialTop;
+                // Only scroll if there's a noticeable change to avoid jitter
+                if (Math.abs(scrollDelta) > 1) {
+                    window.scrollBy({
+                        top: scrollDelta,
+                        behavior: 'instant'
+                    });
+                }
+            });
+        }
     }
 
     /**
      * Styles for toggle visibility and animations
      */
-    const TOGGLE_STYLES = `
-/* Core toggle visibility transitions */
-[data-cv-toggle], [data-customviews-toggle], cv-toggle {
-  transition: opacity 150ms ease,
-              transform 150ms ease,
-              max-height 200ms ease,
-              margin 150ms ease;
-  will-change: opacity, transform, max-height, margin;
-}
-
-.cv-visible {
-  opacity: 1 !important;
-  transform: translateY(0) !important;
-  max-height: var(--cv-max-height, 9999px) !important;
-}
-
-.cv-hidden {
-  opacity: 0 !important;
-  transform: translateY(-4px) !important;
-  pointer-events: none !important;
-  padding-top: 0 !important;
-  padding-bottom: 0 !important;
-  border-top-width: 0 !important;
-  border-bottom-width: 0 !important;
-  max-height: 0 !important;
-  margin-top: 0 !important;
-  margin-bottom: 0 !important;
-  overflow: hidden !important;
-}
+    const TOGGLE_STYLES = `
+/* Core toggle visibility transitions */
+[data-cv-toggle], [data-customviews-toggle], cv-toggle {
+  transition: opacity 150ms ease,
+              transform 150ms ease,
+              max-height 200ms ease,
+              margin 150ms ease;
+  will-change: opacity, transform, max-height, margin;
+}
+
+.cv-visible {
+  opacity: 1 !important;
+  transform: translateY(0) !important;
+  max-height: var(--cv-max-height, 9999px) !important;
+}
+
+.cv-hidden {
+  opacity: 0 !important;
+  transform: translateY(-4px) !important;
+  pointer-events: none !important;
+  padding-top: 0 !important;
+  padding-bottom: 0 !important;
+  border-top-width: 0 !important;
+  border-bottom-width: 0 !important;
+  max-height: 0 !important;
+  margin-top: 0 !important;
+  margin-bottom: 0 !important;
+  overflow: hidden !important;
+}
 `;
 
     /**
      * Styles for tab groups and tab navigation
      */
-    const TAB_STYLES = `
-/* Tab navigation styles - Bootstrap-style tabs matching MarkBind */
-.cv-tabs-nav {
-  display: flex;
-  flex-wrap: wrap;
-  padding-left: 0;
-  margin-top: 0.5rem;
-  margin-bottom: 1rem;
-  list-style: none;
-  border-bottom: 1px solid #dee2e6;
-
-  align-items: stretch;
-}
-
-.cv-tabs-nav .nav-item {
-  margin-bottom: -1px;
-  list-style: none;
-  display: flex;              /* was inline-block → make flex to stretch height */
-  align-items: stretch;       /* stretch link to full height */
-}
-
-.cv-tabs-nav .nav-link {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 0.5rem 1rem;
-  color: #495057;
-  text-decoration: none;
-  background-color: transparent;
-  border: 1px solid transparent;
-  border-top-left-radius: 0.25rem;
-  border-top-right-radius: 0.25rem;
-  transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out;
-  cursor: pointer;
-  min-height: 2.5rem;
-  box-sizing: border-box;
-}
-
-.cv-tabs-nav .nav-link p {
-  margin: 0; /* remove default margins */
-  display: inline; /* or inline-block */
-}
-
-.cv-tabs-nav .nav-link:hover,
-.cv-tabs-nav .nav-link:focus {
-  border-color: #e9ecef #e9ecef #dee2e6;
-  isolation: isolate;
-}
-
-.cv-tabs-nav .nav-link.active {
-  color: #495057;
-  background-color: #fff;
-  border-color: #dee2e6 #dee2e6 #fff;
-}
-
-.cv-tabs-nav .nav-link:focus {
-  outline: 0;
-  box-shadow: 0 0 0 0.25rem rgba(13, 110, 253, 0.25);
-}
-
-/* Legacy button-based nav (deprecated, kept for compatibility) */
-.cv-tabs-nav-item {
-  background: none;
-  border: none;
-  border-bottom: 2px solid transparent;
-  padding: 0.5rem 1rem;
-  cursor: pointer;
-  font-size: 1rem;
-  color: #6c757d;
-  transition: color 150ms ease, border-color 150ms ease;
-}
-
-.cv-tabs-nav-item:hover {
-  color: #495057;
-  border-bottom-color: #dee2e6;
-}
-
-.cv-tabs-nav-item.active {
-  color: #007bff;
-  border-bottom-color: #007bff;
-  font-weight: 500;
-}
-
-.cv-tabs-nav-item:focus {
-  outline: 2px solid #007bff;
-  outline-offset: 2px;
-}
-
-/* Tab panel base styles */
-cv-tab {
-  display: block;
-}
-
-/* Hide cv-tab-header source element; content is extracted to nav link */
-cv-tab-header {
-  display: none !important;
-}
-
-/* Allow cv-tab-body to flow naturally */
-cv-tab-body {
-  display: block;
-}
-
-/* Override visibility for tab panels - use display instead of collapse animation */
-cv-tab.cv-hidden {
-  display: none !important;
-}
-
-cv-tab.cv-visible {
-  display: block !important;
-}
-
-cv-tabgroup {
-  display: block;
-  margin-bottom: 1.5rem;
-}
-
-/* Bottom border line for tab groups */
-.cv-tabgroup-bottom-border {
-  border-bottom: 1px solid #dee2e6;
-  margin-top: 1rem;
-}
-
-/* Tab content wrapper */
-.cv-tab-content {
-  padding: 1rem 0;
-}
-
-/* Viewer-controlled nav visibility: hide nav containers when requested */
-.cv-tabs-nav-hidden {
-  display: none !important;
-}
-
-/* Print-friendly: hide tab navigation when printing to reduce clutter */
-@media print {
-  .cv-tabs-nav {
-    display: none !important;
-  }
-}
+    const TAB_STYLES = `
+/* Tab navigation styles - Bootstrap-style tabs matching MarkBind */
+.cv-tabs-nav {
+  display: flex;
+  flex-wrap: wrap;
+  padding-left: 0;
+  margin-top: 0.5rem;
+  margin-bottom: 1rem;
+  list-style: none;
+  border-bottom: 1px solid #dee2e6;
+
+  align-items: stretch;
+}
+
+.cv-tabs-nav .nav-item {
+  margin-bottom: -1px;
+  list-style: none;
+  display: flex;              /* was inline-block → make flex to stretch height */
+  align-items: stretch;       /* stretch link to full height */
+}
+
+.cv-tabs-nav .nav-link {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 0.5rem 1rem;
+  color: #495057;
+  text-decoration: none;
+  background-color: transparent;
+  border: 1px solid transparent;
+  border-top-left-radius: 0.25rem;
+  border-top-right-radius: 0.25rem;
+  transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out;
+  cursor: pointer;
+  min-height: 2.5rem;
+  box-sizing: border-box;
+}
+
+.cv-tabs-nav .nav-link p {
+  margin: 0; /* remove default margins */
+  display: inline; /* or inline-block */
+}
+
+/* Tab header container with pin icon */
+.cv-tab-header-container {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+}
+
+.cv-tab-header-text {
+  flex: 1;
+}
+
+.cv-tab-pin-icon {
+  display: inline-block;
+  line-height: 0;
+  flex-shrink: 0;
+}
+
+.cv-tab-pin-icon svg {
+  vertical-align: middle;
+  width: 14px;
+  height: 14px;
+}
+
+.cv-tabs-nav .nav-link:hover,
+.cv-tabs-nav .nav-link:focus {
+  border-color: #e9ecef #e9ecef #dee2e6;
+  isolation: isolate;
+}
+
+.cv-tabs-nav .nav-link.active {
+  color: #495057;
+  background-color: #fff;
+  border-color: #dee2e6 #dee2e6 #fff;
+}
+
+.cv-tabs-nav .nav-link:focus {
+  outline: 0;
+  box-shadow: 0 0 0 0.25rem rgba(13, 110, 253, 0.25);
+}
+
+/* Legacy button-based nav (deprecated, kept for compatibility) */
+.cv-tabs-nav-item {
+  background: none;
+  border: none;
+  border-bottom: 2px solid transparent;
+  padding: 0.5rem 1rem;
+  cursor: pointer;
+  font-size: 1rem;
+  color: #6c757d;
+  transition: color 150ms ease, border-color 150ms ease;
+}
+
+.cv-tabs-nav-item:hover {
+  color: #495057;
+  border-bottom-color: #dee2e6;
+}
+
+.cv-tabs-nav-item.active {
+  color: #007bff;
+  border-bottom-color: #007bff;
+  font-weight: 500;
+}
+
+.cv-tabs-nav-item:focus {
+  outline: 2px solid #007bff;
+  outline-offset: 2px;
+}
+
+/* Tab panel base styles */
+cv-tab {
+  display: block;
+}
+
+/* Hide cv-tab-header source element; content is extracted to nav link */
+cv-tab-header {
+  display: none !important;
+}
+
+/* Allow cv-tab-body to flow naturally */
+cv-tab-body {
+  display: block;
+}
+
+/* Override visibility for tab panels - use display instead of collapse animation */
+cv-tab.cv-hidden {
+  display: none !important;
+}
+
+cv-tab.cv-visible {
+  display: block !important;
+}
+
+cv-tabgroup {
+  display: block;
+  margin-bottom: 1.5rem;
+}
+
+/* Bottom border line for tab groups */
+.cv-tabgroup-bottom-border {
+  border-bottom: 1px solid #dee2e6;
+  margin-top: 1rem;
+}
+
+/* Tab content wrapper */
+.cv-tab-content {
+  padding: 1rem 0;
+}
+
+/* Viewer-controlled nav visibility: hide nav containers when requested */
+.cv-tabs-nav-hidden {
+  display: none !important;
+}
+
+/* Print-friendly: hide tab navigation when printing to reduce clutter */
+@media print {
+  .cv-tabs-nav {
+    display: none !important;
+  }
+}
 `;
 
     /**
      * Combined core styles for toggles and tabs
      */
-    const CORE_STYLES = `
-${TOGGLE_STYLES}
-
-${TAB_STYLES}
+    const CORE_STYLES = `
+${TOGGLE_STYLES}
+
+${TAB_STYLES}
 `;
     /**
      * Add styles for hiding and showing toggles animations and transitions to the document head
@@ -1050,11 +1382,18 @@ ${TAB_STYLES}
         document.head.appendChild(style);
     }
 
+    const TOGGLE_SELECTOR = "[data-cv-toggle], [data-customviews-toggle], cv-toggle";
+    const TABGROUP_SELECTOR = 'cv-tabgroup';
     class CustomViewsCore {
         rootEl;
         assetsManager;
         persistenceManager;
         visibilityManager;
+        observer = null;
+        componentRegistry = {
+            toggles: new Set(),
+            tabGroups: new Set(),
+        };
         config;
         stateChangeListeners = [];
         showUrlEnabled;
@@ -1068,6 +1407,57 @@ ${TAB_STYLES}
             this.showUrlEnabled = opt.showUrl ?? false;
             this.lastAppliedState = this.cloneState(this.getComputedDefaultState());
         }
+        /**
+         * Scan the given element for toggles and tab groups, register them
+         * Returns true if new components were found
+         */
+        scan(element) {
+            let newComponentsFound = false;
+            // Scan for toggles
+            const toggles = Array.from(element.querySelectorAll(TOGGLE_SELECTOR));
+            if (element.matches(TOGGLE_SELECTOR)) {
+                toggles.unshift(element);
+            }
+            toggles.forEach((toggle) => {
+                if (!this.componentRegistry.toggles.has(toggle)) {
+                    this.componentRegistry.toggles.add(toggle);
+                    newComponentsFound = true;
+                }
+            });
+            // Scan for tab groups
+            const tabGroups = Array.from(element.querySelectorAll(TABGROUP_SELECTOR));
+            if (element.matches(TABGROUP_SELECTOR)) {
+                tabGroups.unshift(element);
+            }
+            tabGroups.forEach((tabGroup) => {
+                if (!this.componentRegistry.tabGroups.has(tabGroup)) {
+                    this.componentRegistry.tabGroups.add(tabGroup);
+                    newComponentsFound = true;
+                }
+            });
+            return newComponentsFound;
+        }
+        /**
+         * Unscan the given element for toggles and tab groups, de-register them
+         */
+        unscan(element) {
+            // Unscan for toggles
+            const toggles = Array.from(element.querySelectorAll(TOGGLE_SELECTOR));
+            if (element.matches(TOGGLE_SELECTOR)) {
+                toggles.unshift(element);
+            }
+            toggles.forEach((toggle) => {
+                this.componentRegistry.toggles.delete(toggle);
+            });
+            // Unscan for tab groups
+            const tabGroups = Array.from(element.querySelectorAll(TABGROUP_SELECTOR));
+            if (element.matches(TABGROUP_SELECTOR)) {
+                tabGroups.unshift(element);
+            }
+            tabGroups.forEach((tabGroup) => {
+                this.componentRegistry.tabGroups.delete(tabGroup);
+            });
+        }
         getConfig() {
             return this.config;
         }
@@ -1102,7 +1492,7 @@ ${TAB_STYLES}
                 });
             }
             const computedState = {
-                toggles: [...(this.config.allToggles || [])],
+                toggles: this.config.toggles?.map(t => t.id) || [],
                 tabs
             };
             return computedState;
@@ -1141,14 +1531,35 @@ ${TAB_STYLES}
         // Inject styles, setup listeners and call rendering logic
         async init() {
             injectCoreStyles();
-            // Build navigation once (with click and double-click handlers)
-            TabManager.buildNavs(this.rootEl, this.config.tabGroups, 
+            this.scan(this.rootEl);
+            // Initialize all components found on initial scan
+            this.initializeNewComponents();
+            // Apply stored nav visibility preference on page load
+            const navPref = this.persistenceManager.getPersistedTabNavVisibility();
+            if (navPref !== null) {
+                TabManager.setNavsVisibility(this.rootEl, navPref);
+            }
+            // For session history, clicks on back/forward button
+            window.addEventListener("popstate", () => {
+                this.loadAndCallApplyState();
+            });
+            this.loadAndCallApplyState();
+            this.initObserver();
+        }
+        initializeNewComponents() {
+            // Build navigation for any newly added tab groups.
+            // The `data-cv-initialized` attribute in `buildNavs` prevents re-initialization.
+            TabManager.buildNavs(Array.from(this.componentRegistry.tabGroups), this.config.tabGroups, 
             // Single click: update clicked group only (local, no persistence)
             (groupId, tabId, groupEl) => {
                 this.setActiveTab(groupId, tabId, groupEl);
             }, 
             // Double click: sync across all tabgroups with same id (with persistence)
-            (groupId, tabId, _groupEl) => {
+            (groupId, tabId, groupEl) => {
+                // 1. Record position before state change
+                const navHeader = groupEl.querySelector('.cv-tabs-nav');
+                const anchorElement = navHeader instanceof HTMLElement ? navHeader : groupEl;
+                const initialTop = anchorElement.getBoundingClientRect().top;
                 const currentTabs = this.getCurrentActiveTabs();
                 currentTabs[groupId] = tabId;
                 const currentToggles = this.getCurrentActiveToggles();
@@ -1156,19 +1567,51 @@ ${TAB_STYLES}
                     toggles: currentToggles,
                     tabs: currentTabs
                 };
-                // applyState() will handle all visual updates via renderState()
-                this.applyState(newState);
+                // 2. Apply state with scroll anchor information
+                this.applyState(newState, {
+                    scrollAnchor: { element: anchorElement, top: initialTop }
+                });
             });
-            // Apply stored nav visibility preference on page load
-            const navPref = this.persistenceManager.getPersistedTabNavVisibility();
-            if (navPref !== null) {
-                TabManager.setNavsVisibility(this.rootEl, navPref);
-            }
-            // For session history, clicks on back/forward button
-            window.addEventListener("popstate", () => {
-                this.loadAndCallApplyState();
+            // Future components (e.g., toggles, widgets) can be initialized here
+        }
+        initObserver() {
+            this.observer = new MutationObserver((mutations) => {
+                let newComponentsFound = false;
+                for (const mutation of mutations) {
+                    if (mutation.type === 'childList') {
+                        mutation.addedNodes.forEach((node) => {
+                            if (node instanceof Element) {
+                                // Scan the new node for components and add them to the registry
+                                if (this.scan(node)) {
+                                    newComponentsFound = true;
+                                }
+                            }
+                        });
+                        mutation.removedNodes.forEach((node) => {
+                            if (node instanceof Element) {
+                                // Unscan the removed node to cleanup the registry
+                                this.unscan(node);
+                            }
+                        });
+                    }
+                }
+                if (newComponentsFound) {
+                    // Initialize navs for new components.
+                    this.initializeNewComponents();
+                    // Re-apply the last known state. renderState will handle disconnecting
+                    // the observer to prevent infinite loops.
+                    if (this.lastAppliedState) {
+                        this.renderState(this.lastAppliedState);
+                    }
+                }
             });
-            this.loadAndCallApplyState();
+            // Observe only the root element to avoid performance issues on large pages.
+            if (this.rootEl) {
+                this.observer.observe(this.rootEl, {
+                    childList: true,
+                    subtree: true,
+                });
+            }
         }
         // Priority: URL state > persisted state > config default > computed default
         // Also filters using the visibility manager to persist selection
@@ -1191,8 +1634,16 @@ ${TAB_STYLES}
         }
         /**
         * Apply a custom state, saves to localStorage and updates the URL
+        * Add 'source' in options to indicate the origin of the state change
+        * (e.g., 'widget' to trigger scroll behavior)
+        * Add scrollAnchor in options to maintain scroll position of a specific element
         */
-        applyState(state) {
+        applyState(state, options) {
+            // console.log(`[Core] applyState called with source: ${options?.source}`, state);
+            let groupToScrollTo = null;
+            if (options?.source === 'widget') {
+                groupToScrollTo = ScrollManager.findHighestVisibleTabGroup();
+            }
             const snapshot = this.cloneState(state);
             this.renderState(snapshot);
             this.persistenceManager.persistState(snapshot);
@@ -1202,22 +1653,46 @@ ${TAB_STYLES}
             else {
                 URLStateManager.clearURL();
             }
+            if (groupToScrollTo) {
+                // Defer scrolling until after the DOM has been updated by renderState
+                queueMicrotask(() => {
+                    ScrollManager.scrollToTabGroup(groupToScrollTo);
+                });
+            }
+            // Handle scroll anchoring for double-clicks
+            // scroll to original position after content changes
+            if (options?.scrollAnchor) {
+                ScrollManager.handleScrollAnchor(options.scrollAnchor);
+            }
         }
-        /** Render all toggles for the current state */
+        /**
+         * Renders state on components in ComponentRegistry
+         * Applies the given state.
+         * Disconnects the mutation observer during rendering to prevent loops
+         **/
         renderState(state) {
+            this.observer?.disconnect();
             this.lastAppliedState = this.cloneState(state);
             const toggles = state?.toggles || [];
             const finalToggles = this.visibilityManager.filterVisibleToggles(toggles);
+            const toggleElements = Array.from(this.componentRegistry.toggles);
+            const tabGroupElements = Array.from(this.componentRegistry.tabGroups);
             // Apply toggle visibility
-            ToggleManager.applyToggles(this.rootEl, finalToggles);
+            ToggleManager.applyToggles(toggleElements, finalToggles);
             // Render assets into toggles
-            ToggleManager.renderAssets(this.rootEl, finalToggles, this.assetsManager);
+            ToggleManager.renderAssets(toggleElements, finalToggles, this.assetsManager);
             // Apply tab selections
-            TabManager.applySelections(this.rootEl, state.tabs || {}, this.config.tabGroups);
+            TabManager.applyTabSelections(tabGroupElements, state.tabs || {}, this.config.tabGroups);
             // Update nav active states (without rebuilding)
-            TabManager.updateAllNavActiveStates(this.rootEl, state.tabs || {}, this.config.tabGroups);
+            TabManager.updateAllNavActiveStates(tabGroupElements, state.tabs || {}, this.config.tabGroups);
+            // Update pin icons to show which tabs are persisted
+            TabManager.updatePinIcons(tabGroupElements, state.tabs || {});
             // Notify state change listeners (like widgets)
             this.notifyStateChangeListeners();
+            this.observer?.observe(document.body, {
+                childList: true,
+                subtree: true,
+            });
         }
         /**
          * Reset to default state
@@ -1469,7 +1944,7 @@ ${TAB_STYLES}
             else {
                 console.error("No config provided, using minimal default config");
                 // Create a minimal default config
-                config = { allToggles: [], defaultState: {} };
+                config = { toggles: [], defaultState: {} };
             }
             const coreOptions = {
                 assetsManager,
@@ -1492,1077 +1967,1081 @@ ${TAB_STYLES}
      * Note: Styles are kept as a TypeScript string for compatibility with the build system.
      * This approach ensures the styles are properly bundled and don't require separate CSS file handling.
      */
-    const WIDGET_STYLES = `
-/* Rounded rectangle widget icon styles */
-.cv-widget-icon {
-  position: fixed;
-  /* Slightly transparent by default so the widget is subtle at the page edge */
-  background: rgba(255, 255, 255, 0.92);
-  color: rgba(0, 0, 0, 0.9);
-  opacity: 0.6;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 18px;
-  font-weight: bold;
-  cursor: pointer;
-  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
-  z-index: 9998;
-  transition: all 0.3s ease;
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
-}
-
-.cv-widget-icon:hover {
-  /* Become fully opaque on hover to improve readability */
-  background: rgba(255, 255, 255, 1);
-  color: rgba(0, 0, 0, 1);
-  opacity: 1;
-}
-
-/* Top-right: rounded end on left, sticks out leftward on hover */
-.cv-widget-top-right {
-  top: 20px;
-  right: 0;
-  border-radius: 18px 0 0 18px;
-  padding-left: 8px;
-  justify-content: flex-start;
-}
-
-/* Top-left: rounded end on right, sticks out rightward on hover */
-.cv-widget-top-left {
-  top: 20px;
-  left: 0;
-  border-radius: 0 18px 18px 0;
-  padding-right: 8px;
-  justify-content: flex-end;
-}
-
-/* Bottom-right: rounded end on left, sticks out leftward on hover */
-.cv-widget-bottom-right {
-  bottom: 20px;
-  right: 0;
-  border-radius: 18px 0 0 18px;
-  padding-left: 8px;
-  justify-content: flex-start;
-}
-
-/* Bottom-left: rounded end on right, sticks out rightward on hover */
-.cv-widget-bottom-left {
-  bottom: 20px;
-  left: 0;
-  border-radius: 0 18px 18px 0;
-  padding-right: 8px;
-  justify-content: flex-end;
-}
-
-/* Middle-left: rounded end on right, sticks out rightward on hover */
-.cv-widget-middle-left {
-  top: 50%;
-  left: 0;
-  transform: translateY(-50%);
-  border-radius: 0 18px 18px 0;
-  padding-right: 8px;
-  justify-content: flex-end;
-}
-
-/* Middle-right: rounded end on left, sticks out leftward on hover */
-.cv-widget-middle-right {
-  top: 50%;
-  right: 0;
-  transform: translateY(-50%);
-  border-radius: 18px 0 0 18px;
-  padding-left: 8px;
-  justify-content: flex-start;
-}
-
-.cv-widget-top-right,
-.cv-widget-middle-right,
-.cv-widget-bottom-right,
-.cv-widget-top-left,
-.cv-widget-middle-left,
-.cv-widget-bottom-left {
-  height: 36px;
-  width: 36px;
-}
-
-.cv-widget-middle-right:hover,
-.cv-widget-top-right:hover,
-.cv-widget-bottom-right:hover,
-.cv-widget-top-left:hover,
-.cv-widget-middle-left:hover,
-.cv-widget-bottom-left:hover {
-  width: 55px;
-}
-
-/* Modal content styles */
-.cv-widget-section {
-  margin-bottom: 16px;
-}
-
-.cv-widget-section:last-child {
-  margin-bottom: 0;
-}
-
-.cv-widget-section label {
-  display: block;
-  margin-bottom: 4px;
-  font-weight: 500;
-  color: #555;
-}
-
-.cv-widget-profile-select,
-.cv-widget-state-select {
-  width: 100%;
-  padding: 8px 12px;
-  border: 1px solid #ddd;
-  border-radius: 4px;
-  background: white;
-  font-size: 14px;
-}
-
-.cv-widget-profile-select:focus,
-.cv-widget-state-select:focus {
-  outline: none;
-  border-color: #007bff;
-  box-shadow: 0 0 0 2px rgba(0, 123, 255, 0.25);
-}
-
-.cv-widget-profile-select:disabled,
-.cv-widget-state-select:disabled {
-  background: #f8f9fa;
-  color: #6c757d;
-  cursor: not-allowed;
-}
-
-.cv-widget-current {
-  margin: 16px 0;
-  padding: 12px;
-  background: #f8f9fa;
-  border-radius: 4px;
-  border-left: 4px solid #007bff;
-}
-
-.cv-widget-current label {
-  font-size: 12px;
-  text-transform: uppercase;
-  letter-spacing: 0.5px;
-  color: #666;
-  margin-bottom: 4px;
-}
-
-.cv-widget-current-view {
-  font-weight: 500;
-  color: #333;
-}
-
-.cv-widget-reset {
-  width: 100%;
-  padding: 8px 16px;
-  background: #dc3545;
-  color: white;
-  border: none;
-  border-radius: 4px;
-  cursor: pointer;
-  font-size: 14px;
-  font-weight: 500;
-}
-
-.cv-widget-reset:hover {
-  background: #c82333;
-}
-
-.cv-widget-reset:active {
-  background: #bd2130;
-}
-
-/* Responsive design for mobile */
-@media (max-width: 768px) {
-  .cv-widget-top-right,
-  .cv-widget-top-left {
-    top: 10px;
-  }
-
-  .cv-widget-bottom-right,
-  .cv-widget-bottom-left {
-    bottom: 10px;
-  }
-
-  /* All widgets stay flush with screen edges */
-  .cv-widget-top-right,
-  .cv-widget-bottom-right,
-  .cv-widget-middle-right {
-    right: 0;
-  }
-
-  .cv-widget-top-left,
-  .cv-widget-bottom-left,
-  .cv-widget-middle-left {
-    left: 0;
-  }
-
-  /* Slightly smaller on mobile */
-  .cv-widget-icon {
-    width: 60px;
-    height: 32px;
-  }
-
-  .cv-widget-icon:hover {
-    width: 75px;
-  }
-}
-
-/* Modal styles */
-.cv-widget-modal-overlay {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background: rgba(0, 0, 0, 0.5);
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  z-index: 10002;
-  animation: fadeIn 0.2s ease;
-}
-
-@keyframes fadeIn {
-  from { opacity: 0; }
-  to { opacity: 1; }
-}
-
-.cv-widget-modal {
-  background: white;
-  border-radius: 0.75rem;
-  box-shadow: 0 25px 50px -12px rgba(0, 0, 0, 0.25);
-  max-width: 32rem;
-  width: 90vw;
-  max-height: 80vh;
-  animation: slideIn 0.2s ease;
-  display: flex;
-  flex-direction: column;
-}
-
-@keyframes slideIn {
-  from { 
-    opacity: 0;
-    transform: scale(0.9) translateY(-20px);
-  }
-  to { 
-    opacity: 1;
-    transform: scale(1) translateY(0);
-  }
-}
-
-.cv-modal-header {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 0.5rem 1rem;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-}
-
-.cv-modal-header-content {
-  display: flex;
-  align-items: center;
-  gap: 0.75rem;
-}
-
-.cv-modal-icon {
-  position: relative;
-  width: 1rem;
-  height: 1rem;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  border-radius: 9999px;
-}
-
-.cv-modal-icon-svg {
-  width: 100%;
-  height: 100%;
-  opacity: 1;
-}
-
-.cv-modal-title {
-  font-size: 1.125rem;
-  font-weight: bold;
-  color: rgba(0, 0, 0, 0.9);
-  margin: 0;
-}
-
-.cv-modal-close {
-  width: 2rem;
-  height: 2rem;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  border-radius: 9999px;
-  background: transparent;
-  border: none;
-  color: rgba(0, 0, 0, 0.6);
-  cursor: pointer;
-  transition: all 0.2s ease;
-}
-
-.cv-modal-close:hover {
-  background: rgba(62, 132, 244, 0.1);
-  color: #3e84f4;
-}
-
-.cv-modal-close-icon {
-  width: 1.25rem;
-  height: 1.25rem;
-}
-
-.cv-modal-main {
-  padding: 1rem;
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  gap: 1rem;
-  overflow-y: auto;
-  max-height: calc(80vh - 8rem);
-}
-
-.cv-modal-description {
-  font-size: 0.875rem;
-  color: rgba(0, 0, 0, 0.8);
-  margin: 0;
-  line-height: 1.4;
-}
-
-.cv-content-section,
-.cv-tab-groups-section {
-  display: flex;
-  flex-direction: column;
-  gap: 0.75rem;
-}
-
-.cv-section-heading {
-  font-size: 1rem;
-  font-weight: bold;
-  color: rgba(0, 0, 0, 0.9);
-  margin: 0;
-}
-
-.cv-widget-modal-actions {
-  margin-top: 20px;
-  padding-top: 16px;
-  border-top: 1px solid #e9ecef;
-}
-
-.cv-widget-restore {
-  width: 100%;
-  padding: 10px 16px;
-  background: #28a745;
-  color: white;
-  border: none;
-  border-radius: 4px;
-  cursor: pointer;
-  font-size: 14px;
-  font-weight: 500;
-}
-
-.cv-widget-restore:hover {
-  background: #218838;
-}
-
-.cv-widget-create-state {
-  width: 100%;
-  padding: 10px 16px;
-  background: #007bff;
-  color: white;
-  border: none;
-  border-radius: 4px;
-  cursor: pointer;
-  font-size: 14px;
-  font-weight: 500;
-  margin-bottom: 10px;
-}
-
-.cv-widget-create-state:hover {
-  background: #0056b3;
-}
-
-.cv-widget-theme-dark .cv-widget-modal {
-  background: #101722;
-  color: #e2e8f0;
-}
-
-.cv-widget-theme-dark .cv-modal-header {
-  border-color: rgba(255, 255, 255, 0.1);
-}
-
-.cv-widget-theme-dark .cv-modal-title {
-  color: #e2e8f0;
-}
-
-.cv-widget-theme-dark .cv-modal-close {
-  color: rgba(255, 255, 255, 0.6);
-}
-
-.cv-widget-theme-dark .cv-modal-close:hover {
-  background: rgba(62, 132, 244, 0.2);
-  color: #3e84f4;
-}
-
-.cv-widget-theme-dark .cv-modal-description {
-  color: rgba(255, 255, 255, 0.8);
-}
-
-.cv-widget-theme-dark .cv-section-heading {
-  color: #e2e8f0;
-}
-
-.cv-widget-theme-dark .cv-toggles-container
-.cv-widget-theme-dark .cv-tabgroups-container {
-  border-color: rgba(255, 255, 255, 0.1);
-}
-
-.cv-widget-theme-dark .cv-toggle-card,
-.cv-widget-theme-dark .cv-tabgroup-card {
-  background: #101722;
-  border-color: rgba(255, 255, 255, 0.1);
-}
-
-.cv-widget-theme-dark .cv-toggle-title,
-.cv-widget-theme-dark .cv-tabgroup-title {
-  color: #e2e8f0;
-}
-
-.cv-widget-theme-dark .cv-toggle-description,
-.cv-widget-theme-dark .cv-tabgroup-description {
-  color: rgba(255, 255, 255, 0.6);
-}
-
-.cv-widget-theme-dark .cv-toggle-slider {
-  background: rgba(255, 255, 255, 0.2);
-}
-
-.cv-widget-theme-dark .cv-tab-group-description {
-  color: rgba(255, 255, 255, 0.8);
-}
-
-.cv-widget-theme-dark .cv-tabgroup-select {
-  background: #101722;
-  border-color: rgba(255, 255, 255, 0.2);
-  color: #e2e8f0;
-}
-
-.cv-widget-theme-dark .cv-modal-footer {
-  border-color: rgba(255, 255, 255, 0.1);
-  background: #101722;
-}
-
-.cv-widget-theme-dark .cv-reset-btn {
-  color: #e2e8f0;
-  background: rgba(255, 255, 255, 0.1);
-}
-
-.cv-widget-theme-dark .cv-reset-btn:hover {
-  background: rgba(255, 255, 255, 0.2);
-}
-
-/* Custom state creator styles */
-.cv-custom-state-modal {
-  max-width: 500px;
-}
-
-.cv-custom-state-form .cv-section-header {
-  font-size: 16px;
-  font-weight: 600;
-  color: #333;
-  border-bottom: 1px solid #e9ecef;
-  padding-bottom: 5px;
-}
-
-.cv-custom-state-form p {
-  font-size: 15px;
-  line-height: 1.6;
-  color: #555;
-  margin-bottom: 24px;
-  text-align: justify;
-}
-
-.cv-custom-state-section {
-  margin-bottom: 16px;
-}
-
-.cv-custom-state-section label {
-  display: block;
-  margin-bottom: 4px;
-  font-weight: 500;
-  color: #555;
-}
-
-.cv-custom-state-input {
-  width: 100%;
-  padding: 8px 12px;
-  border: 1px solid #ddd;
-  border-radius: 4px;
-  background: white;
-  font-size: 14px;
-}
-
-.cv-custom-state-input:focus {
-  outline: none;
-  border-color: #007bff;
-  box-shadow: 0 0 0 2px rgba(0, 123, 255, 0.25);
-}
-
-/* Toggles Container */
-.cv-toggles-container {
-  display: flex;
-  flex-direction: column;
-  gap: 0.5rem;
-  border-radius: 0.5rem;
-  border: 1px solid rgba(0, 0, 0, 0.1);
-  overflow: hidden;
-}
-
-.cv-toggle-card,
-.cv-tabgroup-card {
-  background: white;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-}
-
-.cv-toggle-card:last-child {
-  border-bottom: none;
-}
-
-.cv-toggle-content {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 0.75rem;
-}
-
-.cv-toggle-title {
-  font-weight: 500;
-  font-size: 0.875rem;
-  color: rgba(0, 0, 0, 0.9);
-  margin: 0 0 0.125rem 0;
-}
-
-.cv-toggle-description {
-  font-size: 0.75rem;
-  color: rgba(0, 0, 0, 0.6);
-  margin: 0;
-}
-
-.cv-toggle-label{
-  position: relative;
-  display: inline-block;
-  width: 2.75rem;
-  height: 1.5rem;
-  cursor: pointer;
-}
-
-.cv-toggle-input {
-  opacity: 0;
-  width: 0;
-  height: 0;
-}
-
-.cv-toggle-slider {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background: rgba(0, 0, 0, 0.2);
-  border-radius: 9999px;
-  transition: background-color 0.2s ease;
-}
-
-.cv-toggle-slider:before {
-  position: absolute;
-  content: "";
-  height: 1rem;
-  width: 1rem;
-  left: 0.25rem;
-  bottom: 0.25rem;
-  background: white;
-  border-radius: 50%;
-  transition: transform 0.2s ease;
-}
-
-.cv-toggle-input:checked + .cv-toggle-slider {
-  background: #3e84f4;
-}
-
-.cv-toggle-input:checked + .cv-toggle-slider:before {
-  transform: translateX(1.25rem);
-}
-
-/* Dark theme toggle switch styles */
-.cv-widget-theme-dark .cv-toggle-switch {
-  background: #4a5568;
-}
-
-.cv-widget-theme-dark .cv-toggle-switch:hover {
-  background: #5a6578;
-}
-
-.cv-widget-theme-dark .cv-toggle-switch.cv-toggle-active {
-  background: #63b3ed;
-}
-
-.cv-widget-theme-dark .cv-toggle-switch.cv-toggle-active:hover {
-  background: #4299e1;
-}
-
-/* Tab Groups Container */
-.cv-tab-groups-list {
-  display: flex;
-  flex-direction: column;
-  gap: 1px;
-  border: 1px solid rgba(0, 0, 0, 0.1);
-  border-radius: 0.5rem;
-  overflow: hidden;
-}
-
-/* Tab Group Card - Header (Navigation Headers toggle) */
-.cv-tabgroup-card.cv-tabgroup-header {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 0.75rem;
-  border-bottom: 0px;
-}
-
-.cv-tabgroup-card.cv-tabgroup-header .cv-tabgroup-row {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  width: 100%;
-  gap: 1rem;
-}
-
-/* Navigation toggle icon container */
-.cv-nav-toggle-container {
-  display: flex;
-  align-items: center;
-  gap: 0.5rem;
-}
-
-.cv-nav-icon {
-  width: 2rem;
-  height: 2rem;
-  color: rgba(0, 0, 0, 0.8);
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  flex-shrink: 0;
-  transition: color 0.2s ease;
-}
-
-/* Logo box - centered grey box on its own row */
-.cv-tabgroup-logo-box {
-  width: 3.5rem;
-  height: 3.5rem;
-  background: rgba(0, 0, 0, 0.08);
-  border-radius: 0.5rem;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  flex-shrink: 0;
-  margin-bottom: 0.5rem;
-}
-
-/* Title container for title alignment (without icon) */
-.cv-tabgroup-title-container {
-  display: flex;
-  align-items: center;
-  gap: 0.5rem;
-}
-
-/* Hover state for icon - apply to the entire tabgroup-row */
-.cv-tabgroup-card.cv-tabgroup-header:hover .cv-nav-icon {
-  color: #3e84f4;
-}
-
-.cv-widget-theme-dark .cv-nav-icon {
-  color: rgba(255, 255, 255, 0.8);
-}
-
-.cv-widget-theme-dark .cv-tabgroup-card.cv-tabgroup-header:hover .cv-nav-icon {
-  color: #60a5fa;
-}
-
-/* Tab Group Card - Items */
-.cv-tabgroup-card.cv-tabgroup-item {
-  display: flex;
-  flex-direction: column;
-  gap: 0.5rem;
-  padding: 0.75rem;
-  background: white;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.05);
-}
-
-.cv-tabgroup-card.cv-tabgroup-item:last-child {
-  border-bottom: none;
-}
-
-/* Tab Group Info */
-.cv-tabgroup-info {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  gap: 0.25rem;
-}
-
-.cv-tabgroup-title {
-  font-weight: 500;
-  font-size: 0.875rem;
-  color: rgba(0, 0, 0, 0.9);
-  margin: 0 0 0 0;
-}
-
-.cv-tabgroup-description {
-  font-size: 0.75rem;
-  color: rgba(0, 0, 0, 0.6);
-  margin: 0;
-  line-height: 1.3;
-}
-
-/* Tab Group Label (for select dropdowns) */
-.cv-tabgroup-label {
-  font-size: 0.875rem;
-  color: rgba(0, 0, 0, 0.8);
-  margin: 0;
-  line-height: 1.4;
-  font-weight: 500;
-  display: block;
-  cursor: pointer;
-}
-
-/* Tab Group Select */
-.cv-tabgroup-select {
-  width: 100%;
-  border-radius: 0.5rem;
-  background: white;
-  border: 1px solid rgba(0, 0, 0, 0.15);
-  color: rgba(0, 0, 0, 0.9);
-  padding: 0.5rem 0.75rem;
-  font-size: 0.875rem;
-  cursor: pointer;
-  transition: all 0.15s ease;
-  font-family: inherit;
-}
-
-.cv-tabgroup-select:hover {
-  border-color: rgba(0, 0, 0, 0.25);
-}
-
-.cv-tabgroup-select:focus {
-  outline: none;
-  border-color: #3e84f4;
-  box-shadow: 0 0 0 2px rgba(62, 132, 244, 0.2);
-}
-
-/* Modern Toggle Switch */
-.cv-toggle-switch {
-  position: relative;
-  display: inline-flex;
-  align-items: center;
-  width: 44px;
-  height: 24px;
-  background: rgba(0, 0, 0, 0.1);
-  border-radius: 9999px;
-  padding: 2px;
-  box-sizing: border-box;
-  cursor: pointer;
-  transition: background-color 0.2s ease;
-  border: none;
-}
-
-.cv-toggle-switch input {
-  display: none;
-}
-
-.cv-toggle-switch .cv-switch-bg {
-  position: absolute;
-  inset: 0;
-  border-radius: 9999px;
-  background: rgba(0, 0, 0, 0.1);
-  transition: background-color 0.2s ease;
-  pointer-events: none;
-}
-
-.cv-toggle-switch .cv-switch-knob {
-  position: relative;
-  width: 20px;
-  height: 20px;
-  background: white;
-  border-radius: 50%;
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12);
-  transition: transform 0.2s ease;
-  z-index: 1;
-}
-
-.cv-toggle-switch input:checked + .cv-switch-bg {
-  background: #3e84f4;
-}
-
-.cv-toggle-switch input:checked ~ .cv-switch-knob {
-  transform: translateX(20px);
-}
-
-/* Dark Theme - Tab Groups */
-.cv-widget-theme-dark .cv-tabgroup-card.cv-tabgroup-header {
-  background: #101722;
-  border-bottom-color: rgba(255, 255, 255, 0.1);
-}
-
-.cv-widget-theme-dark .cv-tabgroup-card.cv-tabgroup-item {
-  background: #101722;
-  border-bottom-color: rgba(255, 255, 255, 0.05);
-}
-
-.cv-widget-theme-dark .cv-tabgroup-title {
-  color: #e2e8f0;
-}
-
-.cv-widget-theme-dark .cv-tabgroup-description {
-  color: rgba(255, 255, 255, 0.6);
-}
-
-.cv-widget-theme-dark .cv-tabgroup-label {
-  color: rgba(255, 255, 255, 0.8);
-}
-
-.cv-widget-theme-dark .cv-tab-groups-list {
-  border-color: rgba(255, 255, 255, 0.1);
-}
-
-.cv-widget-theme-dark .cv-tabgroup-select {
-  background: #101722;
-  border-color: rgba(255, 255, 255, 0.15);
-  color: #e2e8f0;
-}
-
-.cv-widget-theme-dark .cv-tabgroup-select:hover {
-  border-color: rgba(255, 255, 255, 0.25);
-}
-
-.cv-widget-theme-dark .cv-tabgroup-select:focus {
-  border-color: #60a5fa;
-  box-shadow: 0 0 0 2px rgba(96, 165, 250, 0.2);
-}
-
-/* Dark Theme - Toggle Switch */
-.cv-widget-theme-dark .cv-toggle-switch .cv-switch-bg {
-  background: rgba(255, 255, 255, 0.1);
-}
-
-.cv-widget-theme-dark .cv-toggle-switch .cv-switch-knob {
-  background: #e2e8f0;
-}
-
-.cv-widget-theme-dark .cv-toggle-switch input:checked + .cv-switch-bg {
-  background: #63b3ed;
-}
-
-.cv-modal-footer {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 0.75rem;
-  border-top: 1px solid rgba(0, 0, 0, 0.1);
-}
-
-.cv-reset-btn,
-.cv-share-btn {
-  display: flex;
-  align-items: center;
-  gap: 0.5rem;
-  padding: 0.375rem 0.75rem;
-  border-radius: 0.5rem;
-  font-weight: 600;
-  font-size: 0.875rem;
-  cursor: pointer;
-  transition: all 0.2s ease;
-  border: none;
-}
-
-.cv-reset-btn {
-  color: rgba(0, 0, 0, 0.9);
-  background: rgba(0, 0, 0, 0.1);
-}
-
-.cv-reset-btn:hover {
-  background: rgba(0, 0, 0, 0.2);
-}
-
-.cv-share-btn {
-  color: white;
-  background: #3e84f4;
-}
-
-.cv-share-btn:hover {
-  background: rgba(62, 132, 244, 0.9);
-}
-
-.cv-btn-icon {
-  width: 1rem;
-  height: 1rem;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  transition: transform 0.2s ease;
-}
-
-/* Dark theme custom state styles */
-/* Welcome modal styles */
-.cv-welcome-modal {
-  max-width: 32rem;
-  width: 90vw;
-  background: white;
-  border-radius: 0.75rem;
-  box-shadow: 0 25px 50px -12px rgba(0, 0, 0, 0.25);
-  animation: slideIn 0.2s ease;
-  display: flex;
-  flex-direction: column;
-}
-
-.cv-modal-main {
-  padding: 1rem;
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  gap: 1rem;
-  overflow-y: auto;
-  max-height: calc(80vh - 8rem);
-}
-
-.cv-welcome-message {
-  font-size: 0.875rem;
-  color: rgba(0, 0, 0, 0.8);
-  margin: 0;
-  line-height: 1.4;
-  text-align: center;
-}
-
-.cv-welcome-message a {
-  color: #3e84f4;
-  text-align: justify;
-  text-decoration: none;
-}
-
-.cv-welcome-message a:hover {
-  text-decoration: underline;
-}
-
-.cv-welcome-widget-preview {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: 1rem;
-  padding: 1rem;
-  background: #f8f9fa;
-  border-radius: 0.5rem;
-  margin: 1rem 0;
-}
-
-.cv-welcome-widget-icon {
-  width: 2rem;
-  height: 2rem;
-  background: rgba(62, 132, 244, 0.1);
-  border-radius: 9999px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  animation: cv-pulse 2s cubic-bezier(0.4, 0, 0.6, 1) infinite;
-  color: #3e84f4;
-}
-
-.cv-welcome-widget-label {
-  font-size: 0.875rem;
-  font-weight: 500;
-  color: rgba(0, 0, 0, 0.8);
-  margin: 0;
-}
-
-.cv-welcome-got-it {
-  width: 100%;
-  background: #3e84f4;
-  color: white;
-  font-weight: 600;
-  padding: 0.75rem 1rem;
-  border-radius: 0.5rem;
-  border: none;
-  cursor: pointer;
-  font-size: 0.875rem;
-  transition: background-color 0.2s ease;
-  outline: none;
-}
-
-.cv-welcome-got-it:hover {
-  background: rgba(62, 132, 244, 0.9);
-}
-
-.cv-welcome-got-it:focus {
-  box-shadow: 0 0 0 2px rgba(62, 132, 244, 0.5);
-}
-
-/* Animations */
-@keyframes cv-pulse {
-  0%, 100% {
-    opacity: 1;
-  }
-  50% {
-    opacity: 0.5;
-  }
-}
-
-/* Dark theme welcome modal styles */
-.cv-widget-theme-dark .cv-welcome-modal {
-  background: #101722;
-}
-
-.cv-widget-theme-dark .cv-welcome-message {
-  color: rgba(255, 255, 255, 0.8);
-}
-
-.cv-widget-theme-dark .cv-welcome-message a {
-  color: #60a5fa;
-}
-
-.cv-widget-theme-dark .cv-welcome-widget-preview {
-  background: rgba(255, 255, 255, 0.1);
-}
-
-.cv-widget-theme-dark .cv-welcome-widget-label {
-  color: #e2e8f0;
-}
-
-/* Dark theme logo box */
-.cv-widget-theme-dark .cv-tabgroup-logo-box {
-  background: rgba(255, 255, 255, 0.1);
-}
-
-/* Spinning animation for reset button icon */
-@keyframes cv-spin {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(-360deg);
-  }
-}
-
-.cv-spinning {
-  animation: cv-spin 0.6s ease-in-out;
-}
-
-/* Hide widget icon in print view */
-@media print {
-  .cv-widget-icon {
-    display: none !important;
-  }
-}
+    const WIDGET_STYLES = `
+/* Rounded rectangle widget icon styles */
+.cv-widget-icon {
+  position: fixed;
+  /* Slightly transparent by default so the widget is subtle at the page edge */
+  background: rgba(255, 255, 255, 0.92);
+  color: rgba(0, 0, 0, 0.9);
+  opacity: 0.6;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 18px;
+  font-weight: bold;
+  cursor: pointer;
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
+  z-index: 9998;
+  transition: all 0.3s ease;
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
+}
+
+.cv-widget-icon:hover {
+  /* Become fully opaque on hover to improve readability */
+  background: rgba(255, 255, 255, 1);
+  color: rgba(0, 0, 0, 1);
+  opacity: 1;
+}
+
+/* Top-right: rounded end on left, sticks out leftward on hover */
+.cv-widget-top-right {
+  top: 20px;
+  right: 0;
+  border-radius: 18px 0 0 18px;
+  padding-left: 8px;
+  justify-content: flex-start;
+}
+
+/* Top-left: rounded end on right, sticks out rightward on hover */
+.cv-widget-top-left {
+  top: 20px;
+  left: 0;
+  border-radius: 0 18px 18px 0;
+  padding-right: 8px;
+  justify-content: flex-end;
+}
+
+/* Bottom-right: rounded end on left, sticks out leftward on hover */
+.cv-widget-bottom-right {
+  bottom: 20px;
+  right: 0;
+  border-radius: 18px 0 0 18px;
+  padding-left: 8px;
+  justify-content: flex-start;
+}
+
+/* Bottom-left: rounded end on right, sticks out rightward on hover */
+.cv-widget-bottom-left {
+  bottom: 20px;
+  left: 0;
+  border-radius: 0 18px 18px 0;
+  padding-right: 8px;
+  justify-content: flex-end;
+}
+
+/* Middle-left: rounded end on right, sticks out rightward on hover */
+.cv-widget-middle-left {
+  top: 50%;
+  left: 0;
+  transform: translateY(-50%);
+  border-radius: 0 18px 18px 0;
+  padding-right: 8px;
+  justify-content: flex-end;
+}
+
+/* Middle-right: rounded end on left, sticks out leftward on hover */
+.cv-widget-middle-right {
+  top: 50%;
+  right: 0;
+  transform: translateY(-50%);
+  border-radius: 18px 0 0 18px;
+  padding-left: 8px;
+  justify-content: flex-start;
+}
+
+.cv-widget-top-right,
+.cv-widget-middle-right,
+.cv-widget-bottom-right,
+.cv-widget-top-left,
+.cv-widget-middle-left,
+.cv-widget-bottom-left {
+  height: 36px;
+  width: 36px;
+}
+
+.cv-widget-middle-right:hover,
+.cv-widget-top-right:hover,
+.cv-widget-bottom-right:hover,
+.cv-widget-top-left:hover,
+.cv-widget-middle-left:hover,
+.cv-widget-bottom-left:hover {
+  width: 55px;
+}
+
+/* Modal content styles */
+.cv-widget-section {
+  margin-bottom: 16px;
+}
+
+.cv-widget-section:last-child {
+  margin-bottom: 0;
+}
+
+.cv-widget-section label {
+  display: block;
+  margin-bottom: 4px;
+  font-weight: 500;
+  color: #555;
+}
+
+.cv-widget-profile-select,
+.cv-widget-state-select {
+  width: 100%;
+  padding: 8px 12px;
+  border: 1px solid #ddd;
+  border-radius: 4px;
+  background: white;
+  font-size: 14px;
+}
+
+.cv-widget-profile-select:focus,
+.cv-widget-state-select:focus {
+  outline: none;
+  border-color: #007bff;
+  box-shadow: 0 0 0 2px rgba(0, 123, 255, 0.25);
+}
+
+.cv-widget-profile-select:disabled,
+.cv-widget-state-select:disabled {
+  background: #f8f9fa;
+  color: #6c757d;
+  cursor: not-allowed;
+}
+
+.cv-widget-current {
+  margin: 16px 0;
+  padding: 12px;
+  background: #f8f9fa;
+  border-radius: 4px;
+  border-left: 4px solid #007bff;
+}
+
+.cv-widget-current label {
+  font-size: 12px;
+  text-transform: uppercase;
+  letter-spacing: 0.5px;
+  color: #666;
+  margin-bottom: 4px;
+}
+
+.cv-widget-current-view {
+  font-weight: 500;
+  color: #333;
+}
+
+.cv-widget-reset {
+  width: 100%;
+  padding: 8px 16px;
+  background: #dc3545;
+  color: white;
+  border: none;
+  border-radius: 4px;
+  cursor: pointer;
+  font-size: 14px;
+  font-weight: 500;
+}
+
+.cv-widget-reset:hover {
+  background: #c82333;
+}
+
+.cv-widget-reset:active {
+  background: #bd2130;
+}
+
+/* Responsive design for mobile */
+@media (max-width: 768px) {
+  .cv-widget-top-right,
+  .cv-widget-top-left {
+    top: 10px;
+  }
+
+  .cv-widget-bottom-right,
+  .cv-widget-bottom-left {
+    bottom: 10px;
+  }
+
+  /* All widgets stay flush with screen edges */
+  .cv-widget-top-right,
+  .cv-widget-bottom-right,
+  .cv-widget-middle-right {
+    right: 0;
+  }
+
+  .cv-widget-top-left,
+  .cv-widget-bottom-left,
+  .cv-widget-middle-left {
+    left: 0;
+  }
+
+  /* Slightly smaller on mobile */
+  .cv-widget-icon {
+    width: 60px;
+    height: 32px;
+  }
+
+  .cv-widget-icon:hover {
+    width: 75px;
+  }
+}
+
+/* Modal styles */
+.cv-widget-modal-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.5);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 10002;
+  animation: fadeIn 0.2s ease;
+}
+
+.cv-widget-modal-overlay.cv-hidden {
+  display: none;
+}
+
+@keyframes fadeIn {
+  from { opacity: 0; }
+  to { opacity: 1; }
+}
+
+.cv-widget-modal {
+  background: white;
+  border-radius: 0.75rem;
+  box-shadow: 0 25px 50px -12px rgba(0, 0, 0, 0.25);
+  max-width: 32rem;
+  width: 90vw;
+  max-height: 80vh;
+  animation: slideIn 0.2s ease;
+  display: flex;
+  flex-direction: column;
+}
+
+@keyframes slideIn {
+  from { 
+    opacity: 0;
+    transform: scale(0.9) translateY(-20px);
+  }
+  to { 
+    opacity: 1;
+    transform: scale(1) translateY(0);
+  }
+}
+
+.cv-modal-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0.5rem 1rem;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+}
+
+.cv-modal-header-content {
+  display: flex;
+  align-items: center;
+  gap: 0.75rem;
+}
+
+.cv-modal-icon {
+  position: relative;
+  width: 1rem;
+  height: 1rem;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 9999px;
+}
+
+.cv-modal-icon-svg {
+  width: 100%;
+  height: 100%;
+  opacity: 1;
+}
+
+.cv-modal-title {
+  font-size: 1.125rem;
+  font-weight: bold;
+  color: rgba(0, 0, 0, 0.9);
+  margin: 0;
+}
+
+.cv-modal-close {
+  width: 2rem;
+  height: 2rem;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 9999px;
+  background: transparent;
+  border: none;
+  color: rgba(0, 0, 0, 0.6);
+  cursor: pointer;
+  transition: all 0.2s ease;
+}
+
+.cv-modal-close:hover {
+  background: rgba(62, 132, 244, 0.1);
+  color: #3e84f4;
+}
+
+.cv-modal-close-icon {
+  width: 1.25rem;
+  height: 1.25rem;
+}
+
+.cv-modal-main {
+  padding: 1rem;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+  overflow-y: auto;
+  max-height: calc(80vh - 8rem);
+}
+
+.cv-modal-description {
+  font-size: 0.875rem;
+  color: rgba(0, 0, 0, 0.8);
+  margin: 0;
+  line-height: 1.4;
+}
+
+.cv-content-section,
+.cv-tab-groups-section {
+  display: flex;
+  flex-direction: column;
+  gap: 0.75rem;
+}
+
+.cv-section-heading {
+  font-size: 1rem;
+  font-weight: bold;
+  color: rgba(0, 0, 0, 0.9);
+  margin: 0;
+}
+
+.cv-widget-modal-actions {
+  margin-top: 20px;
+  padding-top: 16px;
+  border-top: 1px solid #e9ecef;
+}
+
+.cv-widget-restore {
+  width: 100%;
+  padding: 10px 16px;
+  background: #28a745;
+  color: white;
+  border: none;
+  border-radius: 4px;
+  cursor: pointer;
+  font-size: 14px;
+  font-weight: 500;
+}
+
+.cv-widget-restore:hover {
+  background: #218838;
+}
+
+.cv-widget-create-state {
+  width: 100%;
+  padding: 10px 16px;
+  background: #007bff;
+  color: white;
+  border: none;
+  border-radius: 4px;
+  cursor: pointer;
+  font-size: 14px;
+  font-weight: 500;
+  margin-bottom: 10px;
+}
+
+.cv-widget-create-state:hover {
+  background: #0056b3;
+}
+
+.cv-widget-theme-dark .cv-widget-modal {
+  background: #101722;
+  color: #e2e8f0;
+}
+
+.cv-widget-theme-dark .cv-modal-header {
+  border-color: rgba(255, 255, 255, 0.1);
+}
+
+.cv-widget-theme-dark .cv-modal-title {
+  color: #e2e8f0;
+}
+
+.cv-widget-theme-dark .cv-modal-close {
+  color: rgba(255, 255, 255, 0.6);
+}
+
+.cv-widget-theme-dark .cv-modal-close:hover {
+  background: rgba(62, 132, 244, 0.2);
+  color: #3e84f4;
+}
+
+.cv-widget-theme-dark .cv-modal-description {
+  color: rgba(255, 255, 255, 0.8);
+}
+
+.cv-widget-theme-dark .cv-section-heading {
+  color: #e2e8f0;
+}
+
+.cv-widget-theme-dark .cv-toggles-container
+.cv-widget-theme-dark .cv-tabgroups-container {
+  border-color: rgba(255, 255, 255, 0.1);
+}
+
+.cv-widget-theme-dark .cv-toggle-card,
+.cv-widget-theme-dark .cv-tabgroup-card {
+  background: #101722;
+  border-color: rgba(255, 255, 255, 0.1);
+}
+
+.cv-widget-theme-dark .cv-toggle-title,
+.cv-widget-theme-dark .cv-tabgroup-title {
+  color: #e2e8f0;
+}
+
+.cv-widget-theme-dark .cv-toggle-description,
+.cv-widget-theme-dark .cv-tabgroup-description {
+  color: rgba(255, 255, 255, 0.6);
+}
+
+.cv-widget-theme-dark .cv-toggle-slider {
+  background: rgba(255, 255, 255, 0.2);
+}
+
+.cv-widget-theme-dark .cv-tab-group-description {
+  color: rgba(255, 255, 255, 0.8);
+}
+
+.cv-widget-theme-dark .cv-tabgroup-select {
+  background: #101722;
+  border-color: rgba(255, 255, 255, 0.2);
+  color: #e2e8f0;
+}
+
+.cv-widget-theme-dark .cv-modal-footer {
+  border-color: rgba(255, 255, 255, 0.1);
+  background: #101722;
+}
+
+.cv-widget-theme-dark .cv-reset-btn {
+  color: #e2e8f0;
+  background: rgba(255, 255, 255, 0.1);
+}
+
+.cv-widget-theme-dark .cv-reset-btn:hover {
+  background: rgba(255, 255, 255, 0.2);
+}
+
+/* Custom state creator styles */
+.cv-custom-state-modal {
+  max-width: 500px;
+}
+
+.cv-custom-state-form .cv-section-header {
+  font-size: 16px;
+  font-weight: 600;
+  color: #333;
+  border-bottom: 1px solid #e9ecef;
+  padding-bottom: 5px;
+}
+
+.cv-custom-state-form p {
+  font-size: 15px;
+  line-height: 1.6;
+  color: #555;
+  margin-bottom: 24px;
+  text-align: justify;
+}
+
+.cv-custom-state-section {
+  margin-bottom: 16px;
+}
+
+.cv-custom-state-section label {
+  display: block;
+  margin-bottom: 4px;
+  font-weight: 500;
+  color: #555;
+}
+
+.cv-custom-state-input {
+  width: 100%;
+  padding: 8px 12px;
+  border: 1px solid #ddd;
+  border-radius: 4px;
+  background: white;
+  font-size: 14px;
+}
+
+.cv-custom-state-input:focus {
+  outline: none;
+  border-color: #007bff;
+  box-shadow: 0 0 0 2px rgba(0, 123, 255, 0.25);
+}
+
+/* Toggles Container */
+.cv-toggles-container {
+  display: flex;
+  flex-direction: column;
+  gap: 0.5rem;
+  border-radius: 0.5rem;
+  border: 1px solid rgba(0, 0, 0, 0.1);
+  overflow: hidden;
+}
+
+.cv-toggle-card,
+.cv-tabgroup-card {
+  background: white;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+}
+
+.cv-toggle-card:last-child {
+  border-bottom: none;
+}
+
+.cv-toggle-content {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0.75rem;
+}
+
+.cv-toggle-title {
+  font-weight: 500;
+  font-size: 0.875rem;
+  color: rgba(0, 0, 0, 0.9);
+  margin: 0 0 0.125rem 0;
+}
+
+.cv-toggle-description {
+  font-size: 0.75rem;
+  color: rgba(0, 0, 0, 0.6);
+  margin: 0;
+}
+
+.cv-toggle-label{
+  position: relative;
+  display: inline-block;
+  width: 2.75rem;
+  height: 1.5rem;
+  cursor: pointer;
+}
+
+.cv-toggle-input {
+  opacity: 0;
+  width: 0;
+  height: 0;
+}
+
+.cv-toggle-slider {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.2);
+  border-radius: 9999px;
+  transition: background-color 0.2s ease;
+}
+
+.cv-toggle-slider:before {
+  position: absolute;
+  content: "";
+  height: 1rem;
+  width: 1rem;
+  left: 0.25rem;
+  bottom: 0.25rem;
+  background: white;
+  border-radius: 50%;
+  transition: transform 0.2s ease;
+}
+
+.cv-toggle-input:checked + .cv-toggle-slider {
+  background: #3e84f4;
+}
+
+.cv-toggle-input:checked + .cv-toggle-slider:before {
+  transform: translateX(1.25rem);
+}
+
+/* Dark theme toggle switch styles */
+.cv-widget-theme-dark .cv-toggle-switch {
+  background: #4a5568;
+}
+
+.cv-widget-theme-dark .cv-toggle-switch:hover {
+  background: #5a6578;
+}
+
+.cv-widget-theme-dark .cv-toggle-switch.cv-toggle-active {
+  background: #63b3ed;
+}
+
+.cv-widget-theme-dark .cv-toggle-switch.cv-toggle-active:hover {
+  background: #4299e1;
+}
+
+/* Tab Groups Container */
+.cv-tab-groups-list {
+  display: flex;
+  flex-direction: column;
+  gap: 1px;
+  border: 1px solid rgba(0, 0, 0, 0.1);
+  border-radius: 0.5rem;
+  overflow: hidden;
+}
+
+/* Tab Group Card - Header (Navigation Headers toggle) */
+.cv-tabgroup-card.cv-tabgroup-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0.75rem;
+  border-bottom: 0px;
+}
+
+.cv-tabgroup-card.cv-tabgroup-header .cv-tabgroup-row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 100%;
+  gap: 1rem;
+}
+
+/* Navigation toggle icon container */
+.cv-nav-toggle-container {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+}
+
+.cv-nav-icon {
+  width: 2rem;
+  height: 2rem;
+  color: rgba(0, 0, 0, 0.8);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-shrink: 0;
+  transition: color 0.2s ease;
+}
+
+/* Logo box - centered grey box on its own row */
+.cv-tabgroup-logo-box {
+  width: 3.5rem;
+  height: 3.5rem;
+  background: rgba(0, 0, 0, 0.08);
+  border-radius: 0.5rem;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-shrink: 0;
+  margin-bottom: 0.5rem;
+}
+
+/* Title container for title alignment (without icon) */
+.cv-tabgroup-title-container {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+}
+
+/* Hover state for icon - apply to the entire tabgroup-row */
+.cv-tabgroup-card.cv-tabgroup-header:hover .cv-nav-icon {
+  color: #3e84f4;
+}
+
+.cv-widget-theme-dark .cv-nav-icon {
+  color: rgba(255, 255, 255, 0.8);
+}
+
+.cv-widget-theme-dark .cv-tabgroup-card.cv-tabgroup-header:hover .cv-nav-icon {
+  color: #60a5fa;
+}
+
+/* Tab Group Card - Items */
+.cv-tabgroup-card.cv-tabgroup-item {
+  display: flex;
+  flex-direction: column;
+  gap: 0.5rem;
+  padding: 0.75rem;
+  background: white;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.05);
+}
+
+.cv-tabgroup-card.cv-tabgroup-item:last-child {
+  border-bottom: none;
+}
+
+/* Tab Group Info */
+.cv-tabgroup-info {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  gap: 0.25rem;
+}
+
+.cv-tabgroup-title {
+  font-weight: 500;
+  font-size: 0.875rem;
+  color: rgba(0, 0, 0, 0.9);
+  margin: 0 0 0 0;
+}
+
+.cv-tabgroup-description {
+  font-size: 0.75rem;
+  color: rgba(0, 0, 0, 0.6);
+  margin: 0;
+  line-height: 1.3;
+}
+
+/* Tab Group Label (for select dropdowns) */
+.cv-tabgroup-label {
+  font-size: 0.875rem;
+  color: rgba(0, 0, 0, 0.8);
+  margin: 0;
+  line-height: 1.4;
+  font-weight: 500;
+  display: block;
+  cursor: pointer;
+}
+
+/* Tab Group Select */
+.cv-tabgroup-select {
+  width: 100%;
+  border-radius: 0.5rem;
+  background: white;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  color: rgba(0, 0, 0, 0.9);
+  padding: 0.5rem 0.75rem;
+  font-size: 0.875rem;
+  cursor: pointer;
+  transition: all 0.15s ease;
+  font-family: inherit;
+}
+
+.cv-tabgroup-select:hover {
+  border-color: rgba(0, 0, 0, 0.25);
+}
+
+.cv-tabgroup-select:focus {
+  outline: none;
+  border-color: #3e84f4;
+  box-shadow: 0 0 0 2px rgba(62, 132, 244, 0.2);
+}
+
+/* Modern Toggle Switch */
+.cv-toggle-switch {
+  position: relative;
+  display: inline-flex;
+  align-items: center;
+  width: 44px;
+  height: 24px;
+  background: rgba(0, 0, 0, 0.1);
+  border-radius: 9999px;
+  padding: 2px;
+  box-sizing: border-box;
+  cursor: pointer;
+  transition: background-color 0.2s ease;
+  border: none;
+}
+
+.cv-toggle-switch input {
+  display: none;
+}
+
+.cv-toggle-switch .cv-switch-bg {
+  position: absolute;
+  inset: 0;
+  border-radius: 9999px;
+  background: rgba(0, 0, 0, 0.1);
+  transition: background-color 0.2s ease;
+  pointer-events: none;
+}
+
+.cv-toggle-switch .cv-switch-knob {
+  position: relative;
+  width: 20px;
+  height: 20px;
+  background: white;
+  border-radius: 50%;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12);
+  transition: transform 0.2s ease;
+  z-index: 1;
+}
+
+.cv-toggle-switch input:checked + .cv-switch-bg {
+  background: #3e84f4;
+}
+
+.cv-toggle-switch input:checked ~ .cv-switch-knob {
+  transform: translateX(20px);
+}
+
+/* Dark Theme - Tab Groups */
+.cv-widget-theme-dark .cv-tabgroup-card.cv-tabgroup-header {
+  background: #101722;
+  border-bottom-color: rgba(255, 255, 255, 0.1);
+}
+
+.cv-widget-theme-dark .cv-tabgroup-card.cv-tabgroup-item {
+  background: #101722;
+  border-bottom-color: rgba(255, 255, 255, 0.05);
+}
+
+.cv-widget-theme-dark .cv-tabgroup-title {
+  color: #e2e8f0;
+}
+
+.cv-widget-theme-dark .cv-tabgroup-description {
+  color: rgba(255, 255, 255, 0.6);
+}
+
+.cv-widget-theme-dark .cv-tabgroup-label {
+  color: rgba(255, 255, 255, 0.8);
+}
+
+.cv-widget-theme-dark .cv-tab-groups-list {
+  border-color: rgba(255, 255, 255, 0.1);
+}
+
+.cv-widget-theme-dark .cv-tabgroup-select {
+  background: #101722;
+  border-color: rgba(255, 255, 255, 0.15);
+  color: #e2e8f0;
+}
+
+.cv-widget-theme-dark .cv-tabgroup-select:hover {
+  border-color: rgba(255, 255, 255, 0.25);
+}
+
+.cv-widget-theme-dark .cv-tabgroup-select:focus {
+  border-color: #60a5fa;
+  box-shadow: 0 0 0 2px rgba(96, 165, 250, 0.2);
+}
+
+/* Dark Theme - Toggle Switch */
+.cv-widget-theme-dark .cv-toggle-switch .cv-switch-bg {
+  background: rgba(255, 255, 255, 0.1);
+}
+
+.cv-widget-theme-dark .cv-toggle-switch .cv-switch-knob {
+  background: #e2e8f0;
+}
+
+.cv-widget-theme-dark .cv-toggle-switch input:checked + .cv-switch-bg {
+  background: #63b3ed;
+}
+
+.cv-modal-footer {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0.75rem;
+  border-top: 1px solid rgba(0, 0, 0, 0.1);
+}
+
+.cv-reset-btn,
+.cv-share-btn {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+  padding: 0.375rem 0.75rem;
+  border-radius: 0.5rem;
+  font-weight: 600;
+  font-size: 0.875rem;
+  cursor: pointer;
+  transition: all 0.2s ease;
+  border: none;
+}
+
+.cv-reset-btn {
+  color: rgba(0, 0, 0, 0.9);
+  background: rgba(0, 0, 0, 0.1);
+}
+
+.cv-reset-btn:hover {
+  background: rgba(0, 0, 0, 0.2);
+}
+
+.cv-share-btn {
+  color: white;
+  background: #3e84f4;
+}
+
+.cv-share-btn:hover {
+  background: rgba(62, 132, 244, 0.9);
+}
+
+.cv-btn-icon {
+  width: 1rem;
+  height: 1rem;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  transition: transform 0.2s ease;
+}
+
+/* Dark theme custom state styles */
+/* Welcome modal styles */
+.cv-welcome-modal {
+  max-width: 32rem;
+  width: 90vw;
+  background: white;
+  border-radius: 0.75rem;
+  box-shadow: 0 25px 50px -12px rgba(0, 0, 0, 0.25);
+  animation: slideIn 0.2s ease;
+  display: flex;
+  flex-direction: column;
+}
+
+.cv-modal-main {
+  padding: 1rem;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+  overflow-y: auto;
+  max-height: calc(80vh - 8rem);
+}
+
+.cv-welcome-message {
+  font-size: 0.875rem;
+  color: rgba(0, 0, 0, 0.8);
+  margin: 0;
+  line-height: 1.4;
+  text-align: center;
+}
+
+.cv-welcome-message a {
+  color: #3e84f4;
+  text-align: justify;
+  text-decoration: none;
+}
+
+.cv-welcome-message a:hover {
+  text-decoration: underline;
+}
+
+.cv-welcome-widget-preview {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 1rem;
+  padding: 1rem;
+  background: #f8f9fa;
+  border-radius: 0.5rem;
+  margin: 1rem 0;
+}
+
+.cv-welcome-widget-icon {
+  width: 2rem;
+  height: 2rem;
+  background: rgba(62, 132, 244, 0.1);
+  border-radius: 9999px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  animation: cv-pulse 2s cubic-bezier(0.4, 0, 0.6, 1) infinite;
+  color: #3e84f4;
+}
+
+.cv-welcome-widget-label {
+  font-size: 0.875rem;
+  font-weight: 500;
+  color: rgba(0, 0, 0, 0.8);
+  margin: 0;
+}
+
+.cv-welcome-got-it {
+  width: 100%;
+  background: #3e84f4;
+  color: white;
+  font-weight: 600;
+  padding: 0.75rem 1rem;
+  border-radius: 0.5rem;
+  border: none;
+  cursor: pointer;
+  font-size: 0.875rem;
+  transition: background-color 0.2s ease;
+  outline: none;
+}
+
+.cv-welcome-got-it:hover {
+  background: rgba(62, 132, 244, 0.9);
+}
+
+.cv-welcome-got-it:focus {
+  box-shadow: 0 0 0 2px rgba(62, 132, 244, 0.5);
+}
+
+/* Animations */
+@keyframes cv-pulse {
+  0%, 100% {
+    opacity: 1;
+  }
+  50% {
+    opacity: 0.5;
+  }
+}
+
+/* Dark theme welcome modal styles */
+.cv-widget-theme-dark .cv-welcome-modal {
+  background: #101722;
+}
+
+.cv-widget-theme-dark .cv-welcome-message {
+  color: rgba(255, 255, 255, 0.8);
+}
+
+.cv-widget-theme-dark .cv-welcome-message a {
+  color: #60a5fa;
+}
+
+.cv-widget-theme-dark .cv-welcome-widget-preview {
+  background: rgba(255, 255, 255, 0.1);
+}
+
+.cv-widget-theme-dark .cv-welcome-widget-label {
+  color: #e2e8f0;
+}
+
+/* Dark theme logo box */
+.cv-widget-theme-dark .cv-tabgroup-logo-box {
+  background: rgba(255, 255, 255, 0.1);
+}
+
+/* Spinning animation for reset button icon */
+@keyframes cv-spin {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(-360deg);
+  }
+}
+
+.cv-spinning {
+  animation: cv-spin 0.6s ease-in-out;
+}
+
+/* Hide widget icon in print view */
+@media print {
+  .cv-widget-icon {
+    display: none !important;
+  }
+}
 `;
     /**
      * Inject widget styles into the document head
@@ -2577,119 +3056,16 @@ ${TAB_STYLES}
         document.head.appendChild(style);
     }
 
-    /**
-     * Icon utilities for CustomViews widget
-     * Centralized SVG icons for better maintainability and reusability
-     */
-    /**
-     * Settings gear icon for modal header
-     */
-    function getGearIcon() {
-        return `<svg class="cv-modal-icon-svg" fill="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" d="M12 8.00002C9.79085 8.00002 7.99999 9.79088 7.99999 12C7.99999 14.2092 9.79085 16 12 16C14.2091 16 16 14.2092 16 12C16 9.79088 14.2091 8.00002 12 8.00002ZM9.99999 12C9.99999 10.8955 10.8954 10 12 10C13.1046 10 14 10.8955 14 12C14 13.1046 13.1046 14 12 14C10.8954 14 9.99999 13.1046 9.99999 12Z" fill="#0F1729"/>
-  <path xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" d="M10.7673 1.01709C10.9925 0.999829 11.2454 0.99993 11.4516 1.00001L12.5484 1.00001C12.7546 0.99993 13.0075 0.999829 13.2327 1.01709C13.4989 1.03749 13.8678 1.08936 14.2634 1.26937C14.7635 1.49689 15.1915 1.85736 15.5007 2.31147C15.7454 2.67075 15.8592 3.0255 15.9246 3.2843C15.9799 3.50334 16.0228 3.75249 16.0577 3.9557L16.1993 4.77635L16.2021 4.77788C16.2369 4.79712 16.2715 4.81659 16.306 4.8363L16.3086 4.83774L17.2455 4.49865C17.4356 4.42978 17.6693 4.34509 17.8835 4.28543C18.1371 4.2148 18.4954 4.13889 18.9216 4.17026C19.4614 4.20998 19.9803 4.39497 20.4235 4.70563C20.7734 4.95095 21.0029 5.23636 21.1546 5.4515C21.2829 5.63326 21.4103 5.84671 21.514 6.02029L22.0158 6.86003C22.1256 7.04345 22.2594 7.26713 22.3627 7.47527C22.4843 7.7203 22.6328 8.07474 22.6777 8.52067C22.7341 9.08222 22.6311 9.64831 22.3803 10.1539C22.1811 10.5554 21.9171 10.8347 21.7169 11.0212C21.5469 11.1795 21.3428 11.3417 21.1755 11.4746L20.5 12L21.1755 12.5254C21.3428 12.6584 21.5469 12.8205 21.7169 12.9789C21.9171 13.1653 22.1811 13.4446 22.3802 13.8461C22.631 14.3517 22.7341 14.9178 22.6776 15.4794C22.6328 15.9253 22.4842 16.2797 22.3626 16.5248C22.2593 16.7329 22.1255 16.9566 22.0158 17.14L21.5138 17.9799C21.4102 18.1535 21.2828 18.3668 21.1546 18.5485C21.0028 18.7637 20.7734 19.0491 20.4234 19.2944C19.9803 19.6051 19.4613 19.7901 18.9216 19.8298C18.4954 19.8612 18.1371 19.7852 17.8835 19.7146C17.6692 19.6549 17.4355 19.5703 17.2454 19.5014L16.3085 19.1623L16.306 19.1638C16.2715 19.1835 16.2369 19.2029 16.2021 19.2222L16.1993 19.2237L16.0577 20.0443C16.0228 20.2475 15.9799 20.4967 15.9246 20.7157C15.8592 20.9745 15.7454 21.3293 15.5007 21.6886C15.1915 22.1427 14.7635 22.5032 14.2634 22.7307C13.8678 22.9107 13.4989 22.9626 13.2327 22.983C13.0074 23.0002 12.7546 23.0001 12.5484 23H11.4516C11.2454 23.0001 10.9925 23.0002 10.7673 22.983C10.5011 22.9626 10.1322 22.9107 9.73655 22.7307C9.23648 22.5032 8.80849 22.1427 8.49926 21.6886C8.25461 21.3293 8.14077 20.9745 8.07542 20.7157C8.02011 20.4967 7.97723 20.2475 7.94225 20.0443L7.80068 19.2237L7.79791 19.2222C7.7631 19.2029 7.72845 19.1835 7.69396 19.1637L7.69142 19.1623L6.75458 19.5014C6.5645 19.5702 6.33078 19.6549 6.11651 19.7146C5.86288 19.7852 5.50463 19.8611 5.07841 19.8298C4.53866 19.7901 4.01971 19.6051 3.57654 19.2944C3.2266 19.0491 2.99714 18.7637 2.84539 18.5485C2.71718 18.3668 2.58974 18.1534 2.4861 17.9798L1.98418 17.14C1.87447 16.9566 1.74067 16.7329 1.63737 16.5248C1.51575 16.2797 1.36719 15.9253 1.32235 15.4794C1.26588 14.9178 1.36897 14.3517 1.61976 13.8461C1.81892 13.4446 2.08289 13.1653 2.28308 12.9789C2.45312 12.8205 2.65717 12.6584 2.82449 12.5254L3.47844 12.0054V11.9947L2.82445 11.4746C2.65712 11.3417 2.45308 11.1795 2.28304 11.0212C2.08285 10.8347 1.81888 10.5554 1.61972 10.1539C1.36893 9.64832 1.26584 9.08224 1.3223 8.52069C1.36714 8.07476 1.51571 7.72032 1.63732 7.47528C1.74062 7.26715 1.87443 7.04347 1.98414 6.86005L2.48605 6.02026C2.58969 5.84669 2.71714 5.63326 2.84534 5.45151C2.9971 5.23637 3.22655 4.95096 3.5765 4.70565C4.01966 4.39498 4.53862 4.20999 5.07837 4.17027C5.50458 4.1389 5.86284 4.21481 6.11646 4.28544C6.33072 4.34511 6.56444 4.4298 6.75451 4.49867L7.69141 4.83775L7.69394 4.8363C7.72844 4.8166 7.7631 4.79712 7.79791 4.77788L7.80068 4.77635L7.94225 3.95571C7.97723 3.7525 8.02011 3.50334 8.07542 3.2843C8.14077 3.0255 8.25461 2.67075 8.49926 2.31147C8.80849 1.85736 9.23648 1.49689 9.73655 1.26937C10.1322 1.08936 10.5011 1.03749 10.7673 1.01709ZM14.0938 4.3363C14.011 3.85634 13.9696 3.61637 13.8476 3.43717C13.7445 3.2858 13.6019 3.16564 13.4352 3.0898C13.2378 3.00002 12.9943 3.00002 12.5073 3.00002H11.4927C11.0057 3.00002 10.7621 3.00002 10.5648 3.0898C10.3981 3.16564 10.2555 3.2858 10.1524 3.43717C10.0304 3.61637 9.98895 3.85634 9.90615 4.3363L9.75012 5.24064C9.69445 5.56333 9.66662 5.72467 9.60765 5.84869C9.54975 5.97047 9.50241 6.03703 9.40636 6.13166C9.30853 6.22804 9.12753 6.3281 8.76554 6.52822C8.73884 6.54298 8.71227 6.55791 8.68582 6.57302C8.33956 6.77078 8.16643 6.86966 8.03785 6.90314C7.91158 6.93602 7.83293 6.94279 7.70289 6.93196C7.57049 6.92094 7.42216 6.86726 7.12551 6.7599L6.11194 6.39308C5.66271 6.2305 5.43809 6.14921 5.22515 6.16488C5.04524 6.17811 4.87225 6.23978 4.72453 6.34333C4.5497 6.46589 4.42715 6.67094 4.18206 7.08103L3.72269 7.84965C3.46394 8.2826 3.33456 8.49907 3.31227 8.72078C3.29345 8.90796 3.32781 9.09665 3.41141 9.26519C3.51042 9.4648 3.7078 9.62177 4.10256 9.9357L4.82745 10.5122C5.07927 10.7124 5.20518 10.8126 5.28411 10.9199C5.36944 11.036 5.40583 11.1114 5.44354 11.2504C5.47844 11.379 5.47844 11.586 5.47844 12C5.47844 12.414 5.47844 12.621 5.44354 12.7497C5.40582 12.8887 5.36944 12.9641 5.28413 13.0801C5.20518 13.1875 5.07927 13.2876 4.82743 13.4879L4.10261 14.0643C3.70785 14.3783 3.51047 14.5352 3.41145 14.7349C3.32785 14.9034 3.29349 15.0921 3.31231 15.2793C3.33461 15.501 3.46398 15.7174 3.72273 16.1504L4.1821 16.919C4.4272 17.3291 4.54974 17.5342 4.72457 17.6567C4.8723 17.7603 5.04528 17.8219 5.2252 17.8352C5.43813 17.8508 5.66275 17.7695 6.11199 17.607L7.12553 17.2402C7.42216 17.1328 7.5705 17.0791 7.7029 17.0681C7.83294 17.0573 7.91159 17.064 8.03786 17.0969C8.16644 17.1304 8.33956 17.2293 8.68582 17.427C8.71228 17.4421 8.73885 17.4571 8.76554 17.4718C9.12753 17.6719 9.30853 17.772 9.40635 17.8684C9.50241 17.963 9.54975 18.0296 9.60765 18.1514C9.66662 18.2754 9.69445 18.4367 9.75012 18.7594L9.90615 19.6637C9.98895 20.1437 10.0304 20.3837 10.1524 20.5629C10.2555 20.7142 10.3981 20.8344 10.5648 20.9102C10.7621 21 11.0057 21 11.4927 21H12.5073C12.9943 21 13.2378 21 13.4352 20.9102C13.6019 20.8344 13.7445 20.7142 13.8476 20.5629C13.9696 20.3837 14.011 20.1437 14.0938 19.6637L14.2499 18.7594C14.3055 18.4367 14.3334 18.2754 14.3923 18.1514C14.4502 18.0296 14.4976 17.963 14.5936 17.8684C14.6915 17.772 14.8725 17.6719 15.2344 17.4718C15.2611 17.4571 15.2877 17.4421 15.3141 17.427C15.6604 17.2293 15.8335 17.1304 15.9621 17.0969C16.0884 17.064 16.167 17.0573 16.2971 17.0681C16.4295 17.0791 16.5778 17.1328 16.8744 17.2402L17.888 17.607C18.3372 17.7696 18.5619 17.8509 18.7748 17.8352C18.9547 17.8219 19.1277 17.7603 19.2754 17.6567C19.4502 17.5342 19.5728 17.3291 19.8179 16.919L20.2773 16.1504C20.536 15.7175 20.6654 15.501 20.6877 15.2793C20.7065 15.0921 20.6721 14.9034 20.5885 14.7349C20.4895 14.5353 20.2921 14.3783 19.8974 14.0643L19.1726 13.4879C18.9207 13.2876 18.7948 13.1875 18.7159 13.0801C18.6306 12.9641 18.5942 12.8887 18.5564 12.7497C18.5215 12.6211 18.5215 12.414 18.5215 12C18.5215 11.586 18.5215 11.379 18.5564 11.2504C18.5942 11.1114 18.6306 11.036 18.7159 10.9199C18.7948 10.8126 18.9207 10.7124 19.1725 10.5122L19.8974 9.9357C20.2922 9.62176 20.4896 9.46479 20.5886 9.26517C20.6722 9.09664 20.7065 8.90795 20.6877 8.72076C20.6654 8.49906 20.5361 8.28259 20.2773 7.84964L19.8179 7.08102C19.5728 6.67093 19.4503 6.46588 19.2755 6.34332C19.1277 6.23977 18.9548 6.1781 18.7748 6.16486C18.5619 6.14919 18.3373 6.23048 17.888 6.39307L16.8745 6.75989C16.5778 6.86725 16.4295 6.92093 16.2971 6.93195C16.167 6.94278 16.0884 6.93601 15.9621 6.90313C15.8335 6.86965 15.6604 6.77077 15.3142 6.57302C15.2877 6.55791 15.2611 6.54298 15.2345 6.52822C14.8725 6.3281 14.6915 6.22804 14.5936 6.13166C14.4976 6.03703 14.4502 5.97047 14.3923 5.84869C14.3334 5.72467 14.3055 5.56332 14.2499 5.24064L14.0938 4.3363Z" fill="#0F1729"/>
-</svg>`;
-    }
-    /**
-     * Close/X icon for modal close button
-     */
-    function getCloseIcon() {
-        return `<svg class="cv-modal-close-icon" fill="currentColor" height="20px" viewBox="0 0 256 256" width="20px" xmlns="http://www.w3.org/2000/svg">
-    <path d="M205.66,194.34a8,8,0,0,1-11.32,11.32L128,139.31,61.66,205.66a8,8,0,0,1-11.32-11.32L116.69,128,50.34,61.66A8,8,0,0,1,61.66,50.34L128,116.69l66.34-66.35a8,8,0,0,1,11.32,11.32L139.31,128Z"></path>
-  </svg>`;
-    }
-    /**
-     * Reset/refresh icon for reset button
-     */
-    function getResetIcon() {
-        return `<svg class="cv-btn-icon" fill="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M22.719 12A10.719 10.719 0 0 1 1.28 12h.838a9.916 9.916 0 1 0 1.373-5H8v1H2V2h1v4.2A10.71 10.71 0 0 1 22.719 12z"/><path fill="none" d="M0 0h24v24H0z"/>
-  </svg>`;
-    }
-    /**
-     * Copy icon for sharing URL button
-     */
-    function getCopyIcon() {
-        return `<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="18" height="18" viewBox="0 0 18 18" version="1.1" fill="currentColor">
-              <g id="surface1">
-                <path d="M 11.273438 0 L 2.546875 0 C 1.746094 0 1.089844 0.613281 1.089844
-                1.363281 L 1.089844 10.910156 L 2.546875 10.910156 L 2.546875 1.363281 L 11.273438
-                1.363281 Z M 13.453125 2.726562 L 5.453125 2.726562 C 4.65625 2.726562 4 3.339844 4
-                4.089844 L 4 13.636719 C 4 14.386719 4.65625 15 5.453125 15 L 13.453125 15 C 14.253906
-                15 14.910156 14.386719 14.910156 13.636719 L 14.910156 4.089844 C 14.910156 3.339844
-                14.253906 2.726562 13.453125 2.726562 Z M 13.453125 13.636719 L 5.453125 13.636719 L
-                5.453125 4.089844 L 13.453125 4.089844 Z M 13.453125 13.636719 "></path>
-              </g>
-          </svg>`;
-    }
-    function getTickIcon() {
-        return `<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="2 2 22 22" fill="currentColor">
-            <path d="M 19.28125 5.28125 L 9 15.5625 L 4.71875 11.28125 L 3.28125 12.71875 L 8.28125 17.71875 
-            L 9 18.40625 L 9.71875 17.71875 L 20.71875 6.71875 Z"></path>
-          </svg>`;
-    }
-    function getNavHeadingOnIcon() {
-        return `<svg xmlns="http://www.w3.org/2000/svg" width="250" height="181" viewBox="0 0 250 181">
-            <rect y="34.5001" width="250" height="146" rx="4" stroke="currentColor" stroke-width="10" fill="none"/>
-            <line x1="27" y1="62.0001" x2="77" y2="62.0001" stroke="currentColor" stroke-width="5"/>
-            <line x1="27" y1="77.8888" x2="77" y2="77.8888" stroke="currentColor" stroke-width="5"/>
-            <line x1="27" y1="97.4454" x2="221" y2="97.4454" stroke="currentColor" stroke-width="5"/>
-            <line x1="27" y1="114.555" x2="221" y2="114.555" stroke="currentColor" stroke-width="5"/>
-            <line x1="27" y1="132.889" x2="221" y2="132.889" stroke="currentColor" stroke-width="5"/>
-            <line x1="27" y1="150" x2="221" y2="150" stroke="currentColor" stroke-width="5"/>
-            <line x1="247.5" y1="43.0001" x2="247.5" y2="13.0001" stroke="currentColor" stroke-width="5" stroke-linecap="round"/>
-            <path d="M185 12.5001L247 12.5001" stroke="currentColor" stroke-width="5" stroke-linecap="round"/>
-            <line x1="204.09" y1="36.6095" x2="181.698" y2="10.0228" stroke="currentColor" stroke-width="5" stroke-linecap="round"/>
-            <path d="M125 9.50012L181 9.50012" stroke="currentColor" stroke-width="5" stroke-linecap="round"/>
-            <path d="M144.305 35.2579L120.095 6.56679" stroke="currentColor" stroke-width="5" stroke-linecap="round"/>
-            <path d="M120 6.50037L64 6.50037" stroke="currentColor" stroke-width="5" stroke-linecap="round"/>
-            <path d="M87.1957 36.1024L59 2.50008" stroke="currentColor" stroke-width="5" stroke-linecap="round"/>
-            <path d="M59 2.50037L3 2.50037" stroke="currentColor" stroke-width="5" stroke-linecap="round"/>
-            <path d="M2.5 38.5001L2.5 3.00012" stroke="currentColor" stroke-width="5" stroke-linecap="round"/>
-          </svg>`;
-    }
-    function getNavHeadingOffIcon() {
-        return `<svg xmlns="http://www.w3.org/2000/svg" width="250" height="181" viewBox="0 0 250 181" fill="currentColor">
-            <rect y="34.5001" width="250" height="146" rx="4" stroke="currentColor" stroke-width="10" fill="none"/>
-            <line x1="27" y1="62" x2="77" y2="62" stroke="currentColor" stroke-width="5"/>
-            <line x1="27" y1="77.8887" x2="77" y2="77.8887" stroke="currentColor" stroke-width="5"/>
-            <line x1="27" y1="97.4453" x2="221" y2="97.4453" stroke="currentColor" stroke-width="5"/>
-            <line x1="27" y1="114.555" x2="221" y2="114.555" stroke="currentColor" stroke-width="5"/>
-            <line x1="27" y1="132.889" x2="221" y2="132.889" stroke="currentColor" stroke-width="5"/>
-            <line x1="27" y1="150" x2="221" y2="150" stroke="currentColor" stroke-width="5"/>
-          </svg>`;
-    }
-    /**
-     * Transition Icon for Navigation Headings
-     */
-    function getNavDashed() {
-        return `<svg xmlns="http://www.w3.org/2000/svg" width="250" height="181" viewBox="0 0 250 181">
-            <rect y="34.5001" width="250" height="146" rx="4" stroke="currentColor" stroke-width="10" fill="none"/>
-            <line x1="27" y1="62.0001" x2="77" y2="62.0001" stroke="currentColor" stroke-width="5"/>
-            <line x1="27" y1="77.8888" x2="77" y2="77.8888" stroke="currentColor" stroke-width="5"/>
-            <line x1="27" y1="97.4454" x2="221" y2="97.4454" stroke="currentColor" stroke-width="5"/>
-            <line x1="27" y1="114.555" x2="221" y2="114.555" stroke="currentColor" stroke-width="5"/>
-            <line x1="27" y1="132.889" x2="221" y2="132.889" stroke="currentColor" stroke-width="5"/>
-            <line x1="27" y1="150" x2="221" y2="150" stroke="currentColor" stroke-width="5"/>
-            <path d="M245 37.0001V39.5001H250V37.0001H247.5H245ZM250 13.0001C250 11.6194 248.881 10.5001 247.5 10.5001C246.119 10.5001 245 11.6194 245 13.0001H247.5H250ZM250 31.0001C250 29.6194 248.881 28.5001 247.5 28.5001C246.119 28.5001 245 29.6194 245 31.0001H247.5H250ZM245 19.0001C245 20.3808 246.119 21.5001 247.5 21.5001C248.881 21.5001 250 20.3808 250 19.0001H247.5H245ZM247.5 37.0001H250V31.0001H247.5H245V37.0001H247.5ZM247.5 19.0001H250V13.0001H247.5H245V19.0001H247.5Z" fill="currentColor"/>
-            <line x1="204.09" y1="36.6095" x2="181.698" y2="10.0228" stroke="currentColor" stroke-width="5" stroke-linecap="round" stroke-dasharray="10 10"/>
-            <path d="M125 9.50012L181 9.50012" stroke="currentColor" stroke-width="5" stroke-linecap="round" stroke-dasharray="10 10"/>
-            <path d="M144.305 35.2579L120.095 6.56679" stroke="currentColor" stroke-width="5" stroke-linecap="round" stroke-dasharray="10 10"/>
-            <path d="M120 6.50037L64 6.50037" stroke="currentColor" stroke-width="5" stroke-linecap="round" stroke-dasharray="10 10"/>
-            <path d="M87.1957 36.1024L59 2.50008" stroke="currentColor" stroke-width="5" stroke-linecap="round" stroke-dasharray="10 10"/>
-            <path d="M59 2.50037L3 2.50037" stroke="currentColor" stroke-width="5" stroke-linecap="round" stroke-dasharray="10 10"/>
-            <path d="M2.5 38.5001L2.5 3.00012" stroke="currentColor" stroke-width="5" stroke-linecap="round" stroke-dasharray="10 10"/>
-            <path d="M185 12.5001L247 12.5001" stroke="currentColor" stroke-width="5" stroke-linecap="round" stroke-dasharray="10 10"/>
-          </svg>`;
-    }
-
     class CustomViewsWidget {
         core;
         container;
         widgetIcon = null;
         options;
+        _hasVisibleConfig = false;
+        pageToggleIds = new Set();
+        pageTabIds = new Set();
         // Modal state
-        modal = null;
+        stateModal = null;
         constructor(options) {
             this.core = options.core;
             this.container = options.container || document.body;
@@ -2707,12 +3083,41 @@ ${TAB_STYLES}
                 welcomeMessage: options.welcomeMessage || 'This site is powered by Custom Views. Use the widget on the side (⚙) to customize your experience. Your preferences will be saved and can be shared via URL.<br><br>Learn more at <a href="https://github.com/customviews-js/customviews" target="_blank">customviews GitHub</a>.',
                 showTabGroups: options.showTabGroups ?? true
             };
-            // No external state manager to initialize
+            // Determine if there are any configurations to show
+            const config = this.core.getConfig();
+            const allToggles = config?.toggles || [];
+            const visibleToggles = allToggles.filter(toggle => {
+                if (toggle.isLocal) {
+                    return !!document.querySelector(`[data-cv-toggle="${toggle.id}"], [data-cv-toggle-group-id="${toggle.id}"]`);
+                }
+                return true;
+            });
+            const allTabGroups = this.core.getTabGroups() || [];
+            const visibleTabGroups = allTabGroups.filter(group => {
+                if (group.isLocal) {
+                    return !!document.querySelector(`cv-tabgroup[id="${group.id}"]`);
+                }
+                return true;
+            });
+            if (visibleToggles.length > 0 || (this.options.showTabGroups && visibleTabGroups.length > 0)) {
+                this._hasVisibleConfig = true;
+            }
+            // Scan for page-declared local components and cache them
+            // Do this on initialization to avoid querying DOM repeatedly
+            const pageTogglesAttr = document.querySelector('[data-cv-page-local-toggles]')?.getAttribute('data-cv-page-local-toggles') || '';
+            this.pageToggleIds = new Set(pageTogglesAttr.split(',').map(id => id.trim()).filter(id => id));
+            const pageTabsAttr = document.querySelector('[data-cv-page-local-tabs]')?.getAttribute('data-cv-page-local-tabs') || '';
+            this.pageTabIds = new Set(pageTabsAttr.split(',').map(id => id.trim()).filter(id => id));
         }
         /**
-         * Render the widget
+         * Render the widget modal icon
+         *
+         * Does not render if there are no visible toggles or tab groups.
          */
-        render() {
+        renderModalIcon() {
+            if (!this._hasVisibleConfig) {
+                return;
+            }
             this.widgetIcon = this.createWidgetIcon();
             this.attachEventListeners();
             // Always append to body since it's a floating icon
@@ -2745,9 +3150,9 @@ ${TAB_STYLES}
                 this.widgetIcon = null;
             }
             // Clean up modal
-            if (this.modal) {
-                this.modal.remove();
-                this.modal = null;
+            if (this.stateModal) {
+                this.stateModal.remove();
+                this.stateModal = null;
             }
         }
         attachEventListeners() {
@@ -2760,294 +3165,299 @@ ${TAB_STYLES}
          * Close the modal
          */
         closeModal() {
-            if (this.modal) {
-                this.modal.remove();
-                this.modal = null;
+            if (this.stateModal) {
+                this.stateModal.classList.add('cv-hidden');
             }
         }
         /**
          * Open the custom state creator
          */
         openStateModal() {
-            // Get toggles from current configuration and open the modal regardless of count
-            const config = this.core.getConfig();
-            const toggles = config?.allToggles || [];
-            this.createCustomStateModal(toggles);
+            if (!this.stateModal) {
+                this._createStateModal();
+            }
+            this._updateStateModalContent();
+            this.stateModal.classList.remove('cv-hidden');
         }
         /**
-         * Create the custom state creator modal
+         * Create the custom state creator modal shell and attach listeners
          */
-        createCustomStateModal(toggles) {
-            // Close existing modal
-            this.closeModal();
-            this.modal = document.createElement('div');
-            this.modal.className = 'cv-widget-modal-overlay';
+        _createStateModal() {
+            this.stateModal = document.createElement('div');
+            this.stateModal.className = 'cv-widget-modal-overlay cv-hidden';
             this.applyThemeToModal();
-            const toggleControlsHtml = toggles.map(toggle => `
-      <div class="cv-toggle-card">
-        <div class="cv-toggle-content">
-          <div>
-            <p class="cv-toggle-title">${this.formatToggleName(toggle)}</p>
-          </div>
-          <label class="cv-toggle-label">
-            <input class="cv-toggle-input" type="checkbox" data-toggle="${toggle}"/>
-            <span class="cv-toggle-slider"></span>
-          </label>
-        </div>
-      </div>
+            document.body.appendChild(this.stateModal);
+            this._attachStateModalFrameEventListeners();
+        }
+        /**
+         * Update the content of the state modal
+         */
+        _updateStateModalContent() {
+            if (!this.stateModal)
+                return;
+            const pageToggleIds = this.pageToggleIds;
+            const pageTabIds = this.pageTabIds;
+            // Get toggles from current configuration
+            const config = this.core.getConfig();
+            const allToggles = config?.toggles || [];
+            // Filter toggles to only include global and visible/declared local toggles
+            const visibleToggles = allToggles.filter(toggle => {
+                if (toggle.isLocal) {
+                    return pageToggleIds.has(toggle.id) || !!document.querySelector(`[data-cv-toggle="${toggle.id}"], [data-cv-toggle-group-id="${toggle.id}"]`);
+                }
+                return true; // Keep global toggles
+            });
+            const toggleControlsHtml = visibleToggles.map(toggle => `
+      <div class="cv-toggle-card">
+        <div class="cv-toggle-content">
+          <div>
+            <p class="cv-toggle-title">${toggle.label || toggle.id}</p>
+          </div>
+          <label class="cv-toggle-label">
+            <input class="cv-toggle-input" type="checkbox" data-toggle="${toggle.id}"/>
+            <span class="cv-toggle-slider"></span>
+          </label>
+        </div>
+      </div>
     `).join('');
-            // Todo: Re-add description if needed (Line 168, add label field to toggles if needed change structure)
-            // <p class="cv-toggle-description">Show or hide the ${this.formatToggleName(toggle).toLowerCase()} area </p>
             // Get tab groups
-            const tabGroups = this.core.getTabGroups();
+            const allTabGroups = this.core.getTabGroups() || [];
+            const tabGroups = allTabGroups.filter(group => {
+                if (group.isLocal) {
+                    return pageTabIds.has(group.id) || !!document.querySelector(`cv-tabgroup[id="${group.id}"]`);
+                }
+                return true; // Keep global tab groups
+            });
             let tabGroupControlsHTML = '';
             if (this.options.showTabGroups && tabGroups && tabGroups.length > 0) {
-                // Determine initial nav visibility state
                 const initialNavsVisible = TabManager.areNavsVisible(document.body);
-                tabGroupControlsHTML = `
-        <div class="cv-tabgroup-card cv-tabgroup-header">
-          <div class="cv-tabgroup-row">
-            <div class="cv-tabgroup-logo-box" id="cv-nav-icon-box">
-              <div class="cv-nav-icon" id="cv-nav-icon">${initialNavsVisible ? getNavHeadingOnIcon() : getNavHeadingOffIcon()}</div>
-            </div>
-            <div class="cv-tabgroup-info">
-              <div class="cv-tabgroup-title-container">
-                <p class="cv-tabgroup-title">Navigation Headers</p>
-              </div>
-              <p class="cv-tabgroup-description">Show or hide navigation headers</p>
-            </div>
-            <label class="cv-toggle-switch cv-nav-toggle">
-              <input class="cv-nav-pref-input" type="checkbox" ${initialNavsVisible ? 'checked' : ''} aria-label="Show or hide navigation headers" />
-              <span class="cv-switch-bg"></span>
-              <span class="cv-switch-knob"></span>
-            </label>
-          </div>
-        </div>
-        <div class="cv-tab-groups-list">
-          ${tabGroups.map(group => `
-            <div class="cv-tabgroup-card cv-tabgroup-item">
-              <label class="cv-tabgroup-label" for="tab-group-${group.id}">
-                ${group.label || group.id}
-              </label>
-              <select id="tab-group-${group.id}" class="cv-tabgroup-select" data-group-id="${group.id}">
-                ${group.tabs.map(tab => `<option value="${tab.id}">${tab.label || tab.id}</option>`).join('')}
-              </select>
-            </div>
-          `).join('')}
-        </div>
+                tabGroupControlsHTML = `
+        <div class="cv-tabgroup-card cv-tabgroup-header">
+          <div class="cv-tabgroup-row">
+            <div class="cv-tabgroup-logo-box" id="cv-nav-icon-box">
+              <div class="cv-nav-icon" id="cv-nav-icon">${initialNavsVisible ? getNavHeadingOnIcon() : getNavHeadingOffIcon()}</div>
+            </div>
+            <div class="cv-tabgroup-info">
+              <div class="cv-tabgroup-title-container">
+                <p class="cv-tabgroup-title">Navigation Headers</p>
+              </div>
+              <p class="cv-tabgroup-description">Show or hide navigation headers</p>
+            </div>
+            <label class="cv-toggle-switch cv-nav-toggle">
+              <input class="cv-nav-pref-input" type="checkbox" ${initialNavsVisible ? 'checked' : ''} aria-label="Show or hide navigation headers" />
+              <span class="cv-switch-bg"></span>
+              <span class="cv-switch-knob"></span>
+            </label>
+          </div>
+        </div>
+        <div class="cv-tab-groups-list">
+          ${tabGroups.map(group => `
+            <div class="cv-tabgroup-card cv-tabgroup-item">
+              <label class="cv-tabgroup-label" for="tab-group-${group.id}">
+                ${group.label || group.id}
+              </label>
+              <select id="tab-group-${group.id}" class="cv-tabgroup-select" data-group-id="${group.id}">
+                ${group.tabs.map(tab => `<option value="${tab.id}">${tab.label || tab.id}</option>`).join('')}
+              </select>
+            </div>
+          `).join('')}
+        </div>
       `;
             }
-            this.modal.innerHTML = `
-      <div class="cv-widget-modal cv-custom-state-modal">
-        <header class="cv-modal-header">
-          <div class="cv-modal-header-content">
-            <div class="cv-modal-icon">
-              ${getGearIcon()}
-            </div>
-            <div class="cv-modal-title">${this.options.title}</div>
-          </div>
-          <button class="cv-modal-close" aria-label="Close modal">
-            ${getCloseIcon()}
-          </button>
-        </header>
-        <main class="cv-modal-main">
-          ${this.options.description ? `<p class="cv-modal-description">${this.options.description}</p>` : ''}
-          
-          ${toggles.length ? `
-          <div class="cv-content-section">
-            <div class="cv-section-heading">Toggles</div>
-            <div class="cv-toggles-container">
-              ${toggleControlsHtml}
-            </div>
-          </div>
-          ` : ''}
-          
-          ${this.options.showTabGroups && tabGroups && tabGroups.length > 0 ? `
-          <div class="cv-content-section">
-            <div class="cv-section-heading">Tab Groups</div>
-            <div class="cv-tabgroups-container">
-              ${tabGroupControlsHTML}
-            </div>
-          </div>
-          ` : ''}
-        </main>
-
-        <footer class="cv-modal-footer">
-          ${this.options.showReset ? `
-          <button class="cv-reset-btn">
-            <span class="cv-reset-btn-icon">${getResetIcon()}</span>
-            <span>Reset to Default</span>
-          </button>
-          ` : ''}
-          <button class="cv-share-btn">
-            <span>Copy Shareable URL</span>
-            <span class="cv-share-btn-icon">${getCopyIcon()}</span>
-          </button>
-        </footer>
-      </div>
+            this.stateModal.innerHTML = `
+      <div class="cv-widget-modal cv-custom-state-modal">
+        <header class="cv-modal-header">
+          <div class="cv-modal-header-content">
+            <div class="cv-modal-icon">
+              ${getGearIcon()}
+            </div>
+            <div class="cv-modal-title">${this.options.title}</div>
+          </div>
+          <button class="cv-modal-close" aria-label="Close modal">
+            ${getCloseIcon()}
+          </button>
+        </header>
+        <main class="cv-modal-main">
+          ${this.options.description ? `<p class="cv-modal-description">${this.options.description}</p>` : ''}
+          
+          ${visibleToggles.length ? `
+          <div class="cv-content-section">
+            <div class="cv-section-heading">Toggles</div>
+            <div class="cv-toggles-container">
+              ${toggleControlsHtml}
+            </div>
+          </div>
+          ` : ''}
+          
+          ${this.options.showTabGroups && tabGroups && tabGroups.length > 0 ? `
+          <div class="cv-content-section">
+            <div class="cv-section-heading">Tab Groups</div>
+            <div class="cv-tabgroups-container">
+              ${tabGroupControlsHTML}
+            </div>
+          </div>
+          ` : ''}
+        </main>
+
+        <footer class="cv-modal-footer">
+          ${this.options.showReset ? `
+          <button class="cv-reset-btn">
+            <span class="cv-reset-btn-icon">${getResetIcon()}</span>
+            <span>Reset to Default</span>
+          </button>
+          ` : ''}
+          <button class="cv-share-btn">
+            <span>Copy Shareable URL</span>
+            <span class="cv-share-btn-icon">${getCopyIcon()}</span>
+          </button>
+        </footer>
+      </div>
     `;
-            document.body.appendChild(this.modal);
-            this.attachStateModalEventListeners();
-            // Load current state into form if we're already in a custom state
+            this._attachStateModalContentEventListeners();
             this.loadCurrentStateIntoForm();
         }
         /**
-         * Attach event listeners for custom state creator
+         * Attach event listeners for the modal frame (delegated events)
          */
-        attachStateModalEventListeners() {
-            if (!this.modal)
+        _attachStateModalFrameEventListeners() {
+            if (!this.stateModal)
                 return;
-            // Close button
-            const closeBtn = this.modal.querySelector('.cv-modal-close');
-            if (closeBtn) {
-                closeBtn.addEventListener('click', () => {
+            // Delegated click events
+            this.stateModal.addEventListener('click', (e) => {
+                const target = e.target;
+                // Close button
+                if (target.closest('.cv-modal-close')) {
                     this.closeModal();
-                });
-            }
-            // Copy URL button
-            const copyUrlBtn = this.modal.querySelector('.cv-share-btn');
-            if (copyUrlBtn) {
-                copyUrlBtn.addEventListener('click', () => {
+                    return;
+                }
+                // Copy URL button
+                if (target.closest('.cv-share-btn')) {
                     this.copyShareableURL();
-                    // Visual feedback: change icon to tick for 3 seconds
-                    const iconContainer = copyUrlBtn.querySelector('.cv-share-btn-icon');
+                    const copyUrlBtn = target.closest('.cv-share-btn');
+                    const iconContainer = copyUrlBtn?.querySelector('.cv-share-btn-icon');
                     if (iconContainer) {
                         const originalIcon = iconContainer.innerHTML;
                         iconContainer.innerHTML = getTickIcon();
-                        // Revert after 3 seconds
                         setTimeout(() => {
                             iconContainer.innerHTML = originalIcon;
                         }, 3000);
                     }
-                });
-            }
-            // Reset to default button
-            const resetBtn = this.modal.querySelector('.cv-reset-btn');
-            if (resetBtn) {
-                resetBtn.addEventListener('click', () => {
-                    // Add spinning animation to icon
-                    const resetIcon = resetBtn.querySelector('.cv-reset-btn-icon');
+                    return;
+                }
+                // Reset to default button
+                if (target.closest('.cv-reset-btn')) {
+                    const resetBtn = target.closest('.cv-reset-btn');
+                    const resetIcon = resetBtn?.querySelector('.cv-reset-btn-icon');
                     if (resetIcon) {
                         resetIcon.classList.add('cv-spinning');
                     }
                     this.core.resetToDefault();
                     this.loadCurrentStateIntoForm();
-                    // Remove spinning animation after it completes
                     setTimeout(() => {
                         if (resetIcon) {
                             resetIcon.classList.remove('cv-spinning');
                         }
-                    }, 600); // 600ms matches the animation duration
-                });
-            }
+                    }, 600);
+                    return;
+                }
+                // Overlay click to close
+                if (e.target === this.stateModal) {
+                    this.closeModal();
+                }
+            });
+            // Escape key to close
+            const handleEscape = (e) => {
+                if (e.key === 'Escape') {
+                    this.closeModal();
+                }
+            };
+            // We can't remove this listener easily if it's anonymous, so we attach it to the document
+            // and it will stay for the lifetime of the widget. This is acceptable.
+            document.addEventListener('keydown', handleEscape);
+        }
+        /**
+         * Attach event listeners for custom state creator's dynamic content
+         */
+        _attachStateModalContentEventListeners() {
+            if (!this.stateModal)
+                return;
             // Listen to toggle switches
-            const toggleInputs = this.modal.querySelectorAll('.cv-toggle-input');
+            const toggleInputs = this.stateModal.querySelectorAll('.cv-toggle-input');
             toggleInputs.forEach(toggleInput => {
                 toggleInput.addEventListener('change', () => {
                     const state = this.getCurrentCustomStateFromModal();
-                    this.core.applyState(state);
+                    this.core.applyState(state, { source: 'widget' });
                 });
             });
             // Listen to tab group selects
-            const tabGroupSelects = this.modal.querySelectorAll('.cv-tabgroup-select');
+            const tabGroupSelects = this.stateModal.querySelectorAll('.cv-tabgroup-select');
             tabGroupSelects.forEach(select => {
                 select.addEventListener('change', () => {
                     const groupId = select.dataset.groupId;
                     const tabId = select.value;
                     if (groupId && tabId) {
-                        // Get current state and update the tab for this group, then apply globally
-                        // This triggers sync behavior and persistence
                         const currentTabs = this.core.getCurrentActiveTabs();
                         currentTabs[groupId] = tabId;
-                        // Apply state globally for persistence and sync
                         const currentToggles = this.core.getCurrentActiveToggles();
                         const newState = {
                             toggles: currentToggles,
                             tabs: currentTabs
                         };
-                        this.core.applyState(newState);
+                        this.core.applyState(newState, { source: 'widget' });
                     }
                 });
             });
             // Listener for show/hide tab navs
-            const tabNavToggle = this.modal.querySelector('.cv-nav-pref-input');
-            const navIcon = this.modal?.querySelector('#cv-nav-icon');
-            const navHeaderCard = this.modal?.querySelector('.cv-tabgroup-card.cv-tabgroup-header');
+            const tabNavToggle = this.stateModal.querySelector('.cv-nav-pref-input');
+            const navIcon = this.stateModal?.querySelector('#cv-nav-icon');
+            const navHeaderCard = this.stateModal?.querySelector('.cv-tabgroup-card.cv-tabgroup-header');
             if (tabNavToggle && navIcon && navHeaderCard) {
-                // Helper to update icon based on state
                 const updateIcon = (isVisible, isHovering = false) => {
                     if (isHovering) {
-                        // On hover, show the transition icon
                         navIcon.innerHTML = getNavDashed();
                     }
                     else {
-                        // Normal state, show the status icon (on if visible, off if hidden)
                         navIcon.innerHTML = isVisible ? getNavHeadingOnIcon() : getNavHeadingOffIcon();
                     }
                 };
-                // Add hover listeners to entire header card
-                navHeaderCard.addEventListener('mouseenter', () => {
-                    updateIcon(tabNavToggle.checked, true);
-                });
-                navHeaderCard.addEventListener('mouseleave', () => {
-                    updateIcon(tabNavToggle.checked, false);
-                });
-                // Add change listener
+                navHeaderCard.addEventListener('mouseenter', () => updateIcon(tabNavToggle.checked, true));
+                navHeaderCard.addEventListener('mouseleave', () => updateIcon(tabNavToggle.checked, false));
                 tabNavToggle.addEventListener('change', () => {
                     const visible = tabNavToggle.checked;
-                    // Update the icon based on new state (not hovering)
                     updateIcon(visible, false);
-                    // Persist preference via core
                     this.core.persistTabNavVisibility(visible);
-                    // Apply to DOM using TabManager via core
                     try {
-                        const rootEl = document.body;
-                        TabManager.setNavsVisibility(rootEl, visible);
+                        TabManager.setNavsVisibility(document.body, visible);
                     }
                     catch (e) {
-                        // ignore errors
                         console.error('Failed to set tab nav visibility:', e);
                     }
                 });
             }
-            // Overlay click to close
-            this.modal.addEventListener('click', (e) => {
-                if (e.target === this.modal) {
-                    this.closeModal();
-                }
-            });
-            // Escape key to close
-            const handleEscape = (e) => {
-                if (e.key === 'Escape') {
-                    this.closeModal();
-                    document.removeEventListener('keydown', handleEscape);
-                }
-            };
-            document.addEventListener('keydown', handleEscape);
         }
         /**
          * Apply theme class to the modal overlay based on options
          */
         applyThemeToModal() {
-            if (!this.modal)
+            if (!this.stateModal)
                 return;
             if (this.options.theme === 'dark') {
-                this.modal.classList.add('cv-widget-theme-dark');
+                this.stateModal.classList.add('cv-widget-theme-dark');
             }
             else {
-                this.modal.classList.remove('cv-widget-theme-dark');
+                this.stateModal.classList.remove('cv-widget-theme-dark');
             }
         }
         /**
          * Get current state from form values
          */
         getCurrentCustomStateFromModal() {
-            if (!this.modal) {
+            if (!this.stateModal) {
                 return {};
             }
             // Collect toggle values
             const toggles = [];
-            const toggleInputs = this.modal.querySelectorAll('.cv-toggle-input');
+            const toggleInputs = this.stateModal.querySelectorAll('.cv-toggle-input');
             toggleInputs.forEach(toggleInput => {
                 const toggle = toggleInput.dataset.toggle;
                 if (toggle && toggleInput.checked) {
@@ -3055,7 +3465,7 @@ ${TAB_STYLES}
                 }
             });
             // Collect tab selections
-            const tabGroupSelects = this.modal.querySelectorAll('.cv-tabgroup-select');
+            const tabGroupSelects = this.stateModal.querySelectorAll('.cv-tabgroup-select');
             const tabs = {};
             tabGroupSelects.forEach(select => {
                 const groupId = select.dataset.groupId;
@@ -3083,25 +3493,25 @@ ${TAB_STYLES}
          * Load current state into form based on currently active toggles
          */
         loadCurrentStateIntoForm() {
-            if (!this.modal)
+            if (!this.stateModal)
                 return;
             // Get currently active toggles (from custom state or default configuration)
             const activeToggles = this.core.getCurrentActiveToggles();
             // First, uncheck all toggle inputs
-            const allToggleInputs = this.modal.querySelectorAll('.cv-toggle-input');
+            const allToggleInputs = this.stateModal.querySelectorAll('.cv-toggle-input');
             allToggleInputs.forEach(toggleInput => {
                 toggleInput.checked = false;
             });
             // Then check the ones that should be active
             activeToggles.forEach(toggle => {
-                const toggleInput = this.modal?.querySelector(`[data-toggle="${toggle}"]`);
+                const toggleInput = this.stateModal?.querySelector(`[data-toggle="${toggle}"]`);
                 if (toggleInput) {
                     toggleInput.checked = true;
                 }
             });
             // Load tab group selections
             const activeTabs = this.core.getCurrentActiveTabs();
-            const tabGroupSelects = this.modal.querySelectorAll('.cv-tabgroup-select');
+            const tabGroupSelects = this.stateModal.querySelectorAll('.cv-tabgroup-select');
             tabGroupSelects.forEach(select => {
                 const groupId = select.dataset.groupId;
                 if (groupId && activeTabs[groupId]) {
@@ -3116,8 +3526,8 @@ ${TAB_STYLES}
                 }
                 return TabManager.areNavsVisible(document.body);
             })();
-            const tabNavToggle = this.modal.querySelector('.cv-nav-pref-input');
-            const navIcon = this.modal?.querySelector('#cv-nav-icon');
+            const tabNavToggle = this.stateModal.querySelector('.cv-nav-pref-input');
+            const navIcon = this.stateModal?.querySelector('#cv-nav-icon');
             if (tabNavToggle) {
                 tabNavToggle.checked = navPref;
                 // Ensure UI matches actual visibility
@@ -3128,33 +3538,22 @@ ${TAB_STYLES}
                 }
             }
         }
-        /**
-         * Format toggle name for display
-         */
-        formatToggleName(toggle) {
-            return toggle.charAt(0).toUpperCase() + toggle.slice(1);
-        }
         /**
          * Check if this is the first visit and show welcome modal
          */
         showWelcomeModalIfFirstVisit() {
+            if (!this._hasVisibleConfig)
+                return;
             const STORAGE_KEY = 'cv-welcome-shown';
             // Check if welcome has been shown before
             const hasSeenWelcome = localStorage.getItem(STORAGE_KEY);
             if (!hasSeenWelcome) {
-                // Check if this page has any custom views elements
-                const hasCustomViewElements = document.querySelector('cv-tabgroup') !== null ||
-                    document.querySelector('cv-tab') !== null ||
-                    document.querySelector('cv-toggle') !== null ||
-                    document.querySelector('[data-cv-toggle]') !== null;
-                if (hasCustomViewElements) {
-                    // Show welcome modal after a short delay to let the page settle
-                    setTimeout(() => {
-                        this.createWelcomeModal();
-                    }, 500);
-                    // Mark as shown
-                    localStorage.setItem(STORAGE_KEY, 'true');
-                }
+                // Show welcome modal after a short delay to let the page settle
+                setTimeout(() => {
+                    this.createWelcomeModal();
+                }, 500);
+                // Mark as shown
+                localStorage.setItem(STORAGE_KEY, 'true');
             }
         }
         /**
@@ -3162,62 +3561,63 @@ ${TAB_STYLES}
          */
         createWelcomeModal() {
             // Don't show if there's already a modal open
-            if (this.modal)
+            if (this.stateModal && !this.stateModal.classList.contains('cv-hidden'))
                 return;
-            this.modal = document.createElement('div');
-            this.modal.className = 'cv-widget-modal-overlay cv-welcome-modal-overlay';
-            this.applyThemeToModal();
-            this.modal.innerHTML = `
-      <div class="cv-widget-modal cv-welcome-modal">
-        <header class="cv-modal-header">
-          <div class="cv-modal-header-content">
-            <div class="cv-modal-icon">
-              ${getGearIcon()}
-            </div>
-            <h1 class="cv-modal-title">${this.options.welcomeTitle}</h1>
-          </div>
-        </header>
-        <div class="cv-modal-main">
-          <p class="cv-welcome-message">${this.options.welcomeMessage}</p>
-          
-          <div class="cv-welcome-widget-preview">
-            <div class="cv-welcome-widget-icon">
-              ${getGearIcon()}
-            </div>
-            <p class="cv-welcome-widget-label">Look for this widget</p>
-          </div>
-          
-          <button class="cv-welcome-got-it">Got it!</button>
-        </div>
-      </div>
+            const welcomeModal = document.createElement('div');
+            welcomeModal.className = 'cv-widget-modal-overlay cv-welcome-modal-overlay';
+            if (this.options.theme === 'dark') {
+                welcomeModal.classList.add('cv-widget-theme-dark');
+            }
+            welcomeModal.innerHTML = `
+      <div class="cv-widget-modal cv-welcome-modal">
+        <header class="cv-modal-header">
+          <div class="cv-modal-header-content">
+            <div class="cv-modal-icon">
+              ${getGearIcon()}
+            </div>
+            <h1 class="cv-modal-title">${this.options.welcomeTitle}</h1>
+          </div>
+        </header>
+        <div class="cv-modal-main">
+          <p class="cv-welcome-message">${this.options.welcomeMessage}</p>
+          
+          <div class="cv-welcome-widget-preview">
+            <div class="cv-welcome-widget-icon">
+              ${getGearIcon()}
+            </div>
+            <p class="cv-welcome-widget-label">Look for this widget</p>
+          </div>
+          
+          <button class="cv-welcome-got-it">Got it!</button>
+        </div>
+      </div>
     `;
-            document.body.appendChild(this.modal);
-            this.attachWelcomeModalEventListeners();
+            document.body.appendChild(welcomeModal);
+            this.attachWelcomeModalEventListeners(welcomeModal);
         }
         /**
          * Attach event listeners for welcome modal
          */
-        attachWelcomeModalEventListeners() {
-            if (!this.modal)
-                return;
+        attachWelcomeModalEventListeners(welcomeModal) {
+            const closeModal = () => {
+                welcomeModal.remove();
+                document.removeEventListener('keydown', handleEscape);
+            };
             // Got it button
-            const gotItBtn = this.modal.querySelector('.cv-welcome-got-it');
+            const gotItBtn = welcomeModal.querySelector('.cv-welcome-got-it');
             if (gotItBtn) {
-                gotItBtn.addEventListener('click', () => {
-                    this.closeModal();
-                });
+                gotItBtn.addEventListener('click', closeModal);
             }
             // Overlay click to close
-            this.modal.addEventListener('click', (e) => {
-                if (e.target === this.modal) {
-                    this.closeModal();
+            welcomeModal.addEventListener('click', (e) => {
+                if (e.target === welcomeModal) {
+                    closeModal();
                 }
             });
             // Escape key to close
             const handleEscape = (e) => {
                 if (e.key === 'Escape') {
-                    this.closeModal();
-                    document.removeEventListener('keydown', handleEscape);
+                    closeModal();
                 }
             };
             document.addEventListener('keydown', handleEscape);
@@ -3287,7 +3687,7 @@ ${TAB_STYLES}
                         console.warn(`[CustomViews] Config file not found at ${fullConfigPath}. Using defaults.`);
                         // Provide minimal default config structure
                         configFile = {
-                            config: { allToggles: [], defaultState: {} },
+                            config: { toggles: [], defaultState: {} },
                             widget: { enabled: true }
                         };
                     }
@@ -3325,7 +3725,7 @@ ${TAB_STYLES}
                         core,
                         ...configFile.widget
                     });
-                    widget.render();
+                    widget.renderModalIcon();
                     // Store widget instance
                     window.customViewsInstance.widget = widget;
                     console.log('[CustomViews] Widget initialized and rendered');