Resolved remainder of old token type references

Replaced all references to the old token types to the new enum
structure. Seperate auxiliary regular expressions and commented where
further expansion needed to take place