Feature reskin

Reopening the pull request now that the branch names have changed.