Got both Bracket and Parenthesis highlighting

Standardized them so they are both use the same method. Also changed the
ordering of highlighting so comment comes last