Theme setting fix