diff --git a/templates/bangumis.html b/templates/bangumis.html
index 196d948f..de799086 100644
--- a/templates/bangumis.html
+++ b/templates/bangumis.html
@@ -714,24 +714,11 @@
                     </script>
                 </div>
                 <hr>
-                <!-- 评论模块 -->
+                <!--/* 评论组件 */-->
                 <th:block
-                        th:if="${theme.config.comments.twikooEnable && #strings.equals(theme.config.comments.use, 'Twikoo') && not #strings.isEmpty(theme.config.comments.twikoos.envId)}">
-                    <div th:replace="~{modules/twikoo :: twikoo}"></div>
-                </th:block>
-                <div id="post-comment"
-                     th:if="${pluginFinder.available('PluginCommentWidget') && #strings.equals(theme.config.comments.use, 'commentWidget')}">
-                    <div class="comment-head">
-                        <div class="comment-headline"><i class="iconfont icon-comment-alt"></i> <span>评论</span></div>
-                        <div class="comment-privacy"><a href="/privacy">隐私政策</a></div>
-                        <div class="comment-tips" id="comment-tips">
-                            <span>你无需删除空行，直接评论以获取最佳展示效果</span>
-                        </div>
-                    </div>
-                    <halo:comment group="content.halo.run" kind="SinglePage"
-                                  th:attr="name=${singlePage.metadata.name}"
-                                  colorScheme="document.documentElement.getAttribute('data-theme')"/>
-                </div>
+                        th:replace="~{modules/comment :: comment(group = 'content.halo.run',
+                  kind = 'SinglePage',
+                  name = ${singlePage.metadata.name})}"/>
 
             </div>