Added better theme compatibility