Layout fixed, just some colors left