Improved Embedded templates slightly.