Major Performance Update for BeTheme and BeBuilder