Make bootstrap_package compatible with themes (part 1)