Add skins
Fix merge