Added colors, committed minor changes to most items