New theme from local branch

This is the same as #7, but working from a shared new-theme branch now.