fix echo error, add theme