improved theme coloring