Companion now should fully support themes