backport of fix for theme config check