added theme settings support