[Shortcodes] Hopefully final list of shortcodes