Modified skin and extension collection to use new format of collecting everything.