Switched to HTML everywhere