More color and border radius fixes