Merge pull request #480 from eurich/theme_fixes

small fixes