diff --git a/Makefile b/Makefile
index bf2a83b..92e4115 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,10 @@ build: generate
 	go build -tags "embed"
 
 generate:
-	yaber --prefix="tmpl_asset_" --pkg "ss13" templates/
-	mv tmpl_asset_* src/
+	yaber --pkg "assettemplates" templates/
+	mv asset_* src/assettemplates/
+	yaber --pkg "assetstatic" static/
+	mv asset_* src/assetstatic/
 
 test_run: generate
 	go run ss13.go -verbose run
diff --git a/src/web.go b/src/web.go
index e48c29c..c6814ca 100644
--- a/src/web.go
+++ b/src/web.go
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
+	"github.com/lmas/ss13_se/src/assettemplates"
 )
 
 func (i *Instance) Init() {
@@ -44,7 +45,7 @@ func (i *Instance) Serve(addr string) error {
 
 	// Load templates
 	tmpl := template.New("AllTemplates").Funcs(funcmap)
-	tmplfiles, err := AssetDir("templates/")
+	tmplfiles, err := assettemplates.AssetDir("templates/")
 	if err != nil {
 		panic(err)
 	}