lots of theme color fixes