Complete rewrite of shortcodes.