Added colors
merging template.php