Updated some deprecated types and skins.