diff --git a/snippetbox/cmd/web/templates.go b/snippetbox/cmd/web/templates.go
index c366660..516124e 100644
--- a/snippetbox/cmd/web/templates.go
+++ b/snippetbox/cmd/web/templates.go
@@ -2,10 +2,12 @@ package main
 
 import (
 	"html/template"
+	"io/fs"
 	"path/filepath"
 	"time"
 
 	"snippetbox.chaosfem.tw/internal/models"
+	"snippetbox.chaosfem.tw/ui"
 )
 
 type templateData struct {
@@ -31,7 +33,7 @@ var functions = template.FuncMap{
 func newTemplateCache() (map[string]*template.Template, error) {
 	cache := map[string]*template.Template{}
 
-	pages, err := filepath.Glob("./ui/html/pages/*.tmpl")
+	pages, err := fs.Glob(ui.Files, "html/pages/*.tmpl")
 	if err != nil {
 		return nil, err
 	}
@@ -39,17 +41,13 @@ func newTemplateCache() (map[string]*template.Template, error) {
 	for _, page := range pages {
 		name := filepath.Base(page)
 
-		ts, err := template.New(name).Funcs(functions).ParseFiles("./ui/html/base.tmpl")
-		if err != nil {
-			return nil, err
+		patterns := []string{
+			"html/base.tmpl",
+			"html/partials/*.tmpl",
+			page,
 		}
 
-		ts, err = ts.ParseGlob("./ui/html/partials/*.tmpl")
-		if err != nil {
-			return nil, err
-		}
-
-		ts, err = ts.ParseFiles(page)
+		ts, err := template.New(name).Funcs(functions).ParseFS(ui.Files, patterns...)
 		if err != nil {
 			return nil, err
 		}
diff --git a/snippetbox/ui/efs.go b/snippetbox/ui/efs.go
index b4213ae..9acafcd 100644
--- a/snippetbox/ui/efs.go
+++ b/snippetbox/ui/efs.go
@@ -4,5 +4,5 @@ import (
 	"embed"
 )
 
-//go:embed "static"
+//go:embed "html" "static"
 var Files embed.FS