Updated colors and removed delimitMate