Improve and prune themes.