Add the surround and repeat bundles