Tweaks for theme support.