skin refactor
Merge pull request #654 from code-dot-org/skinRefactor

skin refactor