Initial clean commit for EFA skin
Updates to EFA skin