diff --git a/layouts/partials/post-list-term.html b/layouts/partials/post-list-term.html
index f4c81e7..34de98f 100644
--- a/layouts/partials/post-list-term.html
+++ b/layouts/partials/post-list-term.html
@@ -1,5 +1,5 @@
-{{ $pages := ((where .Site.Pages "Type" "post") | shuffle) }}
-{{ range first 3 $pages}} 
+{{ $pages := (.Site.RegularPages | shuffle) }}
+{{ range first 6 $pages}} 
 
 <article class="post-card post"> 
     {{if .Params.image}}
diff --git a/layouts/partials/post-list.html b/layouts/partials/post-list.html
index 50a80a0..da63603 100644
--- a/layouts/partials/post-list.html
+++ b/layouts/partials/post-list.html
@@ -1,4 +1,4 @@
-{{ $paginator := .Paginate (where .Data.Pages.ByDate.Reverse "Type" "post") }}
+{{ $paginator := .Paginate .Site.RegularPages }}
 {{ range $paginator.Pages }}
 
 <article class="post-card post"> 
diff --git a/layouts/partials/readnext-random-sori.html b/layouts/partials/readnext-random-sori.html
index c251581..bbe27de 100644
--- a/layouts/partials/readnext-random-sori.html
+++ b/layouts/partials/readnext-random-sori.html
@@ -1,4 +1,4 @@
-{{ $posts := (where .Site.RegularPages "Section" "==" "post") }}{{ $postCount := len $posts }}{{if ge $postCount 4}}{{ $currentPage := . }}
+{{ $posts := .Site.RegularPages }}{{ $postCount := len $posts }}{{if ge $postCount 4}}{{ $currentPage := . }}
 <article class="read-next-card" {{if .Site.Params.cover}}
             style="background-image: url({{.Site.Params.cover | absURL}});" {{else}}style="background-color: #090a0b;"{{end}}>
     <header class="read-next-card-header">