I tried to implement the layouts in less invasive way for skins in the start of the PR. But in current concept I can't see a way to implement layouts without breaking skins.