Improve the theme support.