theme package & merge master into login