diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 3cbef52..207a4f2 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ $.Site.LanguageCode }}" class="han-init">
+<html lang="{{ $.Site.LanguageCode }}" class="{{- if $.Site.Params.hasCJKLanguage -}} {{- "han-init" -}} {{- end -}}">
     {{- partial "head.html" . -}}
     <body a="{{ $.Site.Params.theme_config.appearance | default "auto" }}">
         <main class="page-content" aria-label="Content">
diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html
new file mode 100644
index 0000000..a1ecdc4
--- /dev/null
+++ b/layouts/_default/taxonomy.html
@@ -0,0 +1,8 @@
+{{ define "main" }}
+{{ partial "back_link.html" .}}
+
+<h1>{{ .Title }}</h1>
+
+{{ .Content }}
+{{ partial "post_list.html" (dict "context" .)}}
+{{ end }}
diff --git a/layouts/_default/term.html b/layouts/_default/term.html
new file mode 100644
index 0000000..a1ecdc4
--- /dev/null
+++ b/layouts/_default/term.html
@@ -0,0 +1,8 @@
+{{ define "main" }}
+{{ partial "back_link.html" .}}
+
+<h1>{{ .Title }}</h1>
+
+{{ .Content }}
+{{ partial "post_list.html" (dict "context" .)}}
+{{ end }}
diff --git a/layouts/baseof.html b/layouts/baseof.html
deleted file mode 100644
index bedcbb4..0000000
--- a/layouts/baseof.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html lang="{{ $.Site.LanguageCode }}" class="han-init">
-    {{- partial "head.html" . -}}
-    <body a="{{ $.Site.Params.theme_config.appearance | default "auto" }}">
-        <main class="page-content" aria-label="Content">
-            <div class="w">
-                {{- block "main" . }}{{- end }}
-
-            </div>
-        </main>
-	<script src="https://cdn.jsdelivr.net/npm/han-css@3/dist/han.min.js"></script>
-    </body>
-</html>
diff --git a/layouts/partials/menu_item.html b/layouts/partials/menu_item.html
index d0bc1f6..2603551 100644
--- a/layouts/partials/menu_item.html
+++ b/layouts/partials/menu_item.html
@@ -8,6 +8,10 @@
             {{- end -}}
         </li>
 
+        {{- if $item.entries }}
+            {{ partial "menu_item.html" (dict "context" . "collection" $item.entries) }}
+        {{- end -}}
+
         {{- if $item.post_list -}}
             {{ partial "post_list.html" (dict 
                 "context" .
@@ -18,9 +22,5 @@
                 "show_more_url" $item.post_list.show_more_url
                 ) -}}
         {{- end -}}
-
-        {{- if $item.entries }}
-            {{ partial "menu_item.html" (dict "context" . "collection" $item.entries) }}
-        {{- end -}}
     {{- end -}}
-</ul>
\ No newline at end of file
+</ul>
diff --git a/layouts/partials/post_list.html b/layouts/partials/post_list.html
index 09f1222..22a35b6 100644
--- a/layouts/partials/post_list.html
+++ b/layouts/partials/post_list.html
@@ -3,7 +3,15 @@
 {{- if .section -}}
     {{- $posts = (where site.RegularPages "Section" .section) -}}
 {{- else -}}
-    {{- $posts = site.RegularPages }}
+    {{- if (eq .context.Kind "taxonomy") -}}
+        {{- $posts = .context.Pages -}}
+    {{- else -}}
+        {{- if (eq .context.Kind "term") -}}
+            {{- $posts = .context.Data.Pages -}}
+	{{- else -}}
+            {{- $posts = site.RegularPages }}
+	{{- end -}}
+    {{- end -}}
 {{- end -}}
 
 {{- $limit_exceeded:= "" -}}
@@ -28,4 +36,4 @@
             <li><a href="{{ .show_more_url }}">{{ .show_more_text | default "Show more..." }}</a></li>
         {{ end }}
     </ul>
-{{ end }}
\ No newline at end of file
+{{ end }}
diff --git a/layouts/shortcodes/hr.html b/layouts/shortcodes/hr.html
deleted file mode 100644
index 89f6c54..0000000
--- a/layouts/shortcodes/hr.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{{ if .IsNamedParams }}
-    {{ with .Get "text" }}
-    <hr data-content='{{ . }}' />
-    {{ else }}
-    <hr />
-    {{ end }}
-{{ else }}
-    {{ with .Get 0 }}
-    <hr data-content="{{ . }}" />
-    {{ else }}
-    <hr />
-    {{ end }}
-{{ end }}
\ No newline at end of file
