diff --git a/layouts/_default/index.html b/layouts/_default/index.html
deleted file mode 100644
index 453bf4ef..00000000
--- a/layouts/_default/index.html
+++ /dev/null
@@ -1,61 +0,0 @@
-{{ define "main" }}
-
-{{ if .Site.Params.profileMode }}
-{{- partial "indexProfile.html" . }}
-{{else}} {{/* if not profileMode */}}
-
-{{ $isntDefault := not (or (eq (trim $.Site.Params.contentTypeName " ") "posts") (eq (trim $.Site.Params.contentTypeName " ") "")) }}
-{{ $contentTypeName := cond $isntDefault (string $.Site.Params.contentTypeName) "posts" }}
-
-{{ $PageContext := . }}
-{{ if .IsHome }}
-{{ $PageContext = .Site }}
-{{ end }}
-{{ $paginator := .Paginate (where $PageContext.RegularPages "Type" $contentTypeName) }}
-
-{{- range $index, $page := $paginator.Pages }}
-
-{{- $class := "post-entry" }}
-{{- if (and $.IsHome (eq $paginator.PageNumber 1) (eq $index 0)) }}
-{{- if (eq $.Site.Params.homeInfoParams.enabled true) }}
-{{- partial "homeInfo.html" . }}
-{{else}}
-{{- $class = "first-entry" }}
-{{ end }}
-{{- else if .Data.Term }}
-{{- $class = "post-entry tag-entry" }}
-{{- end }}
-<article class="{{ $class }}">
-  <header class="entry-header">
-    <h2>
-      {{ .Title }}
-      {{- if .Draft }}<div class="entry-isdraft"><sup>&nbsp&nbsp[draft]</sup></div>{{- end }}
-    </h2>
-  </header>
-  <section class="entry-content">
-    <p>{{ .Summary | plainify | htmlUnescape }}...</p>
-  </section>
-  <footer class="entry-footer">
-    <time>{{ .Date.Format "January 2, 2006" }}</time>
-    {{ if $.Site.Params.ShowReadingTime }} .
-    {{ .ReadingTime }}{{ i18n "read_time" | default "min read" }}{{ end }}
-    {{ if or .Params.author .Site.Params.author }} . {{ .Params.author | default .Site.Params.author }}{{ end }}
-  </footer>
-  <a class="entry-link" href="{{ .Permalink }}"></a>
-</article>
-{{- end }}
-
-{{- if gt $paginator.TotalPages 1 }}
-<footer class="page-footer">
-  <nav class="pagination">
-    {{- if $paginator.HasPrev }}
-    <a class="prev" href="{{ $paginator.Prev.URL }}">« {{ i18n "prev_page" }}</a>
-    {{- end }}
-    {{- if $paginator.HasNext }}
-    <a class="next" href="{{ $paginator.Next.URL }}">{{ i18n "next_page" }} »</a>
-    {{- end }}
-  </nav>
-</footer>
-{{- end }}
-{{end}}{{/* end profileMode */}}
-{{ end  }}{{/* end main */}}
\ No newline at end of file
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 4e7e14d0..4f69d81e 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,17 +1,33 @@
 {{ define "main" }}
 
-{{- $scope := .Site }}
-{{- if .Title }}
-<header class="page-header"><h1>{{ .Title }}</h1></header>{{ $scope = . }}
-{{ end }}
+{{ if (and .Site.Params.profileMode .IsHome) }}
+{{- partial "indexProfile.html" . }}
+{{else}} {{/* if not profileMode */}}
 
-{{- $paginator := .Paginate (where $scope.RegularPages ".Params.type" "!=" "page") }}
+{{ $isntDefault := not (or (eq (trim $.Site.Params.contentTypeName " ") "posts") (eq (trim $.Site.Params.contentTypeName " ") "")) }}
+{{ $contentTypeName := cond $isntDefault (string $.Site.Params.contentTypeName) "posts" }}
+
+{{ $PageContext := . }}
+{{ if .IsHome }}
+{{ $PageContext = .Site }}
+{{else}}
+{{- if .Title }}
+<header class="page-header">
+  <h1>{{ .Title }}</h1>
+</header>
+{{ end }}
+{{ end }}
+{{ $paginator := .Paginate (where $PageContext.RegularPages "Type" $contentTypeName) }}
 
 {{- range $index, $page := $paginator.Pages }}
 
 {{- $class := "post-entry" }}
 {{- if (and $.IsHome (eq $paginator.PageNumber 1) (eq $index 0)) }}
+{{- if (eq $.Site.Params.homeInfoParams.enabled true) }}
+{{- partial "homeInfo.html" . }}
+{{else}}
 {{- $class = "first-entry" }}
+{{ end }}
 {{- else if .Data.Term }}
 {{- $class = "post-entry tag-entry" }}
 {{- end }}
@@ -47,5 +63,5 @@
   </nav>
 </footer>
 {{- end }}
-
+{{end}}{{/* end profileMode */}}
 {{ end  }}{{/* end main */}}
\ No newline at end of file