Copy corrected templates from master branch