diff --git a/archetypes/post.md b/archetypes/post.md
index c94001b..50a7d86 100644
--- a/archetypes/post.md
+++ b/archetypes/post.md
@@ -1,6 +1,6 @@
 +++
-title = ""
-date = ""
+title = "{{ replace .Name "-" " " | title }}"
+date = {{ .Date }}
 author = ""
 cover = ""
 tags = ["", ""]
diff --git a/layouts/partials/logo.html b/layouts/partials/logo.html
index a22bc10..d2b305f 100644
--- a/layouts/partials/logo.html
+++ b/layouts/partials/logo.html
@@ -1,6 +1,6 @@
 <a href="{{ if $.Site.Params.Logo.LogoHomeLink }}{{ $.Site.Params.Logo.LogoHomeLink }}{{else}}{{ $.Site.BaseURL }}{{ end }}">
   <div class="logo">
-  	{{$.Site.Params.Logo.logoTextPre}}
+  	{{$.Site.Params.Logo.logoTextPre | safeHTML}}
     {{ with $.Site.Params.Logo.logoText }}{{ . }}{{ else }}Terminal{{ end }}
     {{$.Site.Params.Logo.logoTextPost | safeHTML}}