Better tags on diamond formations.
Improve reactivate/cross reactivate animation.