fixed several regexes, used common tokens for compatibility with bundled themes
update generated file