add theme and fix some bugs