Theme option null warning issues & improved onboarding experience