Commit @ school

Changelog:
- Do pretty much everything the changelog mentions.
- Fix tabbing on internal .js files.