diff --git a/src/main/java/me/qwq/doghouse/service/ThemeService.java b/src/main/java/me/qwq/doghouse/service/ThemeService.java
index dbe9373..3f930f9 100644
--- a/src/main/java/me/qwq/doghouse/service/ThemeService.java
+++ b/src/main/java/me/qwq/doghouse/service/ThemeService.java
@@ -215,16 +215,12 @@ public class ThemeService {
     }
     
     /**
-     * 获取当前主题
+     * 获取当前主题，若为配置或不存在则取读取到的第一个主题
      * @return
      */
     public ThemeInfo getCurrentTheme() {
         String identity = siteConfig.getThemeIdentity();
-        Optional<ThemeInfo> optionalTheme = cachedThemes.stream().filter(theme -> {
-            return theme.isInternal() || OSUtils.isCaseSensitiveFS() ? 
-                    theme.getIdentity().equals(identity):
-                    theme.getIdentity().equalsIgnoreCase(identity);
-        }).findAny();
+        Optional<ThemeInfo> optionalTheme = Optional.ofNullable(getThemeInfo(identity));
         
         return optionalTheme.orElseGet(() -> {
             ThemeInfo defaultTheme = cachedThemes.get(0);
@@ -233,6 +229,11 @@ public class ThemeService {
         });
     }
     
+    /**
+     * 根据 identity 获取指定主题
+     * @param identity
+     * @return
+     */
     public ThemeInfo getThemeInfo(String identity) {
         Optional<ThemeInfo> optionalTheme = cachedThemes.stream().filter(theme -> {
             return theme.isInternal() || OSUtils.isCaseSensitiveFS() ? 
diff --git a/src/main/resources/templates/blog/sketch/template/archives.html b/src/main/resources/templates/blog/sketch/template/archives.html
index 9dc9ad4..272e1b0 100644
--- a/src/main/resources/templates/blog/sketch/template/archives.html
+++ b/src/main/resources/templates/blog/sketch/template/archives.html
@@ -20,8 +20,8 @@
                                 </div>
                             </header>
                             <th:block th:each="post, i : ${posts}">
-                                <th:block th:with="postYear=${#dates.year(post.createTime)}">
-                                    <th:block th:if="${i.first or postYear != #dates.year(posts[i.index - 1].createTime)}" >
+                                <th:block th:with="postYear=${post.createTime.year}">
+                                    <th:block th:if="${i.first or postYear != posts[i.index - 1].createTime.year}" >
                                         <div class="year" th:with="year=${postYear}" th:text="${postYear}"></div>
                                         <th:block th:utext="'<ul>'"></th:block>
                                     </th:block>
@@ -39,7 +39,7 @@
                                                 </a></td>
                                                 </tr></tbody></table>
                                             </li>
-                                    <th:block th:if="${i.last or postYear != #dates.year(posts[i.index + 1].createTime)}" th:utext="'</ul>'"></th:block>
+                                    <th:block th:if="${i.last or postYear != posts[i.index + 1].createTime.year}" th:utext="'</ul>'"></th:block>
                                 </th:block>
                         </div>
                 </article>