Theme test 7

swapper function altered