[skin] include last re-touched fixes