Strip whitespace, different theme & more Bundles