fixes for issues #1 and #2, overwrite templates, add shortcode and partional less