Reorganized tables; reduced # of color options