Better handling of themes.