Update skin by mmark, many fix