*8265* Theme settings fix