Carried on working on new layout. Incorrect hex colors are being let through for some reason