Reworked bootstrapping for "base" and "base_with_login" themes