Fix colors and organization