Rework plugin skin code, more shared now