Shortcoded templates

Pull request for the new branch "shortcoded-templates"
side not has a but fix mixed in, noted in the commits