Formatting JS templates - wip
Updates _includes/js
Updates src.