Fixed some bugs on theme2