Merge pull request #1226 from brccabral/custom_theme