Fixed dark Theme support