diff --git a/archetypes/default.md b/archetypes/default.md
index 84818ca..1dd40b5 100644
--- a/archetypes/default.md
+++ b/archetypes/default.md
@@ -1,7 +1,7 @@
 ---
-title: "{{ replace .Name "-" " " | title }}"
+title: "{{ replace (replace .Name "draft-" "") "-" " " | title }}"
 author: "Anna"
-date: {{ .Date | .dateFormat (.Site.Params.dateformat)" }}
+date: {{ .dateFormat (.Site.Params.dateformat) .Date }}
 draft: true
 tags:
   - tag1