Merge pull request #404 from chrismayer/custom-theme-props

Merge pull request #404 from chrismayer/custom-theme-props #478