WIP: Refactor Javascript tags