Actually tested restyle, fixed everything

(JS needs minified)