Make sure default overrides removed themes