Fixed font swatches
Fixed font swatches
Removed template name from image directories
Merged master