Theme style improvements