Changed handling of themes