Updated template and shortcode loading to v2 standards. Thanks Jana! (#2)