Several more update to color and font style