Fixes problem when theme is set to None