Improve theme support.