Fix for colors, added graphics