Remove . and , punctuation matches

These were added to use in theme creation but get in the way of better matching the code in other rules. Removed in favor of matching the items as part of larger rules.