Skin fixes and multi-provider refactoring