Further improved theme settings