Re: [support] Avoid sub-theme