Shortcode Templates:
- small tweaks to built ins