refs 6841 theme機能をgem化
Merge remote-tracking branch 'origin/master'