Fix various issues for theme check