Updated handling of resources to handle skins
merge