Support explicit class addition/removal on triggers

Now uses the same code to add, remove or toggle classes on triggers