More theme improvements.
More theme improvements.