Feature/re skin

Woops! Nice catch!