assign theme improvement