Bug Fix: Skins

Fixed skins generation bug and just general tidying of some code.