diff --git a/archetypes/default.md b/archetypes/default.md
index a845151..00e77bd 100644
--- a/archetypes/default.md
+++ b/archetypes/default.md
@@ -1,2 +1,6 @@
 ---
+title: "{{ replace .Name "-" " " | title }}"
+date: {{ .Date }}
+draft: true
 ---
+
diff --git a/archetypes/links.md b/archetypes/links.md
new file mode 100644
index 0000000..527ac12
--- /dev/null
+++ b/archetypes/links.md
@@ -0,0 +1,8 @@
+---
+title: Links collected in {{ .PublishDate "January 2006" }}
+author: {{ .Author }}
+date: {{ .Date }}
+description: (/◕ヮ◕)/ (^o^) (✿◠‿◠)
+---
+
+
diff --git a/archtypes/posts.md b/archetypes/posts.md
similarity index 89%
rename from archtypes/posts.md
rename to archetypes/posts.md
index de6eb13..a37f5d9 100644
--- a/archtypes/posts.md
+++ b/archetypes/posts.md
@@ -1,6 +1,6 @@
 ---
 title: "{{ replace .Name "-" " " | title }}"
-author: GoatFoo
+author: {{ .Author }}
 date: {{ .Date }}
 categories:
 tags:
diff --git a/archtypes/default.md b/archtypes/default.md
deleted file mode 100644
index 00e77bd..0000000
--- a/archtypes/default.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: "{{ replace .Name "-" " " | title }}"
-date: {{ .Date }}
-draft: true
----
-
diff --git a/archtypes/links.md b/archtypes/links.md
deleted file mode 100644
index 08a95f6..0000000
--- a/archtypes/links.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-title: Link collection
-author: GoatFOo
-date: {{ .Date }}
-categories:
-tags:
-description: (/◕ヮ◕)/ (^o^) (✿◠‿◠)
----
-
-