Adding surround and repeat plugins