bugfixes for themes