bitwrench 2.0.16 → 2.0.18

package/src/bitwrench.js

@@ -8,11 +8,11 @@
  */
 
 import { VERSION_INFO } from './version.js';
-import { getStructuralStyles,
-         generateThemedCSS, generateAlternateCSS, derivePalette as _derivePalette,
+import { getStructuralStyles, getResetStyles,
+         generateThemedCSS, derivePalette as _derivePalette,
          DEFAULT_PALETTE_CONFIG, SPACING_PRESETS, RADIUS_PRESETS, THEME_PRESETS,
          TYPE_RATIO_PRESETS, ELEVATION_PRESETS, MOTION_PRESETS, generateTypeScale,
-         resolveLayout } from './bitwrench-styles.js';
+         resolveLayout, scopeRulesUnder } from './bitwrench-styles.js';
 import { hexToHsl, hslToHex, adjustLightness, mixColor,
          relativeLuminance, textOnColor, deriveShades,
          derivePalette, harmonize, deriveAlternateSeed, deriveAlternateConfig,
@@ -80,7 +80,7 @@ const bw = {
   __monkey_patch_is_nodejs__: {
     _value: 'ignore',
     set: function(x) {
-      this._value = (typeof x === 'boolean') ? x : 'ignore';
+      this._value = _is(x, 'boolean') ? x : 'ignore';
     },
     get: function() {
       return this._value;
@@ -128,6 +128,67 @@ Object.defineProperty(bw, '_isBrowser', {
   configurable: true
 });
 
+// ── Internal aliases ─────────────────────────────────────────────────────
+// Short names for frequently-used builtins and internal methods.
+// Same pattern as v1 (_to = bw.typeOf, etc.).
+//
+// Why: Terser can't shorten global property chains (console.warn,
+// Object.prototype.hasOwnProperty, Array.isArray, document.createElement)
+// because it can't prove they're side-effect-free. We can, so we alias
+// them here. Each alias saves bytes in the minified output, and the short
+// names also reduce visual noise in the hot paths (binding pipeline,
+// createDOM, etc.).
+//
+// Alias       Target                                  Sites
+// ─────────   ──────────────────────────────────────   ─────
+// _hop        Object.prototype.hasOwnProperty          15
+// _isA        Array.isArray                             25
+// _keys       Object.keys                               7
+// _to         bw.typeOf (type string)                   26
+// _is         type check boolean: _is(x,'string')       ~50
+// _cw         console.warn                               8
+// _cl         console.log                               11
+// _ce         console.error                              4
+// _chp        ComponentHandle.prototype                 28  (defined after constructor)
+//
+// Note: document.createElement etc. are NOT aliased because they require
+// `this === document` and .bind() would add overhead on every call.
+// Console aliases use thin wrappers (not direct refs) so test monkey-
+// patching of console.warn/log/error continues to work.
+//
+// `typeof x` for UNDECLARED globals (window, document, process, require,
+// EventSource, navigator, Promise, __filename, import.meta) MUST stay as
+// raw `typeof` — calling _to(x) when x doesn't exist throws ReferenceError.
+//
+// ── v1 functional type helpers (kept for reference, not currently used) ──
+// _toa(x, type, trueVal, falseVal) — bw.typeAssign:
+//   returns trueVal if _to(x)===type, else falseVal.
+//   Replaces: (typeof x === 'string') ? A : B → _toa(x,'string',A,B)
+// _toc(x, type, trueVal, falseVal) — bw.typeConvert:
+//   same as _toa but if trueVal/falseVal are functions, calls them with x.
+//   Replaces: typeof x === 'string' ? fn(x) : default → _toc(x,'string',fn,default)
+// Uncomment if pattern frequency justifies them:
+// var _toa = function(x, t, y, n) { return _to(x) === t ? y : n; };
+// var _toc = function(x, t, y, n) { var r = _to(x)===t; return r ? (_to(y)==='function'?y(x):y) : (_to(n)==='function'?n(x):n); };
+// ─────────────────────────────────────────────────────────────────────────
+var _hop  = Object.prototype.hasOwnProperty;
+var _isA  = Array.isArray;
+var _keys = Object.keys;
+var _to   = _typeOf;  // imported from bitwrench-utils.js
+var _is   = function(x, t) { var r = _to(x); return r === t || r.toLowerCase() === t; };
+// Console aliases use thin wrappers (not direct references) so that test
+// code can monkey-patch console.warn/log/error and the patches take effect.
+var _cw   = function() { console.warn.apply(console, arguments); };
+var _cl   = function() { console.log.apply(console, arguments); };
+var _ce   = function() { console.error.apply(console, arguments); };
+
+/**
+ * Debug flag. When true, emits console.warn for silent binding failures
+ * (missing paths, null refs, auto-created intermediate objects).
+ * @type {boolean}
+ */
+bw.debug = false;
+
 /**
  * Lazy-resolve Node.js `fs` module.
  * Tries require('fs') first (available in CJS/UMD Node.js builds),
@@ -275,7 +336,7 @@ bw.uuid = function(prefix) {
  */
 bw._el = function(id) {
   // Pass-through for DOM elements
-  if (typeof id !== 'string') return id || null;
+  if (!_is(id, 'string')) return id || null;
   if (!id) return null;
   if (!bw._isBrowser) return null;
 
@@ -303,7 +364,12 @@ bw._el = function(id) {
     el = document.querySelector('[data-bw_id="' + id + '"]');
   }
 
-  // 5. Cache the result for next time
+  // 5. Try class-based lookup for bw_uuid_* tokens (UUID addressing)
+  if (!el && id.indexOf('bw_uuid_') === 0) {
+    el = document.querySelector('.' + id);
+  }
+
+  // 6. Cache the result for next time
   if (el) {
     bw._nodeMap[id] = el;
   }
@@ -356,6 +422,84 @@ bw._deregisterNode = function(el, bwId) {
   }
 };
 
+// ===================================================================================
+// bw.assignUUID() / bw.getUUID() — Explicit UUID addressing for TACO objects
+// ===================================================================================
+
+/**
+ * Regex to match a bw_uuid_* token in a class string.
+ * @private
+ */
+var _UUID_RE = /\bbw_uuid_[a-z0-9_]+\b/;
+
+/**
+ * Assign a UUID to a TACO object by appending a `bw_uuid_*` token to `taco.a.class`.
+ *
+ * Idempotent by default — calling twice returns the same UUID. Pass `forceNew=true`
+ * to replace an existing UUID (useful in loops where each TACO needs a unique ID).
+ *
+ * @param {Object} taco - A TACO object `{t, a, c, o}`
+ * @param {boolean} [forceNew=false] - If true, replaces any existing UUID with a new one
+ * @returns {string} The UUID string (e.g. 'bw_uuid_a1b2c3d4e5')
+ * @category Identifiers
+ * @example
+ * var card = bw.makeStatCard({ value: '0', label: 'Scans' });
+ * var uuid = bw.assignUUID(card);        // 'bw_uuid_a1b2c3d4e5'
+ * var same = bw.assignUUID(card);        // same UUID (idempotent)
+ * var diff = bw.assignUUID(card, true);  // new UUID (forced)
+ */
+bw.assignUUID = function(taco, forceNew) {
+  if (!taco || !_is(taco, 'object')) return null;
+
+  // Ensure taco.a exists
+  if (!taco.a) taco.a = {};
+  if (!_is(taco.a.class, 'string')) taco.a.class = taco.a.class ? String(taco.a.class) : '';
+
+  var existing = taco.a.class.match(_UUID_RE);
+
+  if (existing && !forceNew) {
+    return existing[0];
+  }
+
+  // Remove old UUID if forceNew
+  if (existing) {
+    taco.a.class = taco.a.class.replace(_UUID_RE, '').replace(/\s+/g, ' ').trim();
+  }
+
+  var uuid = bw.uuid('uuid');
+  taco.a.class = (taco.a.class ? taco.a.class + ' ' : '') + uuid;
+  return uuid;
+};
+
+/**
+ * Read the UUID from a TACO object or DOM element. Pure getter, no side effects.
+ *
+ * @param {Object|Element} tacoOrElement - A TACO object or DOM element
+ * @returns {string|null} The UUID string, or null if none assigned
+ * @category Identifiers
+ * @example
+ * bw.getUUID(card)       // 'bw_uuid_a1b2c3d4e5' (from TACO)
+ * bw.getUUID(domEl)      // 'bw_uuid_a1b2c3d4e5' (from DOM element)
+ * bw.getUUID({t:'div'})  // null (no UUID)
+ */
+bw.getUUID = function(tacoOrElement) {
+  if (!tacoOrElement) return null;
+
+  var classStr;
+  // DOM element: check className
+  if (tacoOrElement.className !== undefined && tacoOrElement.tagName) {
+    classStr = tacoOrElement.className;
+  }
+  // TACO object: check a.class
+  else if (tacoOrElement.a && _is(tacoOrElement.a.class, 'string')) {
+    classStr = tacoOrElement.a.class;
+  }
+
+  if (!classStr) return null;
+  var match = classStr.match(_UUID_RE);
+  return match ? match[0] : null;
+};
+
 /**
  * Escape HTML special characters to prevent XSS.
  *
@@ -371,7 +515,7 @@ bw._deregisterNode = function(el, bwId) {
  * // => '<b>Hello</b> & "world"'
  */
 bw.escapeHTML = function(str) {
-  if (typeof str !== 'string') return '';
+  if (!_is(str, 'string')) return '';
   
   const escapeMap = {
     '&': '&',
@@ -405,6 +549,42 @@ bw.raw = function(str) {
   return { __bw_raw: true, v: String(str) };
 };
 
+/**
+ * Hyperscript-style TACO constructor.
+ *
+ * A convenience helper that returns a canonical TACO object from positional
+ * arguments. The return value is a plain object — serializable, works with
+ * bwserve, and accepted everywhere TACO is accepted.
+ *
+ * @param {string} tag - HTML tag name (e.g. 'div', 'p', 'section')
+ * @param {Object|null} [attrs] - HTML attributes object. Pass null or omit to skip.
+ * @param {*} [content] - Content: string, number, TACO object, or array of children.
+ * @param {Object} [options] - TACO options (state, lifecycle hooks, render fn).
+ * @returns {Object} Plain TACO object {t, a?, c?, o?}
+ * @category Utilities
+ * @see bw.html
+ * @see bw.createDOM
+ * @see bw.DOM
+ * @example
+ * bw.h('div')
+ * // => { t: 'div' }
+ *
+ * bw.h('p', { class: 'bw_text_muted' }, 'Hello')
+ * // => { t: 'p', a: { class: 'bw_text_muted' }, c: 'Hello' }
+ *
+ * bw.h('ul', null, [
+ *   bw.h('li', null, 'one'),
+ *   bw.h('li', null, 'two')
+ * ])
+ * // => { t: 'ul', c: [{ t: 'li', c: 'one' }, { t: 'li', c: 'two' }] }
+ */
+bw.h = function(tag, attrs, content, options) {
+  var taco = { t: String(tag) };
+  if (attrs !== null && attrs !== undefined) taco.a = attrs;
+  if (content !== undefined) taco.c = content;
+  if (options !== undefined) taco.o = options;
+  return taco;
+};
 
 /**
  * Convert a TACO object (or array of TACOs) to an HTML string.
@@ -444,7 +624,7 @@ bw.html = function(taco, options = {}) {
   }
 
   // Handle arrays of TACOs
-  if (Array.isArray(taco)) {
+  if (_isA(taco)) {
     return taco.map(t => bw.html(t, options)).join('');
   }
 
@@ -467,15 +647,15 @@ bw.html = function(taco, options = {}) {
   if (taco && taco._bwEach && options.state) {
     var eachExpr = taco.expr.replace(/^\$\{|\}$/g, '');
     var arr = bw._evaluatePath(options.state, eachExpr);
-    if (!Array.isArray(arr)) return '';
+    if (!_isA(arr)) return '';
     return arr.map(function(item, idx) { return bw.html(taco.factory(item, idx), options); }).join('');
   }
 
   // Handle primitives and non-TACO objects
-  if (typeof taco !== 'object' || !taco.t) {
+  if (!_is(taco, 'object') || !taco.t) {
     var str = options.raw ? String(taco) : bw.escapeHTML(String(taco));
     // Resolve template bindings if state provided
-    if (options.state && typeof str === 'string' && str.indexOf('${') >= 0) {
+    if (options.state && _is(str, 'string') && str.indexOf('${') >= 0) {
       str = bw._resolveTemplate(str, options.state, !!options.compile);
     }
     return str;
@@ -495,10 +675,18 @@ bw.html = function(taco, options = {}) {
     // Skip null, undefined, false
     if (value == null || value === false) continue;
     
-    // Skip event handlers (they're for DOM only)
-    if (key.startsWith('on')) continue;
+    // Serialize event handlers via funcRegister
+    if (key.startsWith('on')) {
+      if (_is(value, 'function')) {
+        var fnId = bw.funcRegister(value);
+        attrStr += ' ' + key + '="' + bw.funcGetDispatchStr(fnId, 'event') + '"';
+      } else if (_is(value, 'string')) {
+        attrStr += ' ' + key + '="' + bw.escapeHTML(value) + '"';
+      }
+      continue;
+    }
     
-    if (key === 'style' && typeof value === 'object') {
+    if (key === 'style' && _is(value, 'object')) {
       // Convert style object to string
       const styleStr = Object.entries(value)
         .filter(([, v]) => v != null)
@@ -509,7 +697,7 @@ bw.html = function(taco, options = {}) {
       }
     } else if (key === 'class') {
       // Handle class as array or string
-      const classStr = Array.isArray(value) ? value.filter(Boolean).join(' ') : String(value);
+      const classStr = _isA(value) ? value.filter(Boolean).join(' ') : String(value);
       if (classStr) {
         attrStr += ` class="${bw.escapeHTML(classStr)}"`;
       }
@@ -545,13 +733,184 @@ bw.html = function(taco, options = {}) {
   // Process content recursively
   let contentStr = content != null ? bw.html(content, options) : '';
   // Resolve template bindings in content if state provided
-  if (options.state && typeof contentStr === 'string' && contentStr.indexOf('${') >= 0) {
+  if (options.state && _is(contentStr, 'string') && contentStr.indexOf('${') >= 0) {
     contentStr = bw._resolveTemplate(contentStr, options.state, !!options.compile);
   }
 
   return `<${tag}${attrStr}>${contentStr}</${tag}>`;
 };
 
+/**
+ * Generate a complete, self-contained HTML document from TACO content.
+ *
+ * Produces a full `<!DOCTYPE html>` page with configurable runtime injection,
+ * func registry emission (so serialized event handlers work), optional theme,
+ * and extra head elements. Designed for static site generation, offline/airgapped
+ * use, and the "static site that isn't static" workflow.
+ *
+ * @param {Object} [opts={}] - Page options
+ * @param {Object|string|Array} [opts.body=''] - Body content: TACO, string, or array
+ * @param {string} [opts.title='bitwrench'] - Page title
+ * @param {Object} [opts.state] - State for ${expr} resolution in bw.html()
+ * @param {string} [opts.runtime='shim'] - Runtime level: 'inline'|'cdn'|'shim'|'none'
+ * @param {string} [opts.css=''] - Additional CSS for <style> block
+ * @param {string|Object} [opts.theme=null] - Theme preset name or config object
+ * @param {Array} [opts.head=[]] - Extra TACO elements rendered into <head>
+ * @param {string} [opts.favicon=''] - Favicon URL
+ * @param {string} [opts.lang='en'] - HTML lang attribute
+ * @returns {string} Complete HTML document string
+ * @category DOM Generation
+ * @see bw.html
+ * @example
+ * bw.htmlPage({
+ *   title: 'My App',
+ *   body: { t: 'h1', c: 'Hello World' },
+ *   runtime: 'shim'
+ * })
+ */
+bw.htmlPage = function(opts) {
+  opts = opts || {};
+  var title     = opts.title   || 'bitwrench';
+  var body      = opts.body    || '';
+  var state     = opts.state   || undefined;
+  var runtime   = opts.runtime || 'shim';
+  var css       = opts.css     || '';
+  var theme     = opts.theme   || null;
+  var headExtra = opts.head    || [];
+  var favicon   = opts.favicon || '';
+  var lang      = opts.lang    || 'en';
+
+  // Snapshot funcRegistry counter before rendering
+  var fnCounterBefore = bw._fnIDCounter;
+
+  // Render body content
+  var bodyHTML = '';
+  if (_is(body, 'string')) {
+    bodyHTML = body;
+  } else {
+    var htmlOpts = {};
+    if (state) htmlOpts.state = state;
+    bodyHTML = bw.html(body, htmlOpts);
+  }
+
+  // Collect functions registered during this render
+  var fnCounterAfter = bw._fnIDCounter;
+  var registryEntries = '';
+  for (var i = fnCounterBefore; i < fnCounterAfter; i++) {
+    var fnKey = 'bw_fn_' + i;
+    if (bw._fnRegistry[fnKey]) {
+      registryEntries += 'bw._fnRegistry[\'' + fnKey + '\']=' +
+        bw._fnRegistry[fnKey].toString() + ';\n';
+    }
+  }
+
+  // Build runtime script for <head>
+  var runtimeHead = '';
+  if (runtime === 'inline') {
+    // Read UMD bundle synchronously if in Node.js
+    var umdSource = null;
+    if (bw._isNode) {
+      try {
+        var fs = (typeof require === 'function') ? require('fs') : null;
+        var pathMod = (typeof require === 'function') ? require('path') : null;
+        if (fs && pathMod) {
+          // Resolve dist/ relative to this source file
+          var srcDir = '';
+          try { srcDir = pathMod.dirname((typeof __filename !== 'undefined') ? __filename : ''); }
+          catch(e2) { /* ESM: __filename not available */ }
+          if (!srcDir && typeof import.meta !== 'undefined' && import.meta.url) {
+            var url = (typeof require === 'function') ? require('url') : null;
+            if (url && url.fileURLToPath) srcDir = pathMod.dirname(url.fileURLToPath(import.meta.url));
+          }
+          if (srcDir) {
+            var distPath = pathMod.resolve(srcDir, '../dist/bitwrench.umd.min.js');
+            umdSource = fs.readFileSync(distPath, 'utf8');
+          }
+        }
+      } catch(e) { /* fall through */ }
+    }
+    if (umdSource) {
+      runtimeHead = '<script>' + umdSource + '</script>';
+    } else {
+      // Fallback to shim in browser or if dist not available
+      runtimeHead = '<script>' + bw._FUNC_REGISTRY_SHIM + '</script>';
+    }
+  } else if (runtime === 'cdn') {
+    runtimeHead = '<script src="https://cdn.jsdelivr.net/npm/bitwrench@2/dist/bitwrench.umd.min.js"></script>';
+  } else if (runtime === 'shim') {
+    runtimeHead = '<script>' + bw._FUNC_REGISTRY_SHIM + '</script>';
+  }
+  // runtime === 'none' → empty
+
+  // Theme CSS
+  var themeCSS = '';
+  if (theme) {
+    var themeConfig = _is(theme, 'string')
+      ? (THEME_PRESETS[theme.toLowerCase()] || null)
+      : theme;
+    if (themeConfig) {
+      var themeResult = bw.makeStyles(themeConfig);
+      themeCSS = themeResult.css;
+    }
+  }
+
+  // Extra <head> elements
+  var headHTML = '';
+  if (_isA(headExtra) && headExtra.length > 0) {
+    headHTML = headExtra.map(function(el) { return bw.html(el); }).join('\n');
+  }
+
+  // Favicon
+  var faviconTag = '';
+  if (favicon) {
+    var safeFavicon = favicon.replace(/[&<>"']/g, function(c) {
+      return ({ '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;' })[c];
+    });
+    faviconTag = '<link rel="icon" href="' + safeFavicon + '">';
+  }
+
+  // Escaped title
+  var safeTitle = bw.escapeHTML(title);
+
+  // Combine all CSS
+  var allCSS = (themeCSS ? themeCSS + '\n' : '') + css;
+
+  // Body-end script: registry entries + optional loadStyles
+  var bodyEndScript = '';
+  var bodyEndParts = [];
+  if (registryEntries) {
+    bodyEndParts.push(registryEntries);
+  }
+  if (runtime === 'inline' || runtime === 'cdn') {
+    bodyEndParts.push('if(typeof bw!=="undefined"){bw.loadStyles();}');
+  }
+  if (bodyEndParts.length > 0) {
+    bodyEndScript = '<script>\n' + bodyEndParts.join('\n') + '\n</script>';
+  }
+
+  // Assemble document
+  var parts = [
+    '<!DOCTYPE html>',
+    '<html lang="' + lang + '">',
+    '<head>',
+    '<meta charset="UTF-8">',
+    '<meta name="viewport" content="width=device-width, initial-scale=1">'
+  ];
+  parts.push('<title>' + safeTitle + '</title>');
+  if (faviconTag) parts.push(faviconTag);
+  if (runtimeHead) parts.push(runtimeHead);
+  if (headHTML) parts.push(headHTML);
+  if (allCSS) parts.push('<style>' + allCSS + '</style>');
+  parts.push('</head>');
+  parts.push('<body>');
+  parts.push(bodyHTML);
+  if (bodyEndScript) parts.push(bodyEndScript);
+  parts.push('</body>');
+  parts.push('</html>');
+
+  return parts.join('\n');
+};
+
 /**
  * Create a live DOM element from a TACO object (browser only).
  *
@@ -596,7 +955,7 @@ bw.createDOM = function(taco, options = {}) {
   }
 
   // Handle text nodes
-  if (typeof taco !== 'object' || !taco.t) {
+  if (!_is(taco, 'object') || !taco.t) {
     return document.createTextNode(String(taco));
   }
 
@@ -609,16 +968,16 @@ bw.createDOM = function(taco, options = {}) {
   for (const [key, value] of Object.entries(attrs)) {
     if (value == null || value === false) continue;
     
-    if (key === 'style' && typeof value === 'object') {
+    if (key === 'style' && _is(value, 'object')) {
       // Apply styles directly
       Object.assign(el.style, value);
     } else if (key === 'class') {
       // Handle class as array or string
-      const classStr = Array.isArray(value) ? value.filter(Boolean).join(' ') : String(value);
+      const classStr = _isA(value) ? value.filter(Boolean).join(' ') : String(value);
       if (classStr) {
         el.className = classStr;
       }
-    } else if (key.startsWith('on') && typeof value === 'function') {
+    } else if (key.startsWith('on') && _is(value, 'function')) {
       // Event handlers
       const eventName = key.slice(2).toLowerCase();
       el.addEventListener(eventName, value);
@@ -638,7 +997,7 @@ bw.createDOM = function(taco, options = {}) {
   // Children with data-bw_id or id attributes get local refs on the parent,
   // so o.render functions can access them without any DOM lookup.
   if (content != null) {
-    if (Array.isArray(content)) {
+    if (_isA(content)) {
       content.forEach(child => {
         if (child != null) {
           // Handle ComponentHandle in content arrays (Level 2 children)
@@ -658,20 +1017,20 @@ bw.createDOM = function(taco, options = {}) {
           if (childEl._bw_refs) {
             if (!el._bw_refs) el._bw_refs = {};
             for (var rk in childEl._bw_refs) {
-              if (Object.prototype.hasOwnProperty.call(childEl._bw_refs, rk)) {
+              if (_hop.call(childEl._bw_refs, rk)) {
                 el._bw_refs[rk] = childEl._bw_refs[rk];
               }
             }
           }
         }
       });
-    } else if (typeof content === 'object' && content.__bw_raw) {
+    } else if (_is(content, 'object') && content.__bw_raw) {
       // Raw HTML content — inject via innerHTML
       el.innerHTML = content.v;
     } else if (content._bwComponent === true) {
       // Single ComponentHandle as content
       content.mount(el);
-    } else if (typeof content === 'object' && content.t) {
+    } else if (_is(content, 'object') && content.t) {
       var childEl = bw.createDOM(content, options);
       el.appendChild(childEl);
       var childBwId = content.a ? (content.a['data-bw_id'] || content.a.id) : null;
@@ -682,7 +1041,7 @@ bw.createDOM = function(taco, options = {}) {
       if (childEl._bw_refs) {
         if (!el._bw_refs) el._bw_refs = {};
         for (var rk in childEl._bw_refs) {
-          if (Object.prototype.hasOwnProperty.call(childEl._bw_refs, rk)) {
+          if (_hop.call(childEl._bw_refs, rk)) {
             el._bw_refs[rk] = childEl._bw_refs[rk];
           }
         }
@@ -697,6 +1056,14 @@ bw.createDOM = function(taco, options = {}) {
     bw._registerNode(el, null);
   }
 
+  // Register UUID class in node cache (bw_uuid_* tokens in class string)
+  if (el.className) {
+    var uuidMatch = el.className.match(_UUID_RE);
+    if (uuidMatch) {
+      bw._nodeMap[uuidMatch[0]] = el;
+    }
+  }
+
   // Handle lifecycle hooks and state
   if (opts.mounted || opts.unmount || opts.render || opts.state) {
     const id = attrs['data-bw_id'] || bw.uuid();
@@ -715,7 +1082,7 @@ bw.createDOM = function(taco, options = {}) {
       el._bw_render = opts.render;
 
       if (opts.mounted) {
-        console.warn('bw.createDOM: o.render and o.mounted are mutually exclusive. o.render wins.');
+        _cw('bw.createDOM: o.render and o.mounted are mutually exclusive. o.render wins.');
       }
 
       // Queue initial render (same timing as mounted)
@@ -788,7 +1155,7 @@ bw.DOM = function(target, taco, options = {}) {
   const targetEl = bw._el(target);
     
   if (!targetEl) {
-    console.error('bw.DOM: Target element not found:', target);
+    _ce('bw.DOM: Target element not found:', target);
     return null;
   }
   
@@ -828,7 +1195,7 @@ bw.DOM = function(target, taco, options = {}) {
       targetEl.appendChild(taco.element);
     }
     // Handle arrays
-    else if (Array.isArray(taco)) {
+    else if (_isA(taco)) {
       taco.forEach(t => {
         if (t != null) {
           if (t._bwComponent === true) {
@@ -864,7 +1231,7 @@ bw.DOM = function(target, taco, options = {}) {
 bw.compileProps = function(handle, props = {}) {
   const compiledProps = {};
   
-  Object.keys(props).forEach(key => {
+  _keys(props).forEach(key => {
     // Create getter/setter for each prop
     Object.defineProperty(compiledProps, key, {
       get() {
@@ -1069,6 +1436,16 @@ bw.renderComponent = function(taco, options = {}) {
 bw.cleanup = function(element) {
   if (!bw._isBrowser || !element) return;
 
+  // Deregister UUID classes from node cache (element + descendants)
+  // Covers elements that have UUID but no data-bw_id
+  var selfUuidMatch = element.className && element.className.match(_UUID_RE);
+  if (selfUuidMatch) delete bw._nodeMap[selfUuidMatch[0]];
+  var uuidEls = element.querySelectorAll('[class*="bw_uuid_"]');
+  uuidEls.forEach(function(uel) {
+    var m = uel.className && uel.className.match(_UUID_RE);
+    if (m) delete bw._nodeMap[m[0]];
+  });
+
   // Find all elements with data-bw_id
   const elements = element.querySelectorAll('[data-bw_id]');
 
@@ -1084,6 +1461,10 @@ bw.cleanup = function(element) {
     // Deregister from node cache
     bw._deregisterNode(el, id);
 
+    // Deregister UUID class from node cache
+    var uuidMatch = el.className && el.className.match(_UUID_RE);
+    if (uuidMatch) delete bw._nodeMap[uuidMatch[0]];
+
     // Clean up pub/sub subscriptions tied to this element
     if (el._bw_subs) {
       el._bw_subs.forEach(function(unsub) { unsub(); });
@@ -1108,6 +1489,10 @@ bw.cleanup = function(element) {
     // Deregister from node cache
     bw._deregisterNode(element, id);
 
+    // Deregister UUID class from node cache
+    var elemUuidMatch = element.className && element.className.match(_UUID_RE);
+    if (elemUuidMatch) delete bw._nodeMap[elemUuidMatch[0]];
+
     // Clean up pub/sub subscriptions tied to element itself
     if (element._bw_subs) {
       element._bw_subs.forEach(function(unsub) { unsub(); });
@@ -1182,17 +1567,17 @@ bw.patch = function(id, content, attr) {
   if (attr) {
     // Patch an attribute
     el.setAttribute(attr, String(content));
-  } else if (Array.isArray(content)) {
+  } else if (_isA(content)) {
     // Patch with array of children (strings and/or TACOs)
     el.innerHTML = '';
     content.forEach(function(item) {
-      if (typeof item === 'string' || typeof item === 'number') {
+      if (_is(item, 'string') || _is(item, 'number')) {
         el.appendChild(document.createTextNode(String(item)));
       } else if (item && item.t) {
         el.appendChild(bw.createDOM(item));
       }
     });
-  } else if (typeof content === 'object' && content !== null && content.t) {
+  } else if (_is(content, 'object') && content.t) {
     // Patch with a TACO — replace children
     el.innerHTML = '';
     el.appendChild(bw.createDOM(content));
@@ -1223,7 +1608,7 @@ bw.patch = function(id, content, attr) {
 bw.patchAll = function(patches) {
   var results = {};
   for (var id in patches) {
-    if (Object.prototype.hasOwnProperty.call(patches, id)) {
+    if (_hop.call(patches, id)) {
       results[id] = bw.patch(id, patches[id]);
     }
   }
@@ -1320,7 +1705,7 @@ bw.pub = function(topic, detail) {
       snapshot[i].handler(detail);
       called++;
     } catch (err) {
-      console.warn('bw.pub: subscriber error on topic "' + topic + '":', err);
+      _cw('bw.pub: subscriber error on topic "' + topic + '":', err);
     }
   }
   return called;
@@ -1416,8 +1801,8 @@ bw._fnIDCounter = 0;
  * @see bw.funcGetDispatchStr
  */
 bw.funcRegister = function(fn, name) {
-  if (typeof fn !== 'function') return '';
-  var fnID = (typeof name === 'string' && name.length > 0) ? name : ('bw_fn_' + bw._fnIDCounter++);
+  if (!_is(fn, 'function')) return '';
+  var fnID = (_is(name, 'string') && name.length > 0) ? name : ('bw_fn_' + bw._fnIDCounter++);
   bw._fnRegistry[fnID] = fn;
   return fnID;
 };
@@ -1436,7 +1821,7 @@ bw.funcRegister = function(fn, name) {
 bw.funcGetById = function(name, errFn) {
   name = String(name);
   if (name in bw._fnRegistry) return bw._fnRegistry[name];
-  return (typeof errFn === 'function') ? errFn : function() { console.warn('bw.funcGetById: unregistered fn "' + name + '"'); };
+  return _is(errFn, 'function') ? errFn : function() { _cw('bw.funcGetById: unregistered fn "' + name + '"'); };
 };
 
 /**
@@ -1477,13 +1862,30 @@ bw.funcUnregister = function(name) {
 bw.funcGetRegistry = function() {
   var copy = {};
   for (var k in bw._fnRegistry) {
-    if (Object.prototype.hasOwnProperty.call(bw._fnRegistry, k)) {
+    if (_hop.call(bw._fnRegistry, k)) {
       copy[k] = bw._fnRegistry[k];
     }
   }
   return copy;
 };
 
+/**
+ * Minimal runtime shim for funcRegister dispatch in static HTML.
+ * When embedded in a `<script>` tag, provides just enough infrastructure
+ * for `bw.funcGetById()` calls to resolve. The actual function bodies
+ * are emitted separately as `bw._fnRegistry['bw_fn_X'] = ...;` assignments.
+ * @type {string}
+ * @category Function Registry
+ */
+bw._FUNC_REGISTRY_SHIM = '(function(){var bw=window.bw||(window.bw={});' +
+  'if(!bw._fnRegistry)bw._fnRegistry={};' +
+  'bw.funcGetById=function(n){return bw._fnRegistry[n]||function(){' +
+  'console.warn("bw: unregistered fn "+n)};};' +
+  'bw.funcRegister=function(fn,name){' +
+  'var id=name||("bw_fn_"+(bw._fnIDCounter=(bw._fnIDCounter||0)+1));' +
+  'bw._fnRegistry[id]=fn;return id;};' +
+  'window.bw=bw;})();';
+
 // ===================================================================================
 // Template Binding Utilities
 // ===================================================================================
@@ -1511,7 +1913,10 @@ bw._evaluatePath = function(state, path) {
   var parts = path.split('.');
   var val = state;
   for (var i = 0; i < parts.length; i++) {
-    if (val == null) return '';
+    if (val == null) {
+      if (bw.debug) _cw('bw.debug: _evaluatePath — null at key "' + parts[i] + '" in path "' + path + '"');
+      return '';
+    }
     val = val[parts[i]];
   }
   return (val == null) ? '' : val;
@@ -1531,7 +1936,7 @@ bw._evaluatePath = function(state, path) {
  */
 bw._compiledExprs = {};
 bw._resolveTemplate = function(str, state, compile) {
-  if (typeof str !== 'string' || str.indexOf('${') < 0) return str;
+  if (!_is(str, 'string') || str.indexOf('${') < 0) return str;
   var bindings = bw._parseBindings(str);
   if (bindings.length === 0) return str;
 
@@ -1553,6 +1958,7 @@ bw._resolveTemplate = function(str, state, compile) {
       try {
         val = bw._compiledExprs[b.expr](state);
       } catch (e) {
+        if (bw.debug) _cw('bw.debug: _resolveTemplate — Tier 2 eval failed for "${' + b.expr + '}":', e.message);
         val = '';
       }
     } else {
@@ -1661,7 +2067,7 @@ function ComponentHandle(taco) {
   this._state = {};
   if (o.state) {
     for (var k in o.state) {
-      if (Object.prototype.hasOwnProperty.call(o.state, k)) {
+      if (_hop.call(o.state, k)) {
         this._state[k] = o.state[k];
       }
     }
@@ -1670,7 +2076,7 @@ function ComponentHandle(taco) {
   this._actions = {};
   if (o.actions) {
     for (var k2 in o.actions) {
-      if (Object.prototype.hasOwnProperty.call(o.actions, k2)) {
+      if (_hop.call(o.actions, k2)) {
         this._actions[k2] = o.actions[k2];
       }
     }
@@ -1680,7 +2086,7 @@ function ComponentHandle(taco) {
   if (o.methods) {
     var self = this;
     for (var k3 in o.methods) {
-      if (Object.prototype.hasOwnProperty.call(o.methods, k3)) {
+      if (_hop.call(o.methods, k3)) {
         this._methods[k3] = o.methods[k3];
         (function(methodName, methodFn) {
           self[methodName] = function() {
@@ -1698,7 +2104,7 @@ function ComponentHandle(taco) {
     willMount: o.willMount || null,
     mounted: o.mounted || null,
     willUpdate: o.willUpdate || null,
-    onUpdate: o.onUpdate || null,
+    onUpdate: o.onUpdate || o.updated || null,
     unmount: o.unmount || null,
     willDestroy: o.willDestroy || null
   };
@@ -1713,14 +2119,23 @@ function ComponentHandle(taco) {
   this._compile = !!o.compile;
   this._bw_refs = {};
   this._refCounter = 0;
+  // Child component ownership (Bug #5)
+  this._children = [];
+  this._parent = null;
+  // Factory metadata for BCCL rebuild (Bug #6)
+  this._factory = taco._bwFactory || null;
 }
 
+// Short alias for ComponentHandle.prototype (see alias block at top of file).
+// 28 method definitions × 25 chars = ~700B raw savings in minified output.
+var _chp = ComponentHandle.prototype;
+
 // ── State Methods ──
 
 /**
  * Get a state value. Dot-path supported: `get('user.name')`
  */
-ComponentHandle.prototype.get = function(key) {
+_chp.get = function(key) {
   return bw._evaluatePath(this._state, key);
 };
 
@@ -1730,12 +2145,13 @@ ComponentHandle.prototype.get = function(key) {
  * @param {*} value - New value
  * @param {Object} [opts] - Options. `{sync: true}` for immediate flush.
  */
-ComponentHandle.prototype.set = function(key, value, opts) {
+_chp.set = function(key, value, opts) {
   // Dot-path set
   var parts = key.split('.');
   var obj = this._state;
   for (var i = 0; i < parts.length - 1; i++) {
-    if (obj[parts[i]] == null || typeof obj[parts[i]] !== 'object') {
+    if (!_is(obj[parts[i]], 'object')) {
+      if (bw.debug) _cw('bw.debug: set() — auto-creating intermediate "' + parts[i] + '" in path "' + key + '"');
       obj[parts[i]] = {};
     }
     obj = obj[parts[i]];
@@ -1755,10 +2171,10 @@ ComponentHandle.prototype.set = function(key, value, opts) {
 /**
  * Get a shallow clone of the full state.
  */
-ComponentHandle.prototype.getState = function() {
+_chp.getState = function() {
   var clone = {};
   for (var k in this._state) {
-    if (Object.prototype.hasOwnProperty.call(this._state, k)) {
+    if (_hop.call(this._state, k)) {
       clone[k] = this._state[k];
     }
   }
@@ -1770,9 +2186,9 @@ ComponentHandle.prototype.getState = function() {
  * @param {Object} updates - Key-value pairs to merge
  * @param {Object} [opts] - Options. `{sync: true}` for immediate flush.
  */
-ComponentHandle.prototype.setState = function(updates, opts) {
+_chp.setState = function(updates, opts) {
   for (var k in updates) {
-    if (Object.prototype.hasOwnProperty.call(updates, k)) {
+    if (_hop.call(updates, k)) {
       this._state[k] = updates[k];
       this._dirtyKeys[k] = true;
     }
@@ -1789,9 +2205,9 @@ ComponentHandle.prototype.setState = function(updates, opts) {
 /**
  * Push a value onto an array in state. Clones the array.
  */
-ComponentHandle.prototype.push = function(key, val) {
+_chp.push = function(key, val) {
   var arr = this.get(key);
-  var newArr = Array.isArray(arr) ? arr.slice() : [];
+  var newArr = _isA(arr) ? arr.slice() : [];
   newArr.push(val);
   this.set(key, newArr);
 };
@@ -1799,9 +2215,9 @@ ComponentHandle.prototype.push = function(key, val) {
 /**
  * Splice an array in state. Clones the array.
  */
-ComponentHandle.prototype.splice = function(key, start, deleteCount) {
+_chp.splice = function(key, start, deleteCount) {
   var arr = this.get(key);
-  var newArr = Array.isArray(arr) ? arr.slice() : [];
+  var newArr = _isA(arr) ? arr.slice() : [];
   var args = [start, deleteCount].concat(Array.prototype.slice.call(arguments, 3));
   Array.prototype.splice.apply(newArr, args);
   this.set(key, newArr);
@@ -1809,7 +2225,7 @@ ComponentHandle.prototype.splice = function(key, start, deleteCount) {
 
 // ── Scheduling ──
 
-ComponentHandle.prototype._scheduleDirty = function() {
+_chp._scheduleDirty = function() {
   if (!this._scheduled) {
     this._scheduled = true;
     bw._dirtyComponents.push(this);
@@ -1824,17 +2240,17 @@ ComponentHandle.prototype._scheduleDirty = function() {
  * Creates binding descriptors with refIds for targeted DOM updates.
  * @private
  */
-ComponentHandle.prototype._compileBindings = function() {
+_chp._compileBindings = function() {
   this._bindings = [];
   this._refCounter = 0;
-  var stateKeys = Object.keys(this._state);
+  var stateKeys = _keys(this._state);
   var self = this;
 
   function walkTaco(taco, path) {
-    if (taco == null || typeof taco !== 'object' || !taco.t) return taco;
+    if (!_is(taco, 'object') || !taco.t) return taco;
 
     // Check content for bindings
-    if (typeof taco.c === 'string' && taco.c.indexOf('${') >= 0) {
+    if (_is(taco.c, 'string') && taco.c.indexOf('${') >= 0) {
       var refId = 'bw_ref_' + self._refCounter++;
       var parsed = bw._parseBindings(taco.c);
       var deps = [];
@@ -1856,10 +2272,10 @@ ComponentHandle.prototype._compileBindings = function() {
     // Check attributes for bindings
     if (taco.a) {
       for (var attrName in taco.a) {
-        if (!Object.prototype.hasOwnProperty.call(taco.a, attrName)) continue;
+        if (!_hop.call(taco.a, attrName)) continue;
         if (attrName === 'data-bw_ref') continue;
         var attrVal = taco.a[attrName];
-        if (typeof attrVal === 'string' && attrVal.indexOf('${') >= 0) {
+        if (_is(attrVal, 'string') && attrVal.indexOf('${') >= 0) {
           var refId2 = 'bw_ref_' + self._refCounter++;
           var parsed2 = bw._parseBindings(attrVal);
           var deps2 = [];
@@ -1885,9 +2301,27 @@ ComponentHandle.prototype._compileBindings = function() {
     }
 
     // Recurse into children
-    if (Array.isArray(taco.c)) {
+    if (_isA(taco.c)) {
       for (var i = 0; i < taco.c.length; i++) {
-        if (taco.c[i] && typeof taco.c[i] === 'object' && taco.c[i].t) {
+        // Wrap string children with ${expr} in a span so patches target the span, not the parent
+        if (_is(taco.c[i], 'string') && taco.c[i].indexOf('${') >= 0) {
+          var mixedRefId = 'bw_ref_' + self._refCounter++;
+          var mixedParsed = bw._parseBindings(taco.c[i]);
+          var mixedDeps = [];
+          for (var mi = 0; mi < mixedParsed.length; mi++) {
+            mixedDeps = mixedDeps.concat(bw._extractDeps(mixedParsed[mi].expr, stateKeys));
+          }
+          self._bindings.push({
+            expr: taco.c[i],
+            type: 'content',
+            refId: mixedRefId,
+            deps: mixedDeps,
+            template: taco.c[i]
+          });
+          // Replace string with a span wrapper so textContent targets the span only
+          taco.c[i] = { t: 'span', a: { 'data-bw_ref': mixedRefId, style: 'display:contents' }, c: taco.c[i] };
+        }
+        if (_is(taco.c[i], 'object') && taco.c[i].t) {
           walkTaco(taco.c[i], path.concat(i));
         }
         // Handle bw.when/bw.each markers
@@ -1922,7 +2356,7 @@ ComponentHandle.prototype._compileBindings = function() {
           taco.c[i]._refId = eachRefId;
         }
       }
-    } else if (taco.c && typeof taco.c === 'object' && taco.c.t) {
+    } else if (_is(taco.c, 'object') && taco.c.t) {
       walkTaco(taco.c, path.concat(0));
     }
 
@@ -1938,7 +2372,7 @@ ComponentHandle.prototype._compileBindings = function() {
  * Build ref map from the live DOM after createDOM.
  * @private
  */
-ComponentHandle.prototype._collectRefs = function() {
+_chp._collectRefs = function() {
   this._bw_refs = {};
   if (!this.element) return;
   var els = this.element.querySelectorAll('[data-bw_ref]');
@@ -1959,7 +2393,7 @@ ComponentHandle.prototype._collectRefs = function() {
  * Creates DOM, compiles bindings, registers actions, and calls lifecycle hooks.
  * @param {Element} parentEl - DOM element to mount into
  */
-ComponentHandle.prototype.mount = function(parentEl) {
+_chp.mount = function(parentEl) {
   // willMount hook
   if (this._hooks.willMount) this._hooks.willMount(this);
 
@@ -1981,7 +2415,7 @@ ComponentHandle.prototype.mount = function(parentEl) {
   // Register named actions in function registry
   var self = this;
   for (var actionName in this._actions) {
-    if (Object.prototype.hasOwnProperty.call(this._actions, actionName)) {
+    if (_hop.call(this._actions, actionName)) {
       var registeredName = this._bwId + '_' + actionName;
       (function(aName) {
         bw.funcRegister(function(evt) {
@@ -2000,6 +2434,11 @@ ComponentHandle.prototype.mount = function(parentEl) {
   this.element = bw.createDOM(tacoForDOM);
   this.element._bwComponentHandle = this;
   this.element.setAttribute('data-bw_comp_id', this._bwId);
+
+  // Restore o.render from original TACO (stripped by _tacoForDOM)
+  if (this.taco.o && this.taco.o.render) {
+    this.element._bw_render = this.taco.o.render;
+  }
   if (this._userTag) {
     this.element.classList.add(this._userTag);
   }
@@ -2015,6 +2454,16 @@ ComponentHandle.prototype.mount = function(parentEl) {
 
   this.mounted = true;
 
+  // Scan for child ComponentHandles and link parent/child (Bug #5)
+  var childEls = this.element.querySelectorAll('[data-bw_comp_id]');
+  for (var ci = 0; ci < childEls.length; ci++) {
+    var ch = childEls[ci]._bwComponentHandle;
+    if (ch && ch !== this && !ch._parent) {
+      ch._parent = this;
+      this._children.push(ch);
+    }
+  }
+
   // mounted hook (backward compat: fn.length === 2 wraps (el, state))
   if (this._hooks.mounted) {
     if (this._hooks.mounted.length === 2) {
@@ -2023,16 +2472,21 @@ ComponentHandle.prototype.mount = function(parentEl) {
       this._hooks.mounted(this);
     }
   }
+
+  // Invoke o.render on initial mount (if present)
+  if (this.element._bw_render) {
+    this.element._bw_render(this.element, this._state);
+  }
 };
 
 /**
  * Prepare TACO for initial render: resolve when/each markers.
  * @private
  */
-ComponentHandle.prototype._prepareTaco = function(taco) {
-  if (!taco || typeof taco !== 'object') return;
+_chp._prepareTaco = function(taco) {
+  if (!_is(taco, 'object')) return;
 
-  if (Array.isArray(taco.c)) {
+  if (_isA(taco.c)) {
     for (var i = taco.c.length - 1; i >= 0; i--) {
       var child = taco.c[i];
       if (child && child._bwWhen) {
@@ -2057,18 +2511,18 @@ ComponentHandle.prototype._prepareTaco = function(taco) {
         var eachExprStr = child.expr.replace(/^\$\{|\}$/g, '');
         var arr = bw._evaluatePath(this._state, eachExprStr);
         var items = [];
-        if (Array.isArray(arr)) {
+        if (_isA(arr)) {
           for (var j = 0; j < arr.length; j++) {
             items.push(child.factory(arr[j], j));
           }
         }
         taco.c[i] = { t: 'span', a: { 'data-bw_each': child._refId, style: 'display:contents' }, c: items };
       }
-      if (taco.c[i] && typeof taco.c[i] === 'object' && taco.c[i].t) {
+      if (_is(taco.c[i], 'object') && taco.c[i].t) {
         this._prepareTaco(taco.c[i]);
       }
     }
-  } else if (taco.c && typeof taco.c === 'object' && taco.c.t) {
+  } else if (_is(taco.c, 'object') && taco.c.t) {
     this._prepareTaco(taco.c);
   }
 };
@@ -2077,12 +2531,12 @@ ComponentHandle.prototype._prepareTaco = function(taco) {
  * Wire action name strings (in onclick etc.) to dispatch function calls.
  * @private
  */
-ComponentHandle.prototype._wireActions = function(taco) {
-  if (!taco || typeof taco !== 'object' || !taco.t) return;
+_chp._wireActions = function(taco) {
+  if (!_is(taco, 'object') || !taco.t) return;
   if (taco.a) {
     for (var key in taco.a) {
-      if (!Object.prototype.hasOwnProperty.call(taco.a, key)) continue;
-      if (key.startsWith('on') && typeof taco.a[key] === 'string') {
+      if (!_hop.call(taco.a, key)) continue;
+      if (key.startsWith('on') && _is(taco.a[key], 'string')) {
         var actionName = taco.a[key];
         if (actionName in this._actions) {
           var registeredName = this._bwId + '_' + actionName;
@@ -2096,11 +2550,11 @@ ComponentHandle.prototype._wireActions = function(taco) {
       }
     }
   }
-  if (Array.isArray(taco.c)) {
+  if (_isA(taco.c)) {
     for (var i = 0; i < taco.c.length; i++) {
       this._wireActions(taco.c[i]);
     }
-  } else if (taco.c && typeof taco.c === 'object' && taco.c.t) {
+  } else if (_is(taco.c, 'object') && taco.c.t) {
     this._wireActions(taco.c);
   }
 };
@@ -2109,7 +2563,7 @@ ComponentHandle.prototype._wireActions = function(taco) {
  * Deep-clone a TACO tree, preserving _bwWhen/_bwEach markers and their factories.
  * @private
  */
-ComponentHandle.prototype._deepCloneTaco = function(taco) {
+_chp._deepCloneTaco = function(taco) {
   if (taco == null) return taco;
   // Preserve _bwWhen / _bwEach markers (contain functions)
   if (taco._bwWhen) {
@@ -2121,18 +2575,18 @@ ComponentHandle.prototype._deepCloneTaco = function(taco) {
   if (taco._bwEach) {
     return { _bwEach: true, expr: taco.expr, factory: taco.factory, _refId: taco._refId };
   }
-  if (typeof taco !== 'object' || !taco.t) return taco;
+  if (!_is(taco, 'object') || !taco.t) return taco;
   var result = { t: taco.t };
   if (taco.a) {
     result.a = {};
     for (var k in taco.a) {
-      if (Object.prototype.hasOwnProperty.call(taco.a, k)) result.a[k] = taco.a[k];
+      if (_hop.call(taco.a, k)) result.a[k] = taco.a[k];
     }
   }
   if (taco.c != null) {
-    if (Array.isArray(taco.c)) {
+    if (_isA(taco.c)) {
       result.c = taco.c.map(function(child) { return this._deepCloneTaco(child); }.bind(this));
-    } else if (typeof taco.c === 'object') {
+    } else if (_is(taco.c, 'object')) {
       result.c = this._deepCloneTaco(taco.c);
     } else {
       result.c = taco.c;
@@ -2146,27 +2600,31 @@ ComponentHandle.prototype._deepCloneTaco = function(taco) {
  * Create a copy of TACO suitable for createDOM (strips o to prevent double lifecycle).
  * @private
  */
-ComponentHandle.prototype._tacoForDOM = function(taco) {
-  if (!taco || typeof taco !== 'object' || !taco.t) return taco;
+_chp._tacoForDOM = function(taco) {
+  if (!_is(taco, 'object') || !taco.t) return taco;
   var result = { t: taco.t };
   if (taco.a) result.a = taco.a;
   if (taco.c != null) {
-    if (Array.isArray(taco.c)) {
+    if (_isA(taco.c)) {
       result.c = taco.c.map(function(child) { return this._tacoForDOM(child); }.bind(this));
-    } else if (typeof taco.c === 'object' && taco.c.t) {
+    } else if (_is(taco.c, 'object') && taco.c.t) {
       result.c = this._tacoForDOM(taco.c);
     } else {
       result.c = taco.c;
     }
   }
   // Intentionally strip o (no mounted/unmount/state/render on sub-elements)
+  if (taco.o && (taco.o.mounted || taco.o.render || taco.o.unmount)) {
+    _cw('bw: _tacoForDOM stripped o.mounted/render/unmount from child <' + taco.t +
+      '>. Use onclick attribute or bw.component() for child interactivity.');
+  }
   return result;
 };
 
 /**
  * Unmount: remove from DOM, deactivate, preserve state for re-mount.
  */
-ComponentHandle.prototype.unmount = function() {
+_chp.unmount = function() {
   if (!this.mounted) return;
 
   // unmount hook
@@ -2201,12 +2659,23 @@ ComponentHandle.prototype.unmount = function() {
 /**
  * Destroy: unmount + clear state + unregister actions.
  */
-ComponentHandle.prototype.destroy = function() {
+_chp.destroy = function() {
   // willDestroy hook
   if (this._hooks.willDestroy) {
     this._hooks.willDestroy(this);
   }
 
+  // Cascade destroy to children depth-first (Bug #5)
+  for (var ci = this._children.length - 1; ci >= 0; ci--) {
+    this._children[ci].destroy();
+  }
+  this._children = [];
+  if (this._parent) {
+    var idx = this._parent._children.indexOf(this);
+    if (idx >= 0) this._parent._children.splice(idx, 1);
+    this._parent = null;
+  }
+
   this.unmount();
 
   // Unregister actions from function registry
@@ -2233,12 +2702,36 @@ ComponentHandle.prototype.destroy = function() {
  * Flush dirty state: resolve changed bindings and apply to DOM.
  * @private
  */
-ComponentHandle.prototype._flush = function() {
+_chp._flush = function() {
   this._scheduled = false;
-  var changedKeys = Object.keys(this._dirtyKeys);
+  var changedKeys = _keys(this._dirtyKeys);
   this._dirtyKeys = {};
   if (changedKeys.length === 0 || !this.mounted) return;
 
+  // Factory rebuild: if a BCCL factory exists and changed keys overlap factory props,
+  // rebuild the TACO from the factory with merged state (Bug #6)
+  if (this._factory) {
+    var rebuildNeeded = false;
+    for (var fi = 0; fi < changedKeys.length; fi++) {
+      if (_hop.call(this._factory.props, changedKeys[fi])) {
+        rebuildNeeded = true; break;
+      }
+    }
+    if (rebuildNeeded) {
+      var merged = {};
+      for (var mk in this._factory.props) if (_hop.call(this._factory.props, mk)) merged[mk] = this._factory.props[mk];
+      for (var sk in this._state) if (_hop.call(this._state, sk)) merged[sk] = this._state[sk];
+      this._factory.props = merged;
+      var newTaco = bw.make(this._factory.type, merged);
+      newTaco._bwFactory = this._factory;
+      this.taco = newTaco;
+      this._originalTaco = this._deepCloneTaco(newTaco);
+      this._render();
+      if (this._hooks.onUpdate) this._hooks.onUpdate(this, changedKeys);
+      return;
+    }
+  }
+
   // willUpdate hook
   if (this._hooks.willUpdate) {
     this._hooks.willUpdate(this, changedKeys);
@@ -2277,7 +2770,7 @@ ComponentHandle.prototype._flush = function() {
  * Returns list of patches to apply.
  * @private
  */
-ComponentHandle.prototype._resolveBindings = function(changedKeys) {
+_chp._resolveBindings = function(changedKeys) {
   var patches = [];
   for (var i = 0; i < this._bindings.length; i++) {
     var b = this._bindings[i];
@@ -2313,11 +2806,14 @@ ComponentHandle.prototype._resolveBindings = function(changedKeys) {
  * Apply patches to DOM.
  * @private
  */
-ComponentHandle.prototype._applyPatches = function(patches) {
+_chp._applyPatches = function(patches) {
   for (var i = 0; i < patches.length; i++) {
     var p = patches[i];
     var el = this._bw_refs[p.refId];
-    if (!el) continue;
+    if (!el) {
+      if (bw.debug) _cw('bw.debug: _applyPatches — ref "' + p.refId + '" not found in DOM');
+      continue;
+    }
     if (p.type === 'content') {
       el.textContent = p.value;
     } else if (p.type === 'attribute') {
@@ -2334,7 +2830,7 @@ ComponentHandle.prototype._applyPatches = function(patches) {
  * Resolve all bindings and apply (used for initial render).
  * @private
  */
-ComponentHandle.prototype._resolveAndApplyAll = function() {
+_chp._resolveAndApplyAll = function() {
   var patches = [];
   for (var i = 0; i < this._bindings.length; i++) {
     var b = this._bindings[i];
@@ -2357,7 +2853,7 @@ ComponentHandle.prototype._resolveAndApplyAll = function() {
  * Full re-render for structural changes (when/each branch switches).
  * @private
  */
-ComponentHandle.prototype._render = function() {
+_chp._render = function() {
   if (!this.element || !this.element.parentNode) return;
   var parent = this.element.parentNode;
   var nextSibling = this.element.nextSibling;
@@ -2397,7 +2893,7 @@ ComponentHandle.prototype._render = function() {
  * @param {string} event - Event name (e.g., 'click')
  * @param {Function} handler - Event handler
  */
-ComponentHandle.prototype.on = function(event, handler) {
+_chp.on = function(event, handler) {
   if (this.element) {
     this.element.addEventListener(event, handler);
   }
@@ -2409,7 +2905,7 @@ ComponentHandle.prototype.on = function(event, handler) {
  * @param {string} event - Event name
  * @param {Function} handler - Handler to remove
  */
-ComponentHandle.prototype.off = function(event, handler) {
+_chp.off = function(event, handler) {
   if (this.element) {
     this.element.removeEventListener(event, handler);
   }
@@ -2424,7 +2920,7 @@ ComponentHandle.prototype.off = function(event, handler) {
  * @param {Function} handler - Handler function
  * @returns {Function} Unsubscribe function
  */
-ComponentHandle.prototype.sub = function(topic, handler) {
+_chp.sub = function(topic, handler) {
   var unsub = bw.sub(topic, handler);
   this._subs.push(unsub);
   return unsub;
@@ -2435,10 +2931,10 @@ ComponentHandle.prototype.sub = function(topic, handler) {
  * @param {string} name - Action name
  * @param {...*} args - Arguments passed after comp
  */
-ComponentHandle.prototype.action = function(name) {
+_chp.action = function(name) {
   var fn = this._actions[name];
   if (!fn) {
-    console.warn('ComponentHandle.action: unknown action "' + name + '"');
+    _cw('ComponentHandle.action: unknown action "' + name + '"');
     return;
   }
   var args = [this].concat(Array.prototype.slice.call(arguments, 1));
@@ -2450,7 +2946,7 @@ ComponentHandle.prototype.action = function(name) {
  * @param {string} sel - CSS selector
  * @returns {Element|null}
  */
-ComponentHandle.prototype.select = function(sel) {
+_chp.select = function(sel) {
   return this.element ? this.element.querySelector(sel) : null;
 };
 
@@ -2459,7 +2955,7 @@ ComponentHandle.prototype.select = function(sel) {
  * @param {string} sel - CSS selector
  * @returns {Element[]}
  */
-ComponentHandle.prototype.selectAll = function(sel) {
+_chp.selectAll = function(sel) {
   if (!this.element) return [];
   return Array.prototype.slice.call(this.element.querySelectorAll(sel));
 };
@@ -2470,7 +2966,7 @@ ComponentHandle.prototype.selectAll = function(sel) {
  * @param {string} tag - User-defined identifier (e.g. 'dashboard_prod_east')
  * @returns {ComponentHandle} this (for chaining)
  */
-ComponentHandle.prototype.userTag = function(tag) {
+_chp.userTag = function(tag) {
   this._userTag = tag;
   if (this.element) {
     this.element.classList.add(tag);
@@ -2547,7 +3043,7 @@ bw.component = function(taco) {
  * and calls the named method. This is the bitwrench equivalent of
  * Win32 SendMessage(hwnd, msg, wParam, lParam).
  *
- * @param {string} target - Component UUID (data-bw_comp_id) or user tag (CSS class)
+ * @param {string} target - Component UUID (bw_uuid_*), comp ID (data-bw_comp_id), or user tag (CSS class)
  * @param {string} action - Method name to call on the component
  * @param {*} data - Data to pass to the method
  * @returns {boolean} True if message was dispatched successfully
@@ -2564,15 +3060,20 @@ bw.component = function(taco) {
  * };
  */
 bw.message = function(target, action, data) {
-  // Try data-bw_comp_id attribute first, then CSS class (user tag)
-  var el = bw.$('[data-bw_comp_id="' + target + '"]')[0];
-  if (!el) {
+  // Try bw._el() first (handles UUID class, nodeMap cache, getElementById)
+  var el = bw._el(target);
+  // Then try data-bw_comp_id attribute
+  if (!el || !el._bwComponentHandle) {
+    el = bw.$('[data-bw_comp_id="' + target + '"]')[0];
+  }
+  // Then try CSS class (user tag)
+  if (!el || !el._bwComponentHandle) {
     el = bw.$('.' + target)[0];
   }
   if (!el || !el._bwComponentHandle) return false;
   var comp = el._bwComponentHandle;
-  if (typeof comp[action] !== 'function') {
-    console.warn('bw.message: unknown action "' + action + '" on component ' + target);
+  if (!_is(comp[action], 'function')) {
+    _cw('bw.message: unknown action "' + action + '" on component ' + target);
     return false;
   }
   comp[action](data);
@@ -2580,59 +3081,24 @@ bw.message = function(target, action, data) {
 };
 
 // ===================================================================================
-// bw.clientApply() / bw.clientConnect() — Server-driven UI protocol
+// bw.apply() / bw.parseJSONFlex() — Server-driven UI protocol
 // ===================================================================================
 
 /**
  * Registry of named functions sent via register messages.
- * Populated by clientApply({ type: 'register', name, body }).
- * Invoked by clientApply({ type: 'call', name, args }).
+ * Populated by bw.apply({ type: 'register', name, body }).
+ * Invoked by bw.apply({ type: 'call', name, args }).
  * @private
  */
 bw._clientFunctions = {};
 
 /**
- * Whether exec messages are allowed. Set by clientConnect opts.allowExec.
+ * Whether exec messages are allowed. Set by bwclient connect opts.allowExec.
  * Default false — exec messages are rejected unless explicitly opted in.
  * @private
  */
 bw._allowExec = false;
 
-/**
- * Built-in client functions available via call() without registration.
- * @private
- */
-bw._builtinClientFunctions = {
-  scrollTo: function(selector) {
-    var el = bw._el(selector);
-    if (el) el.scrollTop = el.scrollHeight;
-  },
-  focus: function(selector) {
-    var el = bw._el(selector);
-    if (el && typeof el.focus === 'function') el.focus();
-  },
-  download: function(filename, content, mimeType) {
-    if (typeof document === 'undefined') return;
-    var blob = new Blob([content], { type: mimeType || 'text/plain' });
-    var a = document.createElement('a');
-    a.href = URL.createObjectURL(blob);
-    a.download = filename;
-    a.click();
-    URL.revokeObjectURL(a.href);
-  },
-  clipboard: function(text) {
-    if (typeof navigator !== 'undefined' && navigator.clipboard) {
-      navigator.clipboard.writeText(text);
-    }
-  },
-  redirect: function(url) {
-    if (typeof window !== 'undefined') window.location.href = url;
-  },
-  log: function() {
-    console.log.apply(console, arguments);
-  }
-};
-
 /**
  * Parse a bwserve protocol message string, supporting both strict JSON
  * and r-prefixed relaxed JSON (single-quoted strings, trailing commas).
@@ -2647,9 +3113,9 @@ bw._builtinClientFunctions = {
  * @param {string} str - JSON or r-prefixed relaxed JSON string
  * @returns {Object} Parsed message object
  * @throws {SyntaxError} If the string is not valid JSON or relaxed JSON
- * @category Server
+ * @category Core
  */
-bw.clientParse = function(str) {
+bw.parseJSONFlex = function(str) {
   str = (str || '').trim();
   if (str.charAt(0) !== 'r') return JSON.parse(str);
   str = str.slice(1);
@@ -2734,10 +3200,10 @@ bw.clientParse = function(str) {
  *   append   — target.appendChild(bw.createDOM(node))
  *   remove   — bw.cleanup(target); target.remove()
  *   patch    — bw.patch(target, content, attr)
- *   batch    — iterate ops, call clientApply for each
+ *   batch    — iterate ops, call bw.apply for each
  *   message  — bw.message(target, action, data)
  *   register — store a named function for later call()
- *   call     — invoke a registered or built-in function
+ *   call     — invoke a registered function
  *   exec     — execute arbitrary JS (requires allowExec)
  *
  * Target resolution:
@@ -2746,9 +3212,9 @@ bw.clientParse = function(str) {
  *
  * @param {Object} msg - Protocol message
  * @returns {boolean} true if the message was applied successfully
- * @category Server
+ * @category Core
  */
-bw.clientApply = function(msg) {
+bw.apply = function(msg) {
   if (!msg || !msg.type) return false;
 
   var type = msg.type;
@@ -2774,15 +3240,15 @@ bw.clientApply = function(msg) {
   } else if (type === 'remove') {
     var toRemove = bw._el(target);
     if (!toRemove) return false;
-    if (typeof bw.cleanup === 'function') bw.cleanup(toRemove);
+    if (_is(bw.cleanup, 'function')) bw.cleanup(toRemove);
     toRemove.remove();
     return true;
 
   } else if (type === 'batch') {
-    if (!Array.isArray(msg.ops)) return false;
+    if (!_isA(msg.ops)) return false;
     var allOk = true;
     msg.ops.forEach(function(op) {
-      if (!bw.clientApply(op)) allOk = false;
+      if (!bw.apply(op)) allOk = false;
     });
     return allOk;
 
@@ -2795,26 +3261,26 @@ bw.clientApply = function(msg) {
       bw._clientFunctions[msg.name] = new Function('return ' + msg.body)();
       return true;
     } catch (e) {
-      console.error('[bw] register error:', msg.name, e);
+      _ce('[bw] register error:', msg.name, e);
       return false;
     }
 
   } else if (type === 'call') {
     if (!msg.name) return false;
-    var fn = bw._clientFunctions[msg.name] || bw._builtinClientFunctions[msg.name];
-    if (typeof fn !== 'function') return false;
+    var fn = bw._clientFunctions[msg.name];
+    if (!_is(fn, 'function')) return false;
     try {
-      var args = Array.isArray(msg.args) ? msg.args : [];
+      var args = _isA(msg.args) ? msg.args : [];
       fn.apply(null, args);
       return true;
     } catch (e) {
-      console.error('[bw] call error:', msg.name, e);
+      _ce('[bw] call error:', msg.name, e);
       return false;
     }
 
   } else if (type === 'exec') {
     if (!bw._allowExec) {
-      console.warn('[bw] exec rejected: allowExec is not enabled');
+      _cw('[bw] exec rejected: allowExec is not enabled');
       return false;
     }
     if (!msg.code) return false;
@@ -2822,7 +3288,7 @@ bw.clientApply = function(msg) {
       new Function(msg.code)();
       return true;
     } catch (e) {
-      console.error('[bw] exec error:', e);
+      _ce('[bw] exec error:', e);
       return false;
     }
   }
@@ -2830,139 +3296,6 @@ bw.clientApply = function(msg) {
   return false;
 };
 
-/**
- * Connect to a bwserve SSE endpoint and apply protocol messages automatically.
- *
- * Returns a connection object with sendAction(), on(), and close() methods.
- *
- * @param {string} url - SSE endpoint URL (e.g., '/__bw/events/client-1')
- * @param {Object} [opts] - Connection options
- * @param {string} [opts.transport='sse'] - Transport type: 'sse' (default) or 'poll'
- * @param {number} [opts.interval=2000] - Poll interval in ms (only for 'poll' transport)
- * @param {string} [opts.actionUrl] - POST endpoint for actions (default: derived from url)
- * @param {boolean} [opts.reconnect=true] - Auto-reconnect on disconnect
- * @param {boolean} [opts.allowExec=false] - Enable exec message type (arbitrary JS execution)
- * @param {Function} [opts.onStatus] - Status callback: 'connecting'|'connected'|'disconnected'
- * @param {Function} [opts.onMessage] - Raw message callback (before clientApply)
- * @returns {Object} Connection object { sendAction, on, close, status }
- * @category Server
- */
-bw.clientConnect = function(url, opts) {
-  opts = opts || {};
-  var transport = opts.transport || 'sse';
-  var actionUrl = opts.actionUrl || url.replace(/\/events\//, '/action/');
-  var reconnect = opts.reconnect !== false;
-  var onStatus = opts.onStatus || function() {};
-  var onMessage = opts.onMessage || null;
-  var handlers = {};
-  // Set the global allowExec flag from connection options
-  bw._allowExec = !!opts.allowExec;
-  var conn = {
-    status: 'connecting',
-    _es: null,
-    _pollTimer: null
-  };
-
-  function setStatus(s) {
-    conn.status = s;
-    onStatus(s);
-  }
-
-  function handleMessage(data) {
-    try {
-      var msg = typeof data === 'string' ? bw.clientParse(data) : data;
-      if (onMessage) onMessage(msg);
-      if (handlers.message) handlers.message(msg);
-      bw.clientApply(msg);
-    } catch (e) {
-      if (handlers.error) handlers.error(e);
-    }
-  }
-
-  if (transport === 'sse' && typeof EventSource !== 'undefined') {
-    setStatus('connecting');
-    var es = new EventSource(url);
-    conn._es = es;
-
-    es.onopen = function() {
-      setStatus('connected');
-      if (handlers.open) handlers.open();
-    };
-
-    es.onmessage = function(e) {
-      handleMessage(e.data);
-    };
-
-    es.onerror = function() {
-      if (conn.status === 'connected') {
-        setStatus('disconnected');
-      }
-      if (handlers.error) handlers.error(new Error('SSE connection error'));
-      if (!reconnect) {
-        es.close();
-      }
-      // EventSource auto-reconnects by default when reconnect=true
-    };
-  } else if (transport === 'poll') {
-    var interval = opts.interval || 2000;
-    setStatus('connected');
-    conn._pollTimer = setInterval(function() {
-      fetch(url).then(function(r) { return r.json(); }).then(function(msgs) {
-        if (Array.isArray(msgs)) {
-          msgs.forEach(handleMessage);
-        } else if (msgs && msgs.type) {
-          handleMessage(msgs);
-        }
-      }).catch(function(e) {
-        if (handlers.error) handlers.error(e);
-      });
-    }, interval);
-  }
-
-  /**
-   * Send an action to the server via POST.
-   * @param {string} action - Action name
-   * @param {Object} [data] - Action payload
-   */
-  conn.sendAction = function(action, data) {
-    var body = JSON.stringify({ type: 'action', action: action, data: data || {} });
-    fetch(actionUrl, {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: body
-    }).catch(function(e) {
-      if (handlers.error) handlers.error(e);
-    });
-  };
-
-  /**
-   * Register an event handler.
-   * @param {string} event - 'open'|'message'|'error'|'close'
-   * @param {Function} handler
-   */
-  conn.on = function(event, handler) {
-    handlers[event] = handler;
-    return conn;
-  };
-
-  /**
-   * Close the connection.
-   */
-  conn.close = function() {
-    if (conn._es) {
-      conn._es.close();
-      conn._es = null;
-    }
-    if (conn._pollTimer) {
-      clearInterval(conn._pollTimer);
-      conn._pollTimer = null;
-    }
-    setStatus('disconnected');
-    if (handlers.close) handlers.close();
-  };
-
-  return conn;
-};
 
 // ===================================================================================
 // bw.inspect() — Debug utility
@@ -2990,33 +3323,33 @@ bw.inspect = function(target) {
     el = target.element;
     comp = target;
   } else {
-    if (typeof target === 'string') {
+    if (_is(target, 'string')) {
       el = bw.$(target)[0];
     }
     if (!el) {
-      console.warn('bw.inspect: element not found');
+      _cw('bw.inspect: element not found');
       return null;
     }
     comp = el._bwComponentHandle;
   }
   if (!comp) {
-    console.log('bw.inspect: no ComponentHandle on this element');
-    console.log('  Tag:', el.tagName);
-    console.log('  Classes:', el.className);
-    console.log('  _bw_state:', el._bw_state || '(none)');
+    _cl('bw.inspect: no ComponentHandle on this element');
+    _cl('  Tag:', el.tagName);
+    _cl('  Classes:', el.className);
+    _cl('  _bw_state:', el._bw_state || '(none)');
     return null;
   }
   var deps = comp._bindings.reduce(function(s, b) {
     return s.concat(b.deps || []);
   }, []).filter(function(v, i, a) { return a.indexOf(v) === i; });
   console.group('Component: ' + comp._bwId);
-  console.log('State:', comp._state);
-  console.log('Bindings:', comp._bindings.length, '(deps:', deps, ')');
-  console.log('Methods:', Object.keys(comp._methods));
-  console.log('Actions:', Object.keys(comp._actions));
-  console.log('User tag:', comp._userTag || '(none)');
-  console.log('Mounted:', comp.mounted);
-  console.log('Element:', comp.element);
+  _cl('State:', comp._state);
+  _cl('Bindings:', comp._bindings.length, '(deps:', deps, ')');
+  _cl('Methods:', _keys(comp._methods));
+  _cl('Actions:', _keys(comp._actions));
+  _cl('User tag:', comp._userTag || '(none)');
+  _cl('Mounted:', comp.mounted);
+  _cl('Element:', comp.element);
   console.groupEnd();
   return comp;
 };
@@ -3039,8 +3372,8 @@ bw.compile = function(taco) {
   // Pre-extract all binding expressions
   var precompiled = [];
   function walkExpressions(node) {
-    if (!node || typeof node !== 'object') return;
-    if (typeof node.c === 'string' && node.c.indexOf('${') >= 0) {
+    if (!_is(node, 'object')) return;
+    if (_is(node.c, 'string') && node.c.indexOf('${') >= 0) {
       var parsed = bw._parseBindings(node.c);
       for (var i = 0; i < parsed.length; i++) {
         try {
@@ -3055,9 +3388,9 @@ bw.compile = function(taco) {
     }
     if (node.a) {
       for (var key in node.a) {
-        if (Object.prototype.hasOwnProperty.call(node.a, key)) {
+        if (_hop.call(node.a, key)) {
           var v = node.a[key];
-          if (typeof v === 'string' && v.indexOf('${') >= 0) {
+          if (_is(v, 'string') && v.indexOf('${') >= 0) {
             var parsed2 = bw._parseBindings(v);
             for (var j = 0; j < parsed2.length; j++) {
               try {
@@ -3073,9 +3406,9 @@ bw.compile = function(taco) {
         }
       }
     }
-    if (Array.isArray(node.c)) {
+    if (_isA(node.c)) {
       for (var k = 0; k < node.c.length; k++) walkExpressions(node.c[k]);
-    } else if (node.c && typeof node.c === 'object' && node.c.t) {
+    } else if (_is(node.c, 'object') && node.c.t) {
       walkExpressions(node.c);
     }
   }
@@ -3087,7 +3420,7 @@ bw.compile = function(taco) {
     handle._precompiledBindings = precompiled;
     if (initialState) {
       for (var k in initialState) {
-        if (Object.prototype.hasOwnProperty.call(initialState, k)) {
+        if (_hop.call(initialState, k)) {
           handle._state[k] = initialState[k];
         }
       }
@@ -3118,18 +3451,18 @@ bw.compile = function(taco) {
 bw.css = function(rules, options = {}) {
   const { minify = false, pretty = !minify } = options;
 
-  if (typeof rules === 'string') return rules;
+  if (_is(rules, 'string')) return rules;
 
   let css = '';
   const indent = pretty ? '  ' : '';
   const newline = pretty ? '\n' : '';
   const space = pretty ? ' ' : '';
 
-  if (Array.isArray(rules)) {
+  if (_isA(rules)) {
     css = rules.map(rule => bw.css(rule, options)).join(newline);
-  } else if (typeof rules === 'object') {
+  } else if (_is(rules, 'object')) {
     Object.entries(rules).forEach(([selector, styles]) => {
-      if (typeof styles === 'object' && !Array.isArray(styles)) {
+      if (_is(styles, 'object')) {
         // Handle @media, @keyframes, @supports — recurse into nested block
         if (selector.charAt(0) === '@') {
           const inner = bw.css(styles, options);
@@ -3171,14 +3504,14 @@ bw.css = function(rules, options = {}) {
  * @returns {Element} The style element
  * @category CSS & Styling
  * @see bw.css
- * @see bw.loadDefaultStyles
+ * @see bw.loadStyles
  * @example
  * bw.injectCSS('.my-class { color: red; }');
  * bw.injectCSS({ '.card': { padding: '1rem' } }, { id: 'card-styles' });
  */
 bw.injectCSS = function(css, options = {}) {
   if (!bw._isBrowser) {
-    console.warn('bw.injectCSS requires a DOM environment');
+    _cw('bw.injectCSS requires a DOM environment');
     return null;
   }
   
@@ -3195,7 +3528,7 @@ bw.injectCSS = function(css, options = {}) {
   }
   
   // Convert CSS if needed
-  const cssStr = typeof css === 'string' ? css : bw.css(css, options);
+  const cssStr = _is(css, 'string') ? css : bw.css(css, options);
   
   // Set or append CSS
   if (append && styleEl.textContent) {
@@ -3216,113 +3549,19 @@ bw.injectCSS = function(css, options = {}) {
  * @param {...Object} styles - Style objects to merge (left-to-right)
  * @returns {Object} Merged style object
  * @category CSS & Styling
- * @see bw.u
  * @example
- * var style = bw.s(bw.u.flex, bw.u.gap4, { color: 'red' });
+ * var style = bw.s({ display: 'flex' }, { gap: '1rem' }, { color: 'red' });
  * // => { display: 'flex', gap: '1rem', color: 'red' }
  */
 bw.s = function() {
   var result = {};
   for (var i = 0; i < arguments.length; i++) {
     var arg = arguments[i];
-    if (arg && typeof arg === 'object') Object.assign(result, arg);
+    if (_is(arg, 'object')) Object.assign(result, arg);
   }
   return result;
 };
 
-/**
- * Pre-built CSS utility objects (like Tailwind utilities, but in JS).
- *
- * Compose with `bw.s()` to build inline styles without writing raw CSS strings.
- * Includes flex, padding, margin, typography, color, border, and transition utilities.
- *
- * @category CSS & Styling
- * @see bw.s
- * @example
- * { t: 'div', a: { style: bw.s(bw.u.flex, bw.u.gap4, bw.u.p4) },
- *   c: 'Flexbox with 1rem gap and padding' }
- */
-bw.u = {
-  // Display
-  flex: { display: 'flex' },
-  flexCol: { display: 'flex', flexDirection: 'column' },
-  flexRow: { display: 'flex', flexDirection: 'row' },
-  flexWrap: { display: 'flex', flexWrap: 'wrap' },
-  block: { display: 'block' },
-  inline: { display: 'inline' },
-  hidden: { display: 'none' },
-
-  // Flex alignment
-  justifyCenter: { justifyContent: 'center' },
-  justifyBetween: { justifyContent: 'space-between' },
-  justifyEnd: { justifyContent: 'flex-end' },
-  alignCenter: { alignItems: 'center' },
-  alignStart: { alignItems: 'flex-start' },
-  alignEnd: { alignItems: 'flex-end' },
-
-  // Gap (0.25rem increments)
-  gap1: { gap: '0.25rem' },
-  gap2: { gap: '0.5rem' },
-  gap3: { gap: '0.75rem' },
-  gap4: { gap: '1rem' },
-  gap6: { gap: '1.5rem' },
-  gap8: { gap: '2rem' },
-
-  // Padding
-  p0: { padding: '0' },
-  p1: { padding: '0.25rem' },
-  p2: { padding: '0.5rem' },
-  p3: { padding: '0.75rem' },
-  p4: { padding: '1rem' },
-  p6: { padding: '1.5rem' },
-  p8: { padding: '2rem' },
-  px4: { paddingLeft: '1rem', paddingRight: '1rem' },
-  py2: { paddingTop: '0.5rem', paddingBottom: '0.5rem' },
-  py4: { paddingTop: '1rem', paddingBottom: '1rem' },
-
-  // Margin (same scale)
-  m0: { margin: '0' },
-  m4: { margin: '1rem' },
-  mt2: { marginTop: '0.5rem' },
-  mt4: { marginTop: '1rem' },
-  mb2: { marginBottom: '0.5rem' },
-  mb4: { marginBottom: '1rem' },
-  mx_auto: { marginLeft: 'auto', marginRight: 'auto' },
-
-  // Typography
-  textSm: { fontSize: '0.875rem' },
-  textBase: { fontSize: '1rem' },
-  textLg: { fontSize: '1.125rem' },
-  textXl: { fontSize: '1.25rem' },
-  text2xl: { fontSize: '1.5rem' },
-  text3xl: { fontSize: '1.875rem' },
-  bold: { fontWeight: '700' },
-  semibold: { fontWeight: '600' },
-  italic: { fontStyle: 'italic' },
-  textCenter: { textAlign: 'center' },
-  textRight: { textAlign: 'right' },
-
-  // Colors (from design tokens)
-  bgWhite: { background: '#ffffff' },
-  bgTeal: { background: '#006666', color: '#ffffff' },
-  textWhite: { color: '#ffffff' },
-  textTeal: { color: '#006666' },
-  textMuted: { color: '#888' },
-
-  // Borders
-  rounded: { borderRadius: '0.375rem' },
-  roundedLg: { borderRadius: '0.5rem' },
-  roundedFull: { borderRadius: '9999px' },
-  border: { border: '1px solid #d8d8d8' },
-
-  // Sizing
-  wFull: { width: '100%' },
-  hFull: { height: '100%' },
-
-  // Transitions
-  transition: { transition: 'all 0.2s ease' }
-};
-
 /**
  * Generate responsive CSS with media query breakpoints.
  *
@@ -3348,7 +3587,7 @@ bw.u = {
 bw.responsive = function(selector, breakpoints) {
   var sizes = { sm: '576px', md: '768px', lg: '992px', xl: '1200px' };
   var parts = [];
-  Object.keys(breakpoints).forEach(function(key) {
+  _keys(breakpoints).forEach(function(key) {
     var rules = {};
     if (key === 'base') {
       rules[selector] = breakpoints[key];
@@ -3420,18 +3659,18 @@ if (bw._isBrowser) {
     if (!selector) return [];
     
     // Already an array
-    if (Array.isArray(selector)) return selector;
+    if (_isA(selector)) return selector;
     
     // Single element
     if (selector.nodeType) return [selector];
     
     // NodeList or HTMLCollection
-    if (selector.length !== undefined && typeof selector !== 'string') {
+    if (selector.length !== undefined && !_is(selector, 'string')) {
       return Array.from(selector);
     }
     
     // CSS selector string
-    if (typeof selector === 'string') {
+    if (_is(selector, 'string')) {
       return Array.from(document.querySelectorAll(selector));
     }
     
@@ -3444,103 +3683,49 @@ if (bw._isBrowser) {
   };
 }
 
-/**
- * Load the built-in Bootstrap-inspired default stylesheet.
- *
- * Injects bitwrench's batteries-included CSS (buttons, cards, grids, forms,
- * alerts, badges, nav, tabs, etc.) into the document head. Call once at app startup.
- * Returns null in Node.js (no DOM).
- *
- * @param {Object} [options] - Style loading options
- * @param {boolean} [options.minify=true] - Minify the CSS output
- * @returns {Element|null} Style element if in browser, null in Node.js
- * @category CSS & Styling
- * @see bw.setTheme
- * @see bw.applyTheme
- * @see bw.toggleTheme
- * @example
- * bw.loadDefaultStyles();  // inject all default CSS
- */
-bw.loadDefaultStyles = function(options = {}) {
-  const { minify = true, palette } = options;
-
-  // 1. Inject structural CSS (layout, sizing — never changes with theme)
-  if (bw._isBrowser) {
-    var structuralCSS = bw.css(getStructuralStyles());
-    bw.injectCSS(structuralCSS, { id: 'bw_structural', append: false, minify: minify });
-  }
 
-  // 2. Inject cosmetic CSS via generateTheme (colors, shadows, radii)
-  var paletteConfig = Object.assign({}, DEFAULT_PALETTE_CONFIG, palette || {});
-  var result = bw.generateTheme('', Object.assign({}, paletteConfig, { inject: true }));
-  return result;
-};
+// =========================================================================
+// v2.0.18 Clean Styles API — makeStyles / applyStyles / loadStyles / etc.
+// =========================================================================
 
+/**
+ * Convert a scope selector to a <style> element id.
+ * @private
+ * @param {string} [scope] - Scope selector (e.g. '#my-dashboard', '.preview')
+ * @returns {string} Style element id (e.g. 'bw_style_my_dashboard')
+ */
+function _scopeToStyleId(scope) {
+  if (!scope || scope === '' || scope === 'global') return 'bw_style_global';
+  if (scope === 'reset') return 'bw_style_reset';
+  // Strip leading # or . and convert - to _
+  var clean = scope.replace(/^[#.]/, '').replace(/-/g, '_');
+  return 'bw_style_' + clean;
+}
 
 /**
- * Generate a complete, scoped theme from seed colors.
+ * Generate a complete styles object from seed colors and layout config.
+ * Pure function — no DOM, no state, no side effects.
  *
- * Produces CSS for all themed components (buttons, alerts, badges, cards,
- * forms, nav, tables, tabs, list groups, pagination, progress, hero, utilities)
- * scoped under `.name` class. Multiple themes can coexist in the stylesheet.
- * Swap themes by changing the class on a container element.
+ * All parameters are optional. Defaults to the bitwrench default palette.
  *
- * @param {string} name - CSS scope class (e.g. 'ocean'). Empty string = unscoped global.
- * @param {Object} config - Theme configuration
- * @param {string} config.primary - Primary brand color hex
- * @param {string} config.secondary - Secondary color hex
- * @param {string} [config.tertiary] - Tertiary/accent color hex (defaults to primary)
- * @param {string} [config.success='#198754'] - Success color hex
- * @param {string} [config.danger='#dc3545'] - Danger color hex
- * @param {string} [config.warning='#ffc107'] - Warning color hex
- * @param {string} [config.info='#0dcaf0'] - Info color hex
- * @param {string} [config.light='#f8f9fa'] - Light color hex
- * @param {string} [config.dark='#212529'] - Dark color hex
- * @param {string} [config.background] - Page background hex (default: '#ffffff' light, derived dark)
- * @param {string} [config.surface] - Surface/card background hex (default: '#f8f9fa' light, derived dark)
+ * @param {Object} [config] - Style configuration
+ * @param {string} [config.primary='#006666'] - Primary brand color hex
+ * @param {string} [config.secondary='#6c757d'] - Secondary color hex
+ * @param {string} [config.tertiary] - Tertiary color hex (defaults to primary)
  * @param {string} [config.spacing='normal'] - 'compact' | 'normal' | 'spacious'
  * @param {string} [config.radius='md'] - 'none' | 'sm' | 'md' | 'lg' | 'pill'
- * @param {number} [config.fontSize=1.0] - Base font size scale factor
- * @param {string|number} [config.typeRatio='normal'] - 'tight' | 'normal' | 'relaxed' | 'dramatic' or a number
- * @param {string} [config.elevation='md'] - 'flat' | 'sm' | 'md' | 'lg'
- * @param {string} [config.motion='standard'] - 'reduced' | 'standard' | 'expressive'
- * @param {number} [config.harmonize=0.20] - 0-1, semantic color hue shift toward primary
- * @param {boolean} [config.inject=true] - Inject into DOM (browser only)
- * @returns {Object} { css, palette, name, isLightPrimary, alternate: { css, palette } }
+ * @returns {Object} { css, alternateCss, rules, alternateRules, palette, alternatePalette, isLightPrimary }
  * @category CSS & Styling
- * @see bw.applyTheme
- * @see bw.toggleTheme
- * @see bw.loadDefaultStyles
+ * @see bw.applyStyles
+ * @see bw.loadStyles
  * @example
- * // Generate and inject an ocean theme (primary + alternate)
- * var theme = bw.generateTheme('ocean', {
- *   primary: '#0077b6',
- *   secondary: '#90e0ef',
- *   tertiary: '#00b4d8'
- * });
- *
- * // Apply to a container
- * document.getElementById('app').classList.add('ocean');
- *
- * // Toggle to alternate palette
- * bw.toggleTheme();
- *
- * // Generate CSS for static export (Node.js)
- * var result = bw.generateTheme('sunset', {
- *   primary: '#e76f51',
- *   secondary: '#264653',
- *   inject: false
- * });
- * fs.writeFileSync('sunset.css', result.css + result.alternate.css);
+ * var styles = bw.makeStyles({ primary: '#4f46e5', secondary: '#d97706' });
+ * console.log(styles.palette.primary.base); // '#4f46e5'
+ * // styles.css contains all themed CSS — nothing injected
  */
-bw.generateTheme = function(name, config) {
-  if (!config || !config.primary || !config.secondary) {
-    throw new Error('bw.generateTheme requires config.primary and config.secondary');
-  }
-
-  // Merge with defaults; if user didn't supply tertiary, default to their primary
-  var fullConfig = Object.assign({}, DEFAULT_PALETTE_CONFIG, config);
-  if (!config.tertiary) fullConfig.tertiary = fullConfig.primary;
+bw.makeStyles = function(config) {
+  var fullConfig = Object.assign({}, DEFAULT_PALETTE_CONFIG, config || {});
+  if (config && !config.tertiary) fullConfig.tertiary = fullConfig.primary;
 
   // Derive primary palette
   var palette = derivePalette(fullConfig);
@@ -3548,131 +3733,207 @@ bw.generateTheme = function(name, config) {
   // Resolve layout
   var layout = resolveLayout(fullConfig);
 
-  // Generate primary themed CSS rules
-  var themedRules = generateThemedCSS(name, palette, layout);
+  // Generate primary themed CSS rules (unscoped)
+  var themedRules = generateThemedCSS('', palette, layout);
   var cssStr = bw.css(themedRules);
 
   // Derive alternate palette (luminance-inverted)
   var altConfig = deriveAlternateConfig(fullConfig);
   var altPalette = derivePalette(altConfig);
 
-  // Generate alternate CSS scoped under .bw_theme_alt
-  var altRules = generateAlternateCSS(name, altPalette, layout);
-  var altCssStr = bw.css(altRules);
+  // Generate alternate CSS rules WITHOUT .bw_theme_alt prefix (raw rules)
+  // applyStyles() wraps them appropriately based on scope
+  var altRawRules = generateThemedCSS('', altPalette, layout);
+
+  // Add body-level surface overrides for the alternate palette.
+  // When .bw_theme_alt is on <html>, ".bw_theme_alt body" correctly matches.
+  altRawRules['body'] = {
+    'color': altPalette.dark.base,
+    'background-color': altPalette.surface || altPalette.light.base
+  };
+
+  var altCssStr = bw.css(altRawRules);
 
   // Determine if primary is light-flavored
   var lightPrimary = isLightPalette(fullConfig);
 
-  // Inject both CSS sets into DOM if requested
-  var shouldInject = config.inject !== false;
-  if (shouldInject && bw._isBrowser) {
-    var safeName = name ? name.replace(/-/g, '_') : '';
-    var styleId = safeName ? 'bw_theme_' + safeName : 'bw_theme_default';
-    var altStyleId = safeName ? 'bw_theme_' + safeName + '_alt' : 'bw_theme_default_alt';
-
-    bw.injectCSS(cssStr, { id: styleId, append: false });
-    bw.injectCSS(altCssStr, { id: altStyleId, append: false });
+  return {
+    css: cssStr,
+    alternateCss: altCssStr,
+    rules: themedRules,
+    alternateRules: altRawRules,
+    palette: palette,
+    alternatePalette: altPalette,
+    isLightPrimary: lightPrimary
+  };
+};
 
-    bw._activeThemeStyleIds = [styleId, altStyleId];
+/**
+ * Inject styles into the DOM with optional scoping.
+ *
+ * Takes a styles object from `makeStyles()` and creates a single `<style>`
+ * element in `<head>`. If a scope selector is provided, all CSS rules are
+ * wrapped under that selector. Alternate CSS is wrapped under `.bw_theme_alt`.
+ *
+ * @param {Object} styles - Result of `bw.makeStyles()`
+ * @param {string} [scope] - Scope selector (e.g. '#my-dashboard', '.preview'). Omit for global.
+ * @returns {Element|null} The `<style>` element, or null in Node.js
+ * @category CSS & Styling
+ * @see bw.makeStyles
+ * @see bw.loadStyles
+ * @see bw.clearStyles
+ * @example
+ * var styles = bw.makeStyles({ primary: '#4f46e5' });
+ * bw.applyStyles(styles);                     // global
+ * bw.applyStyles(styles, '#my-dashboard');     // scoped
+ */
+bw.applyStyles = function(styles, scope) {
+  if (!bw._isBrowser) return null;
+  if (!styles || !styles.rules) {
+    _cw('bw.applyStyles: invalid styles object');
+    return null;
   }
 
-  // Update bw.u color entries to reflect the palette
-  if (!name) {
-    bw.u.bgTeal = { background: palette.primary.base, color: palette.primary.textOn };
-    bw.u.textTeal = { color: palette.primary.base };
-    bw.u.bgWhite = { background: '#ffffff' };
-    bw.u.textWhite = { color: '#ffffff' };
+  var styleId = _scopeToStyleId(scope);
+
+  // Scope the primary rules if a scope is provided
+  var primaryRules = styles.rules;
+  if (scope) {
+    primaryRules = scopeRulesUnder(primaryRules, scope);
   }
 
-  // Store active theme state
-  var result = {
-    css: cssStr,
-    palette: palette,
-    name: name,
-    isLightPrimary: lightPrimary,
-    alternate: {
-      css: altCssStr,
-      palette: altPalette
+  // Wrap alternate rules with .bw_theme_alt
+  var altRules = styles.alternateRules;
+  if (altRules) {
+    if (scope) {
+      // Scoped compound: #scope.bw_theme_alt .bw_card
+      altRules = scopeRulesUnder(altRules, scope + '.bw_theme_alt');
+    } else {
+      // Global: .bw_theme_alt .bw_card
+      altRules = scopeRulesUnder(altRules, '.bw_theme_alt');
     }
-  };
-  bw._activeTheme = result;
-  bw._activeThemeMode = 'primary';
+  }
 
-  return result;
+  // Combine primary + alternate into one CSS string
+  var combined = bw.css(primaryRules);
+  if (altRules) {
+    combined += '\n' + bw.css(altRules);
+  }
+
+  return bw.injectCSS(combined, { id: styleId, append: false });
 };
 
 /**
- * Apply a theme mode. Switches between primary and alternate palettes
- * by adding/removing the `bw_theme_alt` class on `<html>`.
+ * Generate and apply styles in one call. Convenience wrapper.
+ *
+ * Equivalent to: `bw.applyStyles(bw.makeStyles(config), scope)`
  *
- * @param {string} mode - 'primary' | 'alternate' | 'light' | 'dark'
- * @returns {string} Active mode: 'primary' or 'alternate'
+ * @param {Object} [config] - Style configuration (same as `makeStyles`)
+ * @param {string} [scope] - Scope selector (same as `applyStyles`)
+ * @returns {Element|null} The `<style>` element, or null in Node.js
  * @category CSS & Styling
- * @see bw.generateTheme
- * @see bw.toggleTheme
+ * @see bw.makeStyles
+ * @see bw.applyStyles
  * @example
- * bw.applyTheme('alternate');  // switch to alternate palette
- * bw.applyTheme('dark');       // switch to whichever palette is darker
- * bw.applyTheme('primary');    // switch back to primary palette
+ * bw.loadStyles();                                          // defaults, global
+ * bw.loadStyles({ primary: '#4f46e5' });                    // custom, global
+ * bw.loadStyles({ primary: '#4f46e5' }, '#my-dashboard');   // custom, scoped
  */
-bw.applyTheme = function(mode) {
-  if (!bw._isBrowser) return mode || 'primary';
-  var root = document.documentElement;
-  var isLight = bw._activeTheme ? bw._activeTheme.isLightPrimary : true;
-
-  var wantAlt;
-  if (mode === 'primary')        wantAlt = false;
-  else if (mode === 'alternate') wantAlt = true;
-  else if (mode === 'light')     wantAlt = !isLight;
-  else if (mode === 'dark')      wantAlt = isLight;
-  else                           wantAlt = false;
-
-  if (wantAlt) {
-    root.classList.add('bw_theme_alt');
-  } else {
-    root.classList.remove('bw_theme_alt');
+bw.loadStyles = function(config, scope) {
+  // Also inject structural CSS first (only once)
+  if (bw._isBrowser) {
+    var existing = document.getElementById('bw_structural');
+    if (!existing) {
+      var structuralCSS = bw.css(getStructuralStyles());
+      bw.injectCSS(structuralCSS, { id: 'bw_structural', append: false });
+    }
   }
+  return bw.applyStyles(bw.makeStyles(config), scope);
+};
 
-  bw._activeThemeMode = wantAlt ? 'alternate' : 'primary';
-  return bw._activeThemeMode;
+/**
+ * Inject the CSS reset (box-sizing, html/body font, reduced-motion).
+ * Idempotent — if already injected, returns the existing `<style>` element.
+ *
+ * @returns {Element|null} The `<style>` element, or null in Node.js
+ * @category CSS & Styling
+ * @see bw.loadStyles
+ * @see bw.clearStyles
+ * @example
+ * bw.loadReset();  // inject once, safe to call multiple times
+ */
+bw.loadReset = function() {
+  if (!bw._isBrowser) return null;
+  var existing = document.getElementById('bw_style_reset');
+  if (existing) return existing;
+  return bw.injectCSS(bw.css(getResetStyles()), { id: 'bw_style_reset', append: false });
 };
 
 /**
- * Toggle between primary and alternate theme palettes.
+ * Toggle between primary and alternate palettes.
  *
+ * Adds/removes the `bw_theme_alt` class on the scoping element.
+ * Without a scope, toggles on `<html>` (global).
+ * With a scope, toggles on the first matching element.
+ *
+ * @param {string} [scope] - Scope selector (e.g. '#my-dashboard'). Omit for global.
  * @returns {string} Active mode after toggle: 'primary' or 'alternate'
  * @category CSS & Styling
- * @see bw.applyTheme
- * @see bw.generateTheme
+ * @see bw.applyStyles
+ * @see bw.clearStyles
  * @example
- * bw.toggleTheme();  // flip between primary and alternate
+ * bw.toggleStyles();                   // global toggle on <html>
+ * bw.toggleStyles('#my-dashboard');    // scoped toggle
  */
-bw.toggleTheme = function() {
-  var current = bw._activeThemeMode || 'primary';
-  return bw.applyTheme(current === 'primary' ? 'alternate' : 'primary');
+bw.toggleStyles = function(scope) {
+  if (!bw._isBrowser) return 'primary';
+  var target;
+  if (scope) {
+    var els = bw.$(scope);
+    target = els[0];
+  } else {
+    target = document.documentElement;
+  }
+  if (!target) return 'primary';
+
+  var hasAlt = target.classList.contains('bw_theme_alt');
+  if (hasAlt) {
+    target.classList.remove('bw_theme_alt');
+    return 'primary';
+  } else {
+    target.classList.add('bw_theme_alt');
+    return 'alternate';
+  }
 };
 
 /**
- * Remove the currently active theme's injected style elements from the DOM.
- * Use this before generating a new theme with a different name to prevent
- * stale CSS accumulation.
+ * Remove injected styles for a given scope.
+ *
+ * Finds the `<style>` element by id and removes it. Also removes
+ * the `bw_theme_alt` class from the relevant element.
  *
+ * @param {string} [scope] - Scope selector. Omit to remove global styles.
  * @category CSS & Styling
- * @see bw.generateTheme
+ * @see bw.applyStyles
+ * @see bw.loadStyles
  * @example
- * bw.clearTheme();                   // remove current theme styles
- * bw.generateTheme('sunset', conf);  // inject fresh theme
+ * bw.clearStyles();                    // remove global styles
+ * bw.clearStyles('#my-dashboard');     // remove scoped styles
+ * bw.clearStyles('reset');             // remove the CSS reset
  */
-bw.clearTheme = function() {
-  if (bw._activeThemeStyleIds && bw._isBrowser) {
-    bw._activeThemeStyleIds.forEach(function(id) {
-      var el = document.getElementById(id);
-      if (el) el.remove();
-    });
-    bw._activeThemeStyleIds = null;
+bw.clearStyles = function(scope) {
+  if (!bw._isBrowser) return;
+  var styleId = _scopeToStyleId(scope);
+  var el = document.getElementById(styleId);
+  if (el) el.remove();
+
+  // Also remove bw_theme_alt from the relevant element
+  if (scope && scope !== 'reset' && scope !== 'global') {
+    var targets = bw.$(scope);
+    if (targets[0]) targets[0].classList.remove('bw_theme_alt');
+  } else if (!scope || scope === 'global') {
+    document.documentElement.classList.remove('bw_theme_alt');
   }
-  bw._activeTheme = null;
-  bw._activeThemeMode = 'primary';
 };
 
 // Expose color utility functions on bw namespace
@@ -3895,10 +4156,15 @@ bw.copyToClipboard = function(text) {
  * @param {Object} config - Table configuration
  * @param {Array<Object>} config.data - Array of row objects to display
  * @param {Array<Object>} [config.columns] - Column definitions with key, label, render
- * @param {string} [config.className='table'] - CSS class for table element
+ * @param {string} [config.className=''] - Additional CSS classes for table element
  * @param {boolean} [config.sortable=true] - Enable click-to-sort headers
  * @param {Function} [config.onSort] - Sort callback (column, direction)
- * @returns {Object} TACO object for table
+ * @param {boolean} [config.selectable=false] - Enable row selection on click
+ * @param {Function} [config.onRowClick] - Row click callback (row, index, event)
+ * @param {number} [config.pageSize] - Rows per page (enables pagination when set)
+ * @param {number} [config.currentPage=1] - Current page number (1-based)
+ * @param {Function} [config.onPageChange] - Page change callback (newPage)
+ * @returns {Object} TACO object for table (with optional pagination controls)
  * @category Component Builders
  * @see bw.makeDataTable
  * @example
@@ -3910,7 +4176,12 @@ bw.copyToClipboard = function(text) {
  *   columns: [
  *     { key: 'name', label: 'Name' },
  *     { key: 'age', label: 'Age' }
- *   ]
+ *   ],
+ *   selectable: true,
+ *   onRowClick: function(row, i) { console.log('clicked', row.name); },
+ *   pageSize: 10,
+ *   currentPage: 1,
+ *   onPageChange: function(page) { console.log('page', page); }
  * });
  */
 bw.makeTable = function(config) {
@@ -3923,41 +4194,47 @@ bw.makeTable = function(config) {
     sortable = true,
     onSort,
     sortColumn,
-    sortDirection = 'asc'
+    sortDirection = 'asc',
+    selectable = false,
+    onRowClick,
+    pageSize,
+    currentPage = 1,
+    onPageChange
   } = config;
 
-  // Build class list: always include bw_table, add striped/hover, append user className
+  // Build class list: always include bw_table, add striped/hover/selectable, append user className
   let cls = 'bw_table';
   if (striped) cls += ' bw_table_striped';
-  if (hover) cls += ' bw_table_hover';
+  if (hover || selectable) cls += ' bw_table_hover';
+  if (selectable) cls += ' bw_table_selectable';
   if (className) cls += ' ' + className;
   cls = cls.trim();
-  
+
   // Auto-detect columns if not provided
-  const cols = columns || (data.length > 0 
-    ? Object.keys(data[0]).map(key => ({ key, label: key }))
+  const cols = columns || (data.length > 0
+    ? _keys(data[0]).map(key => ({ key, label: key }))
     : []);
-    
+
   // Current sort state
   let currentSortColumn = sortColumn || null;
   let currentSortDirection = sortDirection;
-  
+
   // Sort data if column specified
   let sortedData = [...data];
   if (currentSortColumn) {
     sortedData.sort((a, b) => {
       const aVal = a[currentSortColumn];
       const bVal = b[currentSortColumn];
-      
+
       // Handle different types
-      if (typeof aVal === 'number' && typeof bVal === 'number') {
+      if (_is(aVal, 'number') && _is(bVal, 'number')) {
         return currentSortDirection === 'asc' ? aVal - bVal : bVal - aVal;
       }
-      
+
       // String comparison
       const aStr = String(aVal || '').toLowerCase();
       const bStr = String(bVal || '').toLowerCase();
-      
+
       if (currentSortDirection === 'asc') {
         return aStr.localeCompare(bStr);
       } else {
@@ -3965,23 +4242,32 @@ bw.makeTable = function(config) {
       }
     });
   }
-  
+
+  // Pagination
+  const totalRows = sortedData.length;
+  const totalPages = pageSize ? Math.max(1, Math.ceil(totalRows / pageSize)) : 1;
+  const page = Math.max(1, Math.min(currentPage, totalPages));
+  if (pageSize) {
+    const start = (page - 1) * pageSize;
+    sortedData = sortedData.slice(start, start + pageSize);
+  }
+
   // Create sort handler
   const handleSort = (column) => {
     if (!sortable) return;
-    
+
     if (currentSortColumn === column) {
       currentSortDirection = currentSortDirection === 'asc' ? 'desc' : 'asc';
     } else {
       currentSortColumn = column;
       currentSortDirection = 'asc';
     }
-    
+
     if (onSort) {
       onSort(column, currentSortDirection);
     }
   };
-  
+
   // Build table header
   const thead = {
     t: 'thead',
@@ -4004,24 +4290,87 @@ bw.makeTable = function(config) {
       }))
     }
   };
-  
-  // Build table body
+
+  // Build table body with selectable/onRowClick support
   const tbody = {
     t: 'tbody',
-    c: sortedData.map(row => ({
-      t: 'tr',
-      c: cols.map(col => ({
-        t: 'td',
-        c: col.render ? col.render(row[col.key], row) : String(row[col.key] || '')
-      }))
-    }))
+    c: sortedData.map((row, idx) => {
+      const globalIdx = pageSize ? (page - 1) * pageSize + idx : idx;
+      const rowAttrs = {};
+      if (selectable || onRowClick) {
+        rowAttrs.style = 'cursor:pointer;';
+        rowAttrs.onclick = function(e) {
+          if (selectable) {
+            // Toggle selected class on this row
+            var tr = e.currentTarget;
+            tr.classList.toggle('bw_table_row_selected');
+          }
+          if (onRowClick) {
+            onRowClick(row, globalIdx, e);
+          }
+        };
+      }
+      return {
+        t: 'tr',
+        a: rowAttrs,
+        c: cols.map(col => ({
+          t: 'td',
+          c: col.render ? col.render(row[col.key], row) : String(row[col.key] || '')
+        }))
+      };
+    })
   };
-  
-  return {
+
+  const table = {
     t: 'table',
     a: { class: cls },
     c: [thead, tbody]
   };
+
+  // If no pagination, return table directly
+  if (!pageSize) return table;
+
+  // Build pagination controls
+  const pageButtons = [];
+  // Previous button
+  pageButtons.push({
+    t: 'button',
+    a: {
+      class: 'bw_btn bw_btn_sm',
+      disabled: page <= 1 ? 'disabled' : undefined,
+      onclick: page > 1 && onPageChange ? function() { onPageChange(page - 1); } : undefined
+    },
+    c: 'Prev'
+  });
+  // Page info
+  pageButtons.push({
+    t: 'span',
+    a: { style: 'margin:0 0.5rem;font-size:0.875rem;' },
+    c: 'Page ' + page + ' of ' + totalPages
+  });
+  // Next button
+  pageButtons.push({
+    t: 'button',
+    a: {
+      class: 'bw_btn bw_btn_sm',
+      disabled: page >= totalPages ? 'disabled' : undefined,
+      onclick: page < totalPages && onPageChange ? function() { onPageChange(page + 1); } : undefined
+    },
+    c: 'Next'
+  });
+
+  return {
+    t: 'div',
+    a: { class: 'bw_table_paginated' },
+    c: [
+      table,
+      {
+        t: 'div',
+        a: { class: 'bw_table_pagination', style: 'display:flex;align-items:center;justify-content:flex-end;padding:0.5rem 0;gap:0.25rem;' },
+        c: pageButtons
+      }
+    ]
+  };
 };
 
 /**
@@ -4060,7 +4409,7 @@ bw.makeTable = function(config) {
 bw.makeTableFromArray = function(config) {
   const { data = [], headerRow = true, columns, ...rest } = config;
 
-  if (!Array.isArray(data) || data.length === 0) {
+  if (!_isA(data) || data.length === 0) {
     return bw.makeTable({ data: [], columns: columns || [], ...rest });
   }
 
@@ -4142,7 +4491,7 @@ bw.makeBarChart = function(config) {
     className = ''
   } = config;
 
-  if (!Array.isArray(data) || data.length === 0) {
+  if (!_isA(data) || data.length === 0) {
     return { t: 'div', a: { class: ('bw_bar_chart_container ' + className).trim() }, c: '' };
   }
 
@@ -4291,7 +4640,7 @@ bw._componentRegistry = new Map();
  */
 bw.render = function(element, position, taco) {
   // Get target element
-  const targetEl = typeof element === 'string' 
+  const targetEl = _is(element, 'string')
     ? document.querySelector(element) 
     : element;
     
@@ -4441,7 +4790,7 @@ bw.render = function(element, position, taco) {
     setContent(content) {
       this._taco.c = content;
       if (this.element) {
-        if (typeof content === 'string') {
+        if (_is(content, 'string')) {
           this.element.textContent = content;
         } else {
           // Re-render for complex content