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