update bootstrap_and_overrides to 3.x