better theme compatibility + v1.0.1