update theme to upstream
fix some bugs