Modified the basic skin, fixed previous commit wrong merges