Fix layout coloring and contrast across light and dark themes

ff8ed78