Add theme2 and theme3
Merge branch 'master' of ../stage