So many changes...

HALP

I'M DROWNING IN CHANGES ;-;

(okay it isn't that bad but a lot of noscript tag additions in this commit)