diff --git a/embed/base.html b/embed/base.html
new file mode 100644
index 0000000..697c8b1
--- /dev/null
+++ b/embed/base.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>{{title}}</title>
+</head>
+
+<body>
+    {{content}}
+</body>
+
+</html>
\ No newline at end of file
diff --git a/renderer_test.go b/renderer_test.go
index 8535106..3d0715a 100644
--- a/renderer_test.go
+++ b/renderer_test.go
@@ -20,7 +20,7 @@ func TestRendererUsesBaseTemplate(t *testing.T) {
 	user := getTestUser()
 	post, _ := user.CreateNewPost("testpost")
 	result, _ := kiss.RenderPost(post)
-	if !strings.Contains(result, "<html>") {
+	if !strings.Contains(result, "<html") {
 		t.Error("Base template not used. Got: " + result)
 	}
 }
diff --git a/repository.go b/repository.go
index d7c2cbb..f339b88 100644
--- a/repository.go
+++ b/repository.go
@@ -1,11 +1,15 @@
 package kiss
 
 import (
+	_ "embed"
 	"fmt"
 	"os"
 	"path"
 )
 
+//go:embed embed/base.html
+var base_template string
+
 type Repository struct {
 	name string
 }
@@ -60,8 +64,6 @@ func (repo Repository) CreateUser(name string) (User, error) {
 	// create public folder
 	os.Mkdir(path.Join(user_dir, "public"), 0755)
 
-	base_template := "<html><body><{{content}}/body></html>"
-
 	// create Meta files
 	os.WriteFile(path.Join(user_dir, "meta", "VERSION"), []byte("0.0.1"), 0644)
 	os.WriteFile(path.Join(user_dir, "meta", "base.html"), []byte(base_template), 0644)
diff --git a/repository_test.go b/repository_test.go
index dfe6a92..d784078 100644
--- a/repository_test.go
+++ b/repository_test.go
@@ -31,7 +31,7 @@ func TestCanCreateRepository(t *testing.T) {
 	repoName := testRepoName()
 	_, err := kiss.CreateRepository(repoName)
 	if err != nil {
-		t.Error("Error creating repository: ", err)
+		t.Error("Error creating repository: ", err.Error())
 	}
 
 }
@@ -116,7 +116,7 @@ func TestCanOpenRepository(t *testing.T) {
 	// Open the repository
 	repo2, err := kiss.OpenRepository(repoName)
 	if err != nil {
-		t.Error("Error opening repository: ", err)
+		t.Error("Error opening repository: ", err.Error())
 	}
 	if repo2.Dir() != repo.Dir() {
 		t.Error("Repository directories do not match")
