From 22cf11f229a2d2ef23f1eb211cc991399c21a13f Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Fri, 2 Sep 2022 10:36:56 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E9=9B=86=E5=B8=82=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E5=B7=B2=E5=AE=89=E8=A3=85=E7=9A=84=E5=8C=85=E5=8D=95=E7=8B=AC?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=20https://github.com/siyuan-note/siyuan/issu?=
 =?UTF-8?q?es/5678?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kernel/bazaar/icon.go    | 2 +-
 kernel/bazaar/package.go | 2 +-
 kernel/server/serve.go   | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/kernel/bazaar/icon.go b/kernel/bazaar/icon.go
index ff2bb2501..ae177074f 100644
--- a/kernel/bazaar/icon.go
+++ b/kernel/bazaar/icon.go
@@ -151,7 +151,7 @@ func InstalledIcons() (ret []*Icon) {
 }
 
 func isBuiltInIcon(dirName string) bool {
-	return "and" == dirName || "material" == dirName
+	return "ant" == dirName || "material" == dirName
 }
 
 func InstallIcon(repoURL, repoHash, installPath string, systemID string) error {
diff --git a/kernel/bazaar/package.go b/kernel/bazaar/package.go
index 0de1247d3..e5af3bdcc 100644
--- a/kernel/bazaar/package.go
+++ b/kernel/bazaar/package.go
@@ -85,7 +85,7 @@ func WidgetJSON(widgetDirName string) (ret map[string]interface{}, err error) {
 }
 
 func IconJSON(iconDirName string) (ret map[string]interface{}, err error) {
-	p := filepath.Join(util.ThemesPath, iconDirName, "icon.json")
+	p := filepath.Join(util.ThemesPath, "icons", iconDirName, "icon.json")
 	if !gulu.File.IsExist(p) {
 		err = os.ErrNotExist
 		return
diff --git a/kernel/server/serve.go b/kernel/server/serve.go
index b56b22983..1701e2088 100644
--- a/kernel/server/serve.go
+++ b/kernel/server/serve.go
@@ -67,6 +67,7 @@ func Serve(fastMode bool) {
 	serveExport(ginServer)
 	serveWidgets(ginServer)
 	serveEmojis(ginServer)
+	serveTemplates(ginServer)
 	api.ServeAPI(ginServer)
 
 	var addr string