diff --git a/archetypes/default.md b/archetypes/default.md
index ac36e06..26f317f 100644
--- a/archetypes/default.md
+++ b/archetypes/default.md
@@ -1,2 +1,5 @@
-+++
-+++
+---
+title: "{{ replace .Name "-" " " | title }}"
+date: {{ .Date }}
+draft: true
+---
diff --git a/archetypes/portfolio.md b/archetypes/portfolio.md
index 68e6238..6923d6c 100644
--- a/archetypes/portfolio.md
+++ b/archetypes/portfolio.md
@@ -1,11 +1,15 @@
 ---
-title: "Name of the work 1"
+title: "{{ replace .Name "-" " " | title }}"
+date: {{ .Date }}
 draft: true
 image: ""
 showonlyimage: false
 categories: ["design"]
-keywords: ["key", "words"]
-topics: ["topic 1"]
 tags: ["one", "two"]
 weight: 1
 ---
+
+<!--more-->
+
+
+
diff --git a/layouts/contact/list.html b/layouts/contact/list.html
index 72539f2..184e915 100644
--- a/layouts/contact/list.html
+++ b/layouts/contact/list.html
@@ -15,28 +15,22 @@ <h1 class="entry-title">{{ .Title }}</h1>
               {{ .Content }}
 
               <div id="simple-contact-form" class="scf">
-                {{ with .Site.Params.email }}
-                <form method="post" action="https://formspree.io/{{ . }}">
+                {{ with .Site.Params.formspreeId }}
+                <form method="post" action="https://formspree.io/{{.}}" target="_blank">
                   <fieldset class="scf-name">
                     <label for="scf_name">Name (Required)</label>
-                    <input name="scf_name" id="scf_name" type="text" size="33" maxlength="99" value="" placeholder="Your Name">
+                    <input name="name" id="scf_name" type="text" size="33" maxlength="99" value="" placeholder="Your Name">
                   </fieldset>
                   <fieldset class="scf-email">
                     <label for="scf_email">Email (Required)</label>
-                    <input name="scf_email" id="scf_email" type="text" size="33" maxlength="99" value="" placeholder="Your Email">
-                  </fieldset>
-                  <fieldset class="scf-response">
-                    <label for="scf_response">1 + 1 =</label>
-                    <input name="scf_response" id="scf_response" type="text" size="33" maxlength="99" value="" placeholder="Correct Response">
+                    <input name="_replyto" id="scf_email" type="email" size="33" maxlength="99" value="" placeholder="Your Email">
                   </fieldset>
                   <fieldset class="scf-message">
                     <label for="scf_message">Message (Required)</label>
-                    <textarea name="scf_message" id="scf_message" cols="33" rows="7" placeholder="Your Message"></textarea>
+                    <textarea name="message" id="scf_message" cols="33" rows="7" placeholder="Your Message"></textarea>
                   </fieldset>
                   <div class="scf-submit">
                     <input type="submit" id="scf-button" value="Send email">
-                    <input type="hidden" id="scf-key" name="scf-key" value="process">
-                    <input type="hidden" id="scf-nonce" name="scf-nonce" value="52582b0798">
                   </div>
                 </form>
                 <style>#simple-contact-form fieldset { width: 100%; overflow: hidden; margin: 12px 0; border: 0; padding: 1px; } #simple-contact-form fieldset input { float: left; width: 60%; } #simple-contact-form textarea { float: left; clear: both; width: 95%; } #simple-contact-form label { float: none; clear: both; display: block; margin-bottom: 12px;}</style>