Merge pull request #2347 from shunjou/theme-material