fixed template and modified colors