Various bug fixes.   Removing namespace refs in code.  Updating templates.
Removing swappable panels.  Removing theme from cascade select.