diff --git a/content/author/christine.md b/content/author/christine.md
deleted file mode 100644
index a7afe7d38..000000000
--- a/content/author/christine.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-id: christine
-name: Christine
-bio: Primis vitae mauris turpis ornare libero odio torquent vehicula proin consequat curabitur mattis
-facebook: https://www.facebook.com
-twitter: https://www.twitter.com
-linkedin: https://www.linkedin.com
-rank: 3
-projects: threefold
-countries: 
-cities: 
-image: ./images/author1.png
----
-
-# hi
-
-- ss
-- sss
-
-<br>
-
-test
-
-![](./images/author1.png)
-
-
diff --git a/content/author/images/author1.png b/content/author/images/author1.png
deleted file mode 100644
index b736841ed..000000000
Binary files a/content/author/images/author1.png and /dev/null differ
diff --git a/content/author/images/author2.png b/content/author/images/author2.png
deleted file mode 100644
index 45f736e13..000000000
Binary files a/content/author/images/author2.png and /dev/null differ
diff --git a/content/author/images/author3.png b/content/author/images/author3.png
deleted file mode 100644
index c6078bc16..000000000
Binary files a/content/author/images/author3.png and /dev/null differ
diff --git a/content/author/kristof.md b/content/author/kristof.md
deleted file mode 100644
index 024b412ef..000000000
--- a/content/author/kristof.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-id: kristof
-name: kds
-bio: Primis vitae mauris turpis ornare libero odio torquent vehicula proin consequat curabitur mattis
-facebook: https://www.facebook.com
-twitter: https://www.twitter.com
-linkedin: https://www.linkedin.com
-image: ./images/author1.png
----
-
-# hi
-
-1. ss
-2. sss
-
-
-test
-
-
-
diff --git a/content/blog/beliive.png b/content/blog/post1/beliive.png
similarity index 100%
rename from content/blog/beliive.png
rename to content/blog/post1/beliive.png
diff --git a/content/blog/blog1.md b/content/blog/post1/blog1.md
similarity index 99%
rename from content/blog/blog1.md
rename to content/blog/post1/blog1.md
index 03dea27f0..38fe10dc5 100644
--- a/content/blog/blog1.md
+++ b/content/blog/post1/blog1.md
@@ -11,7 +11,7 @@ excerpt: World First Time Token enables 200.000+ users for exchanging value.
 created: 2019-03-20
 image: ./beliive.png
 image_caption: beliive
-author: christine
+author: kristine_vilnite
 ---
 
 
diff --git a/content/blog/post2/beliive.png b/content/blog/post2/beliive.png
new file mode 100644
index 000000000..8a6ab1ff7
Binary files /dev/null and b/content/blog/post2/beliive.png differ
diff --git a/content/blog/blog2.md b/content/blog/post2/blog2.md
similarity index 99%
rename from content/blog/blog2.md
rename to content/blog/post2/blog2.md
index 1ddf901d2..0a3b443f7 100644
--- a/content/blog/blog2.md
+++ b/content/blog/post2/blog2.md
@@ -11,7 +11,7 @@ excerpt: World First Time Token 2 enables 200.000+ users for exchanging value.
 created: 2019-03-20
 image: ./beliive.png
 image_caption: beliive
-author: christine
+author: kristine_vilnite
 ---
 
 
diff --git a/content/person/kristine_vilnite/kristine_vilnite.md b/content/person/kristine_vilnite/kristine_vilnite.md
index 9f963c561..b36f4e541 100644
--- a/content/person/kristine_vilnite/kristine_vilnite.md
+++ b/content/person/kristine_vilnite/kristine_vilnite.md
@@ -1,3 +1,16 @@
+---
+id: kristine_vilnite
+name: Kristine Vilnite
+bio: Primis vitae mauris turpis ornare libero odio torquent vehicula proin consequat curabitur mattis
+linkedin: https://www.linkedin.com
+rank: 3
+projects: threefold
+countries: 
+cities: 
+image: ./kristine_vilnite.jpg
+---
+
+
 # Kristine Vilnite
 
 ### data
diff --git a/content/person/kristof_de_spiegeleer/kristof_de_spiegeleer.md b/content/person/kristof_de_spiegeleer/kristof_de_spiegeleer.md
index b4d24f142..9443d2508 100644
--- a/content/person/kristof_de_spiegeleer/kristof_de_spiegeleer.md
+++ b/content/person/kristof_de_spiegeleer/kristof_de_spiegeleer.md
@@ -1,3 +1,7 @@
+---
+id: kristof_de_spiegeleer
+name: kds
+---
 
 ## Kristof De Spiegeleer
 
diff --git a/content/project/artheon/artheon.md b/content/project/artheon/artheon.md
index b1ef8a591..343469f02 100644
--- a/content/project/artheon/artheon.md
+++ b/content/project/artheon/artheon.md
@@ -5,7 +5,7 @@ excerpt: A virtual museum online with 50.000+ pieces of art on top of TFGrid.
 created: 2019-03-20
 image: ./artheon.jpg
 image_caption: artheon
-author: christine
+author: kristine_vilnite
 ---
 
 # Artheon
diff --git a/content/project/beliive/beliive.md b/content/project/beliive/beliive.md
index f996df5d9..b947a62b1 100644
--- a/content/project/beliive/beliive.md
+++ b/content/project/beliive/beliive.md
@@ -5,7 +5,7 @@ excerpt: World First Time Token enables 200.000+ users for exchanging value.
 created: 2019-03-20
 image: ./beliive.png
 image_caption: beliive
-author: christine
+author: kristine_vilnite
 ---
 
 
diff --git a/content/project/cicolab/cicolab.md b/content/project/cicolab/cicolab.md
index 9c976af10..367c34c4e 100644
--- a/content/project/cicolab/cicolab.md
+++ b/content/project/cicolab/cicolab.md
@@ -8,7 +8,7 @@ excerpt: CICOLAB brings together visionaries from diverse fields to develop simp
 created: 2019-03-20
 image: ./cicolab.png
 image_caption: cicolab
-author: Christine
+author: kristine_vilnite
 ---
 
 # Collective Intelligence Collaboratory
diff --git a/content/project/covidfighters/covid_fighters.md b/content/project/covidfighters/covid_fighters.md
index 62b117b9c..50f9fc946 100644
--- a/content/project/covidfighters/covid_fighters.md
+++ b/content/project/covidfighters/covid_fighters.md
@@ -11,7 +11,7 @@ excerpt: People are social individuals and need contact with each other. On the
 created: 2019-03-20
 image: ./covid_fighters.png
 image_caption: covid_fighters
-author: christine
+author: kristine_vilnite
 ---
 
 
diff --git a/content/project/crystal_home/crystal_home.md b/content/project/crystal_home/crystal_home.md
index 36a5fd906..721655cc1 100644
--- a/content/project/crystal_home/crystal_home.md
+++ b/content/project/crystal_home/crystal_home.md
@@ -8,7 +8,7 @@ excerpt: Our planet needs a different approach to housing. The construction indu
 created: 2019-03-20
 image: ./crystal_home.jpg
 image_caption: crystal_home
-author: christine
+author: kristine_vilnite
 ---
 
 
diff --git a/content/project/crystal_language/crystal_language.md b/content/project/crystal_language/crystal_language.md
index 16ba5c09b..8ce57d21f 100644
--- a/content/project/crystal_language/crystal_language.md
+++ b/content/project/crystal_language/crystal_language.md
@@ -8,7 +8,7 @@ excerpt: A programming language adjusting to the needs of the programmer and the
 created: 2019-03-20
 image: ./crystal_language.png
 image_caption: crystal_language
-author: christine
+author: kristine_vilnite
 ---
 
 
diff --git a/content/project/crystal_twin/crystal_twin.md b/content/project/crystal_twin/crystal_twin.md
index bcef95927..cb0bf5ddc 100644
--- a/content/project/crystal_twin/crystal_twin.md
+++ b/content/project/crystal_twin/crystal_twin.md
@@ -8,7 +8,7 @@ excerpt: Your digital twin serving as a gateway to the new digital world of peer
 created: 2019-03-20
 image: ./crystal_twin.png
 image_caption: crystal_twin
-author: christine
+author: kristine_vilnite
 ---
 
 
diff --git a/content/project/digibyte/digibyte.md b/content/project/digibyte/digibyte.md
index c2311ee23..351400d24 100644
--- a/content/project/digibyte/digibyte.md
+++ b/content/project/digibyte/digibyte.md
@@ -8,7 +8,7 @@ excerpt: DigiByte is a rapidly growing open-source blockchain created in late 20
 created: 2019-03-20
 image: ./digibyte.png
 image_caption: digibyte
-author: christine
+author: kristine_vilnite
 ---
 
 
diff --git a/content/project/earthproject/earthproject.md b/content/project/earthproject/earthproject.md
index eb0d25ba5..de807f335 100644
--- a/content/project/earthproject/earthproject.md
+++ b/content/project/earthproject/earthproject.md
@@ -8,7 +8,7 @@ excerpt:
 created: 2019-03-20
 image: ./earthproject.png
 image_caption: earthproject
-author: christine
+author: kristine_vilnite
 ---
 
 
diff --git a/content/project/generation_blue/generation_blue.md b/content/project/generation_blue/generation_blue.md
index 57b606bc7..cafc40d67 100644
--- a/content/project/generation_blue/generation_blue.md
+++ b/content/project/generation_blue/generation_blue.md
@@ -8,7 +8,7 @@ excerpt:
 created: 2019-03-20
 image: ./generation_blue.png
 image_caption: generation_blue
-author: christine
+author: kristine_vilnite
 ---
 
 
diff --git a/content/project/green_edge/green_edge.md b/content/project/green_edge/green_edge.md
index ef80047db..1dfe7aa9f 100644
--- a/content/project/green_edge/green_edge.md
+++ b/content/project/green_edge/green_edge.md
@@ -8,7 +8,7 @@ excerpt:
 created: 2019-03-20
 image: ./green_edge.png
 image_caption: green_edge
-author: christine
+author: kristine_vilnite
 ---
 
 
diff --git a/content/project/money_of_good/money_of_good.md b/content/project/money_of_good/money_of_good.md
index 94b867c1b..364d4ed91 100644
--- a/content/project/money_of_good/money_of_good.md
+++ b/content/project/money_of_good/money_of_good.md
@@ -8,7 +8,7 @@ excerpt:
 created: 2019-03-20
 image: ./money_of_good.png
 image_caption: money_of_good
-author: christine
+author: kristine_vilnite
 ---
 
 
diff --git a/content/project/seeds/seeds.md b/content/project/seeds/seeds.md
index 3eff11a1f..42e8a0947 100644
--- a/content/project/seeds/seeds.md
+++ b/content/project/seeds/seeds.md
@@ -11,7 +11,7 @@ excerpt:
 created: 2019-03-20
 image: ./seeds.png
 image_caption: seeds
-author: christine, kristof
+author: kristine_vilnite, kristof_de_spiegeleer
 ---
 
 
diff --git a/content/project/shareitt/shareitt.md b/content/project/shareitt/shareitt.md
index 6b0027255..130ad7ade 100644
--- a/content/project/shareitt/shareitt.md
+++ b/content/project/shareitt/shareitt.md
@@ -8,7 +8,7 @@ excerpt:
 created: 2019-03-20
 image: ./shareitt.png
 image_caption: shareitt
-author: christine
+author: kristine_vilnite
 ---
 
 
diff --git a/content/project/the_humanized_internet/the_humanized_internet.md b/content/project/the_humanized_internet/the_humanized_internet.md
index 5712ca10a..38263b5ba 100644
--- a/content/project/the_humanized_internet/the_humanized_internet.md
+++ b/content/project/the_humanized_internet/the_humanized_internet.md
@@ -8,7 +8,7 @@ excerpt:
 created: 2019-03-20
 image: ./the_humanized_internet.png
 image_caption: the_humanized_internet
-author: christine
+author: kristine_vilnite
 ---
 
 
diff --git a/content/project/threefold_foundation/threefold_foundation.md b/content/project/threefold_foundation/threefold_foundation.md
index 87936c08f..000870df6 100644
--- a/content/project/threefold_foundation/threefold_foundation.md
+++ b/content/project/threefold_foundation/threefold_foundation.md
@@ -8,7 +8,7 @@ excerpt:
 created: 2019-03-20
 image: ./threefold_foundation.png
 image_caption: threefold_foundation
-author: christine
+author: kristine_vilnite
 ---
 
 # ThreeFold Foundation (The TF Grid)
diff --git a/content/project/unit/unit.md b/content/project/unit/unit.md
index 1dc800d23..1369f83f2 100644
--- a/content/project/unit/unit.md
+++ b/content/project/unit/unit.md
@@ -8,7 +8,7 @@ excerpt:
 created: 2019-03-20
 image: ./unit.png
 image_caption: unit
-author: christine
+author: kristine_vilnite
 ---
 
 
diff --git a/content/project/vlinder/vlinder.md b/content/project/vlinder/vlinder.md
index 4963d4d0e..54a8c41e4 100644
--- a/content/project/vlinder/vlinder.md
+++ b/content/project/vlinder/vlinder.md
@@ -10,7 +10,7 @@ excerpt: ... need excerpt which is smaller ...
 created: 2019-03-20
 image: ./vlinder.png
 image_caption: vlinder
-author: christine
+author: kristine_vilnite
 ---
 
 # Vlinder
diff --git a/content/project/zetako/zetako.md b/content/project/zetako/zetako.md
index 2cb62e831..eeb3b6b70 100644
--- a/content/project/zetako/zetako.md
+++ b/content/project/zetako/zetako.md
@@ -8,7 +8,7 @@ excerpt:
 created: 2019-03-20
 image: ./zetako.png
 image_caption: zetako
-author: christine
+author: kristine_vilnite
 ---
 
 
diff --git a/gridsome.config.js b/gridsome.config.js
index 834a987d5..71a6c0fdc 100644
--- a/gridsome.config.js
+++ b/gridsome.config.js
@@ -33,8 +33,8 @@ module.exports = {
     {
       use: '@gridsome/source-filesystem',
       options: {
-        typeName: 'Author',
-        path: './content/author/*.md',
+        typeName: 'Person',
+        path: './content/person/**/*.md',
         refs: {
           tags: {
             typeName: 'Tag',
@@ -52,7 +52,7 @@ module.exports = {
           BlogPost: '/blog/:id'
         },
         refs: {
-          author: 'Author',
+          author: 'Person',
           tags: {
             typeName: 'Tag',
             create: true
@@ -77,9 +77,9 @@ module.exports = {
     Blog: [{
       path: '/blog/:id'
     }],
-    Author: [{
+    Person: [{
       path: '/author/:id',
-      component: '~/templates/Author.vue'
+      component: '~/templates/Person.vue'
     }],
     Tag: [{
       path: '/tags/:id',
diff --git a/src/templates/Category.vue b/src/templates/Category.vue
deleted file mode 100644
index ee5c02538..000000000
--- a/src/templates/Category.vue
+++ /dev/null
@@ -1,119 +0,0 @@
-<template>
-  <Layout :hideHeader="true" :disableScroll="true">
-    <div class="container sm:pxi-0 mx-auto overflow-x-hidden pt-24">
-      <div class="mx-4 sm:mx-0">
-        <h1 class="pb-0 mb-0 text-5xl font-medium">{{ $page.category.title }}</h1>
-        <p class="text-gray-700 text-xl">
-          A collection of
-          <span
-            class="self-center"
-          >{{ $page.category.belongsTo.totalCount }} {{ postLabel }}</span>
-        </p>
-
-        <div class="pt-8 border-b"></div>
-      </div>
-
-      <div class="flex flex-wrap pt-8 pb-8 mx-4 sm:-mx-4">
-        <PostListItem
-          v-for="edge in $page.category.belongsTo.edges"
-          :key="edge.node.id"
-          :record="edge.node"
-        />
-      </div>
-
-      <div class="pagination flex justify-center mb-8">
-        <Pagination
-          :baseUrl="$page.category.path"
-          :currentPage="$page.category.belongsTo.pageInfo.currentPage"
-          :totalPages="$page.category.belongsTo.pageInfo.totalPages"
-          :maxVisibleButtons="5"
-          v-if="$page.category.belongsTo.pageInfo.totalPages > 1"
-        />
-      </div>
-    </div>
-  </Layout>
-</template>
-
-<page-query>
-  query($id: ID!, $page:Int) {
-    category(id: $id) {
-      title
-      path
-      belongsTo(perPage: 12, page: $page) @paginate {
-        totalCount
-        pageInfo {
-          totalPages
-          currentPage
-        }
-        edges {
-          node {
-            ... on Blog {
-              title
-              name
-              status
-              excerpt
-              image(width:800)
-              path
-              timeToRead
-              startDate : startdate(format:"MM YYYY")
-              humanTime : created(format:"MM YYYY")
-              datetime : created
-              category {
-                id
-                title
-              }
-              author {
-                id
-                name
-                image(width:64, height:64, fit:inside)
-                path
-              }
-            }
-          }
-
-          node {
-            ... on Author {
-              name
-              path
-              bio
-              bio
-              image(width:150, height:150)
-              facebook
-              twitter
-              linkedin
-              content
-              category {
-                id
-                title
-              }
-             
-            }
-          }
-        }
-      }
-    }  
-  }
-</page-query>
-
-<script>
-import PostListItem from "~/components/PostListItem.vue";
-import Pagination from "~/components/Pagination.vue";
-
-export default {
-  components: {
-    Pagination,
-    PostListItem
-  },
-  computed: {
-    postLabel: function() {
-      var pluralize = require("pluralize");
-      return pluralize("post", this.$page.category.belongsTo.totalCount);
-    }
-  },
-  metaInfo() {
-    return {
-      title: this.$page.category.title
-    };
-  }
-};
-</script>
diff --git a/src/templates/Person.vue b/src/templates/Person.vue
new file mode 100644
index 000000000..26bc5d828
--- /dev/null
+++ b/src/templates/Person.vue
@@ -0,0 +1,137 @@
+<template>
+  <Layout :hideHeader="true" :disableScroll="true">
+    <div class="container sm:pxi-0 mx-auto overflow-x-hidden pt-24">
+      <div class="flex flex-row flex-wrap items-center mx-4 sm:mx-0">
+        <div class="w-full md:w-1/6 mx-auto sm:mx-0">
+          <g-image
+            :src="$page.person.image"
+            class="rounded-full bg-gray-200 w-32 h-32 border-4 border-gray-400 mx-auto md:mx-0"
+          ></g-image>
+        </div>
+        <div class="w-full md:w-5/6 text-center md:text-left md:pl-8 lg:pl-0">
+          <h1 class="pb-0 mb-0 mt-0 text-4xl font-medium">{{ $page.person.name }}</h1>
+          
+          <p class="text-gray-700 text-xl" v-if="$page.person.bio">{{ $page.person.bio }}</p>
+          <div class="author-social">
+            {{ $page.person.belongsTo.totalCount }} Projects
+            &nbsp;&middot;&nbsp;
+            <!-- <a
+              :href="$page.person.facebook"
+              target="_blank"
+              rel="noopener noreferrer"
+              class="text-gray-400 hover:text-black"
+            >
+              <font-awesome :icon="['fab', 'facebook']" />
+            </a>
+            &nbsp;
+            <a
+              :href="$page.person.twitter"
+              target="_blank"
+              rel="noopener noreferrer"
+              class="text-gray-400 hover:text-black"
+            >
+              <font-awesome :icon="['fab', 'twitter']" />
+            </a>
+            &nbsp; -->
+            <a
+              :href="$page.person.linkedin"
+              target="_blank"
+              rel="noopener noreferrer"
+              class="text-gray-400 hover:text-black"
+            >
+              <font-awesome :icon="['fab', 'linkedin']" />
+            </a>
+          </div>
+        </div>
+      </div>
+
+      <div class="pt-8 border-b mx-4 sm:-mx-4"></div>
+
+        <section class="post-content container mx-auto relative font-serif text-gray-700">
+          <div class="post-content-text text-xl" v-html="$page.person.content"></div>
+        </section>
+
+      <div class="pt-8 border-b mx-4 sm:-mx-4"></div>
+
+      <div class="flex flex-wrap pt-8 pb-8 mx-4 sm:-mx-4">
+        <PostListItem
+          v-for="edge in $page.person.belongsTo.edges"
+          :key="edge.node.id"
+          :record="edge.node"
+        />
+      </div>
+
+      <div class="pagination flex justify-center mb-8">
+        <Pagination
+          :baseUrl="$page.person.path"
+          :currentPage="$page.person.belongsTo.pageInfo.currentPage"
+          :totalPages="$page.person.belongsTo.pageInfo.totalPages"
+          :maxVisibleButtons="5"
+          v-if="$page.person.belongsTo.pageInfo.totalPages > 1"
+        />
+      </div>
+    </div>
+  </Layout>
+</template>
+
+<page-query>
+  query($id: ID!, $page:Int) {
+    person(id: $id) {
+      name
+      path
+      bio
+      image(width:150, height:150)
+      linkedin
+      content
+      belongsTo(perPage: 5, page: $page) @paginate {
+        totalCount
+        pageInfo {
+          totalPages
+          currentPage
+        }
+        edges {
+          node {
+            ... on Blog {
+              title
+              excerpt
+              image(width:800)
+              path
+              timeToRead
+              humanTime : created(format:"DD MMM YYYY")
+              datetime : created
+              author {
+                id
+                name
+                image(width:64, height:64, fit:inside)
+                path
+              }
+            }
+          }
+        }
+      }
+    }  
+  }
+</page-query>
+
+<script>
+import PostListItem from "~/components/PostListItem.vue";
+import Pagination from "~/components/Pagination.vue";
+
+export default {
+  components: {
+    Pagination,
+    PostListItem
+  },
+  computed: {
+    postLabel: function() {
+      var pluralize = require("pluralize");
+      return pluralize("post", this.$page.person.belongsTo.totalCount);
+    }
+  },
+  metaInfo() {
+    return {
+      title: this.$page.person.name
+    };
+  }
+};
+</script>