diff --git a/archetypes/default.md b/archetypes/default.md
index fb596f9..3aca40f 100644
--- a/archetypes/default.md
+++ b/archetypes/default.md
@@ -1,3 +1,4 @@
 +++
-id = ""
+title = ""
+weight = 
 +++
diff --git a/exampleSite/content/about.md b/exampleSite/content/about.md
index de3d163..0643b51 100644
--- a/exampleSite/content/about.md
+++ b/exampleSite/content/about.md
@@ -1,6 +1,7 @@
 +++
 title = "About"
-id = "about"
+weight = 30
+draft = false
 +++
 
 {{< figure class="image main" src="/img/pic03.jpg" >}}
diff --git a/exampleSite/content/contact.md b/exampleSite/content/contact.md
index 8a0bbe8..b7bbdec 100644
--- a/exampleSite/content/contact.md
+++ b/exampleSite/content/contact.md
@@ -1,6 +1,7 @@
 +++
 title = "Contact"
-id = "contact"
+weight = 40
+draft = false
 +++
 
 <form method="post" action="#">
@@ -22,4 +23,4 @@ id = "contact"
 	</ul>
 </form>
 
-{{< socialLinks >}}
\ No newline at end of file
+{{< socialLinks >}}
diff --git a/exampleSite/content/elements.md b/exampleSite/content/elements.md
index c72648d..0690138 100644
--- a/exampleSite/content/elements.md
+++ b/exampleSite/content/elements.md
@@ -1,6 +1,7 @@
 +++
 title = "Elements"
-id = "elements"
+weight = 50
+draft = true
 +++
 
 <h3 class="major">Hugo shortcodes in theme</h3>
diff --git a/exampleSite/content/formspree.md b/exampleSite/content/formspree.md
index 2c4076f..1bedd88 100644
--- a/exampleSite/content/formspree.md
+++ b/exampleSite/content/formspree.md
@@ -1,6 +1,7 @@
 +++
 title = "Formspree"
-id = "formspree"
+weight = 60
+draft = true
 +++
 
 <form id="contactform" method="post" action="https://formspree.io/insert.your@mail.adress">
diff --git a/exampleSite/content/intro.md b/exampleSite/content/intro.md
index 8e4bac8..b0fc135 100644
--- a/exampleSite/content/intro.md
+++ b/exampleSite/content/intro.md
@@ -1,6 +1,7 @@
 +++
 title = "Intro"
-id = "intro"
+weight = 10
+draft = false
 +++
 
 {{< figure class="image main" src="/img/pic01.jpg" >}}
diff --git a/exampleSite/content/work.md b/exampleSite/content/work.md
index cd66a88..37f205d 100644
--- a/exampleSite/content/work.md
+++ b/exampleSite/content/work.md
@@ -1,6 +1,7 @@
 +++
 title = "Work"
-id = "work"
+weight = 20
+draft = false
 +++
 
 {{< figure class="image main" src="/img/pic02.jpg" >}}
diff --git a/layouts/index.html b/layouts/index.html
index 05ea6d9..8308d2c 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -16,8 +16,8 @@
 						</div>
 						<nav>
 							<ul>
-								{{ range sort .Site.Menus.main }}
-								<li><a href="{{ .URL }}">{{ .Name }}</a></li>
+								{{ range .Data.Pages }}
+								<li><a href="#{{ .File.BaseFileName }}">{{ .Title }}</a></li>
 								{{ end }}
 							</ul>
 						</nav>
diff --git a/layouts/sitemap.xml b/layouts/sitemap.xml
index de6d2e3..b8ed7e8 100644
--- a/layouts/sitemap.xml
+++ b/layouts/sitemap.xml
@@ -1,8 +1,8 @@
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
 {{ $baseURL := .Site.BaseURL }}
-  {{ range sort .Site.Menus.main }}
+  {{ range sort .Data.Pages }}
   <url>
-    <loc>{{ $baseURL }}{{ .URL }}</loc>
+    <loc>{{ $baseURL }}#{{ .File.BaseFileName }}</loc>
   </url>
   {{ end }}
 </urlset>