diff --git a/layouts/friends.html b/layouts/_default/friends.html
similarity index 92%
rename from layouts/friends.html
rename to layouts/_default/friends.html
index fa0133a1..cd89ef79 100644
--- a/layouts/friends.html
+++ b/layouts/_default/friends.html
@@ -17,7 +17,7 @@
     <script src="//at.alicdn.com/t/font_578712_g26jo2kbzd5qm2t9.js" async defer></script>
     <div class="friend-links">
       {{ range $index, $friend := .Site.Data.friends }}
-        <a class="friend-link" title="{{ $friend.description }}" href="{{ $friend.url | safeURL }}" rel="external noopener" target="_blank">
+        <a class="friend-link" title="{{ $friend.description | safeHTML }}" href="{{ $friend.url | safeURL }}" rel="external noopener" target="_blank">
           {{ if $friend.avatar }}
             {{- dict "Src" $friend.avatar "Alt" $friend.nickname "Title" $friend.description "Class" "friend-avatar" | partial "plugin/image.html" -}}
           {{ else }}
diff --git a/layouts/search.html b/layouts/_default/search.html
similarity index 100%
rename from layouts/search.html
rename to layouts/_default/search.html
diff --git a/layouts/section/list.html b/layouts/_default/section.html
similarity index 100%
rename from layouts/section/list.html
rename to layouts/_default/section.html
diff --git a/layouts/_default/list.rss.xml b/layouts/_default/section.rss.xml
similarity index 100%
rename from layouts/_default/list.rss.xml
rename to layouts/_default/section.rss.xml
diff --git a/layouts/_default/list.html b/layouts/_default/term.html
similarity index 100%
rename from layouts/_default/list.html
rename to layouts/_default/term.html
diff --git a/layouts/taxonomy/terms.html b/layouts/_default/terms.html
similarity index 100%
rename from layouts/taxonomy/terms.html
rename to layouts/_default/terms.html