Corrected colors, added solid tiles and solid with borders