updated skins, modified structure for include