Improvements to Swap Effect

Swap effect now also swaps classes.

Added option for:
- turning off pink highlighting
- turning off class swapping