correct some bugs, update theme