improved highlighting, fixed color to hex issues