Couple of reversions

* Trying out reverting keyword->support change
* Attempting to get symbol detection working with merge
Another test for labels
Another test, seeing what works best for labels
Trying out another combination
Merge branch 'master' into Dev
Another mess around with labels
Another style
Another fiddle with type for detection
Changing labels again
Merge branch 'Dev'