MDL-58428 theme: Shift templates ready for Bootstrapbase removal