added colors and fixed tags