More tweaks to colors and shapes.