diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index afb1736..3861c8d 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -2,18 +2,31 @@
 
 <main>
     <h2>{{ .Title }}</h2>
-
     {{ range (.Paginator 10).Pages }}
-        {{ if eq "Posts" $.Title }}
-           {{partial "list-item-post.html" .}}
-        {{else}}
-            {{ partial "list-item-project.html" . }}
-        {{end}}
-    {{end}}
-    
+        <div class="list-item">
+	    <div class="list-logo">
+	        <a href="{{ .Permalink }}">
+	            <img src="{{ .Params.logo }}">
+	        </a>
+	    </div>
+	    <div class="list-content">
+	        <a href="{{ .Permalink }}">
+	            <h4>{{ .Title }}</h4>
+	        </a>
+	        <h5>{{ .Description }}</h5>
+	        {{ range.Params.categories }}
+	            <a href="{{"/categories/"|relLangURL }}{{.|urlize}}">
+	            <kbd class="item-cat"> {{ . }} </kbd>
+	        </a>
+	        {{ end }}
+	        {{ range .Params.tags }}
+	        <a href="{{"/tags/"|relLangURL }}{{.|urlize}}">
+	            <kbd class="item-tag"> {{ . }} </kbd>
+	        </a>
+	        {{ end }}
+	    </div>
+	</div>
+    {{ end }}
 </main>
 
-{{ partial "paginator" . }}
 
-
-{{ partial "footer" . }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index f35e4e5..6002f62 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,11 +1,13 @@
 {{ partial "header" . }}
 
 <main>
-    {{ if eq "Posts" $.Title }}
-       {{partial "post.html" .}}
-    {{else}}
-        {{ partial "project" . }}
-    {{end}}
+	<div class="item-header">
+		<h2>{{ .Title }}</h2>
+	</div>
+
+	<div class="item">
+	    <div class="text-justify">{{ .Content }}</div>
+	</div>
 </main>
 
-{{ partial "footer.html" . }}
+{{ partial "footer" . }}
\ No newline at end of file
diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html
deleted file mode 100644
index f579a16..0000000
--- a/layouts/_default/terms.html
+++ /dev/null
@@ -1,23 +0,0 @@
-{{ partial "header" . }}
-
-<main>
-    
-    <div>
-      <h2>{{ .Title }}</h2>
-    
-      <ul class="terms">
-          {{ range $key, $value := .Data.Terms }}
-          <li>
-            <a href='{{ (print "/" $.Data.Plural "/" $key) | relURL }}'>
-              {{ $key }}
-            </a>
-            ({{ len $value }})
-          </li>
-          {{ end }}
-        </ul>
-    </div>
-
-</main>
-  
-
-{{ partial "footer" . }}
diff --git a/layouts/partials/header-post.html b/layouts/partials/header-post.html
deleted file mode 100644
index 43bd02a..0000000
--- a/layouts/partials/header-post.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<div class="item-header">
-    {{ .Date.Format (.Site.Params.dateFormat | default "") | $.Scratch.Set "pub_date" }}
-    {{ with .Description }} {{ $.Scratch.Set "subtitle" . }} {{ end }}
-    {{ with .ReadingTime }} {{ $.Scratch.Set "read_time" . }} {{ end }}
-
-
-    <h4>{{ .Title }}</h4>
-    <h5>{{ $.Scratch.Get "pub_date" }} - {{ $.Scratch.Get "read_time" }} minutes</h5>
-    <h5>{{ $.Scratch.Get "subtitle" }}</h5>
-
-    {{ range.Params.categories }}
-
-        <a href="{{"/categories/"|relLangURL }}{{.|urlize}}">
-        <kbd class="item-cat"> {{ . }} </kbd>
-    </a>
-    {{ end }}
-    {{ range .Params.tags }}
-    <a href="{{"/tags/"|relLangURL }}{{.|urlize}}">
-        <kbd class="item-tag"> {{ . }} </kbd>
-    </a>
-    {{ end }}
-</div>
diff --git a/layouts/partials/header-project.html b/layouts/partials/header-project.html
deleted file mode 100644
index 57a785b..0000000
--- a/layouts/partials/header-project.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<div class="item-header">
-    {{ $.Scratch.Set "link" .RelPermalink }}
-    {{ with .Params.repo }}
-        {{ $repoHost := default "gitlab" $.Params.repoHost }}
-        {{ if eq "github" $repoHost }}
-            {{ printf "https://github.com/%s/%s/" $.Site.Params.githubUsername . | $.Scratch.Set "link" }}
-        {{ else if eq "gitlab" $repoHost }}
-            {{ printf "https://gitlab.com/%s/%s/" $.Site.Params.gitlabUsername . | $.Scratch.Set "link" }}
-        {{ end }}
-    {{ end }}
-    {{ with .Description }} {{ $.Scratch.Set "subtitle" . }} {{ end }}
-
-    <a href="{{ .Scratch.Get "link" }}">
-        <img class="logo" src="../{{ .Params.logo }}">
-        <h1>{{ .Title }}</h1>
-    </a>
-    <h4>{{ $.Scratch.Get "subtitle" }}</h4>
-
-    {{ range.Params.categories }}
-
-        <a href="{{"/categories/"|relLangURL }}{{.|urlize}}">
-        <kbd class="item-cat"> {{ . }} </kbd>
-    </a>
-    {{ end }}
-    {{ range .Params.tags }}
-    <a href="{{"/tags/"|relLangURL }}{{.|urlize}}">
-        <kbd class="item-tag"> {{ . }} </kbd>
-    </a>
-    {{ end }}
-</div>
diff --git a/layouts/partials/list-item-post.html b/layouts/partials/list-item-post.html
deleted file mode 100644
index 53f344a..0000000
--- a/layouts/partials/list-item-post.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<div class="list-item">
-    {{ .Date.Format (.Site.Params.dateFormat | default "January 2, 2006") | $.Scratch.Set "pub_date" }}
-    {{ with .Description }} {{ $.Scratch.Set "subtitle" . }} {{ end }}
-    {{ with .ReadingTime }} {{ $.Scratch.Set "read_time" . }} {{ end }}
-    
-
-    <h4><a href="{{ .Scratch.Get "link" }}">{{ .Title }}</a></h4>
-    <h5>{{ $.Scratch.Get "pub_date" }} - {{ $.Scratch.Get "read_time" }} minutes</h5>
-    <h5>{{ $.Scratch.Get "subtitle" }}</h5>
-    {{ range.Params.categories }}
-        <a href="{{"/categories/"|relLangURL }}{{.|urlize}}">
-        <kbd class="item-cat"> {{ . }} </kbd>
-    </a>
-    {{ end }}
-    {{ range .Params.tags }}
-    <a href="{{"/tags/"|relLangURL }}{{.|urlize}}">
-        <kbd class="item-tag"> {{ . }} </kbd>
-    </a>
-    {{ end }}
-
-</div>
diff --git a/layouts/partials/list-item-project.html b/layouts/partials/list-item-project.html
deleted file mode 100644
index 2c44215..0000000
--- a/layouts/partials/list-item-project.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<div class="list-item">
-    <div class="list-logo">
-        <a href="{{ .Permalink }}">
-            <img src="{{ .Params.logo }}">
-        </a>
-    </div>
-    <div class="list-content">
-        <a href="{{ .Permalink }}">
-            <h4>{{ .Title }}</h4>
-        </a>
-        <h5>{{ .Description }}</h5>
-        {{ range.Params.categories }}
-            <a href="{{"/categories/"|relLangURL }}{{.|urlize}}">
-            <kbd class="item-cat"> {{ . }} </kbd>
-        </a>
-        {{ end }}
-        {{ range .Params.tags }}
-        <a href="{{"/tags/"|relLangURL }}{{.|urlize}}">
-            <kbd class="item-tag"> {{ . }} </kbd>
-        </a>
-        {{ end }}
-    </div>
-</div>
diff --git a/layouts/partials/list-item.html b/layouts/partials/list-item.html
deleted file mode 100644
index 078b638..0000000
--- a/layouts/partials/list-item.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<div class="item">
-
-    {{ $.Scratch.Set "link" .RelPermalink }}
-    {{ with .Params.repo }}
-        {{ $repoHost := default "github" $.Params.repoHost }}
-        {{ if eq "github" $repoHost }}
-            {{ printf "https://github.com/%s/%s/" $.Site.Params.githubUsername . | $.Scratch.Set "link" }}
-        {{ else if eq "gitlab" $repoHost }}
-            {{ printf "https://gitlab.com/%s/%s/" $.Site.Params.gitlabUsername . | $.Scratch.Set "link" }}
-        {{ else if eq "bitbucket" $repoHost }}
-            {{ printf "https://bitbucket.org/%s/%s/" $.Site.Params.bitbucketUsername . | $.Scratch.Set "link" }}
-        {{ end }}
-    {{ end }}
-    {{ with .Params.link }} {{ $.Scratch.Set "link" . }} {{ end }}
-
-    {{ .Date.Format (.Site.Params.dateFormat | default "January 2, 2006") | $.Scratch.Set "pub_date" }}
-    {{ with .Description }} {{ $.Scratch.Set "subtitle" . }} {{ end }}
-    {{ with .ReadingTime }} {{ $.Scratch.Set "read_time" . }} {{ end }}
-    
-
-    <h4><a href="{{ .Scratch.Get "link" }}">{{ .Title }}</a></h4>
-    <h5>{{ $.Scratch.Get "pub_date" }} - {{ $.Scratch.Get "read_time" }} minutes</h5>
-    <h5>{{ $.Scratch.Get "subtitle" }}</h5>
-
-    {{ range.Params.categories }}
-
-        <a href="{{"/categories/"|relLangURL }}{{.|urlize}}">
-        <kbd class="item-cat"> {{ . }} </kbd>
-    </a>
-    {{ end }}
-    {{ range .Params.tags }}
-    <a href="{{"/tags/"|relLangURL }}{{.|urlize}}">
-        <kbd class="item-tag"> {{ . }} </kbd>
-    </a>
-    {{ end }}
-
-</div>
diff --git a/layouts/partials/post.html b/layouts/partials/post.html
index db08407..e3b5f56 100644
--- a/layouts/partials/post.html
+++ b/layouts/partials/post.html
@@ -1,7 +1,6 @@
 {{ partial "header-post" .}}
 <div class="item">
     <br> <div class="text-justify">{{ .Content }}</div>
-
     <!-- related posts with the same tags -->
     {{ $related := first 3 (where (where (where .Site.Pages.ByDate.Reverse ".Type" "==" "post") ".Params.tags" "intersect" .Params.tags) "Permalink" "!=" .Permalink) }}
 
diff --git a/layouts/partials/project.html b/layouts/partials/project.html
deleted file mode 100644
index 3825680..0000000
--- a/layouts/partials/project.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{{ partial "header-project" .}}
-<div class="item">
-    <br> <div class="text-justify">{{ .Content }}</div>
-</div>
\ No newline at end of file
diff --git a/layouts/projects/list.html b/layouts/projects/list.html
new file mode 100644
index 0000000..2237018
--- /dev/null
+++ b/layouts/projects/list.html
@@ -0,0 +1,32 @@
+{{ partial "header" . }} 
+
+<main>     
+	<h2>{{ .Title }}</h2>     
+	{{ range .Pages }}         
+		<div class="list-item">
+	    <div class="list-logo">
+	        <a href="{{ .Permalink }}">
+	            <img src="{{ .Params.logo }}">
+	        </a>
+	    </div>
+	    <div class="list-content">
+	        <a href="{{ .Permalink }}">
+	            <h4>{{ .Title }}</h4>
+	        </a>
+	        <h5>{{ .Description }}</h5>
+	        {{ range.Params.categories }}
+	            <a href="{{"/categories/"|relLangURL }}{{.|urlize}}">
+	            <kbd class="item-cat"> {{ . }} </kbd>
+	        </a>
+	        {{ end }}
+	        {{ range .Params.tags }}
+	        <a href="{{"/tags/"|relLangURL }}{{.|urlize}}">
+	            <kbd class="item-tag"> {{ . }} </kbd>
+	        </a>
+	        {{ end }}
+	    </div>
+	</div>
+	{{end}}
+</main> 
+
+{{ partial "footer" . }}
\ No newline at end of file
diff --git a/layouts/projects/single.html b/layouts/projects/single.html
new file mode 100644
index 0000000..d0a3d94
--- /dev/null
+++ b/layouts/projects/single.html
@@ -0,0 +1,40 @@
+{{ partial "header" . }} 
+
+<main>
+	<div class="item-header">
+	    {{ $.Scratch.Set "link" .RelPermalink }}
+	    {{ with .Params.repo }}
+	        {{ $repoHost := default "gitlab" $.Params.repoHost }}
+	        {{ if eq "github" $repoHost }}
+	            {{ printf "https://github.com/%s/%s/" $.Site.Params.githubUsername . | $.Scratch.Set "link" }}
+	        {{ else if eq "gitlab" $repoHost }}
+	            {{ printf "https://gitlab.com/%s/%s/" $.Site.Params.gitlabUsername . | $.Scratch.Set "link" }}
+	        {{ end }}
+	    {{ end }}
+	    {{ with .Description }} {{ $.Scratch.Set "subtitle" . }} {{ end }}
+
+	    <a href="{{ .Scratch.Get "link" }}">
+	        <img class="logo" src="../{{ .Params.logo }}">
+	        <h1>{{ .Title }}</h1>
+	    </a>
+	    <h4>{{ $.Scratch.Get "subtitle" }}</h4>
+
+	    {{ range.Params.categories }}
+
+	        <a href="{{"/categories/"|relLangURL }}{{.|urlize}}">
+	        <kbd class="item-cat"> {{ . }} </kbd>
+	    </a>
+	    {{ end }}
+	    {{ range .Params.tags }}
+	    <a href="{{"/tags/"|relLangURL }}{{.|urlize}}">
+	        <kbd class="item-tag"> {{ . }} </kbd>
+	    </a>
+	    {{ end }}
+	</div>
+
+	<div class="item">
+	    <br> <div class="text-justify">{{ .Content }}</div>
+	</div>
+</main>
+
+{{ partial "footer" . }}
\ No newline at end of file