Fix issue with demo theme settings