fixed some of the regexes, added support for javascript/css