Fixes for theme-check