Put polyfills in separate file, added string highlighting