diff --git a/exampleSite/config/_default/menus.en.toml b/exampleSite/config/_default/menus.en.toml
index 3b71ca0c..fcfddb07 100644
--- a/exampleSite/config/_default/menus.en.toml
+++ b/exampleSite/config/_default/menus.en.toml
@@ -35,7 +35,10 @@
   url = "http://tee.pub/lic/qwSlWVBL5zc"
   weight = 50
 
-
+#[[main]]
+#  name = "Test"
+#  pageRef = "pagTest"
+#  weight = 1000
 
 [[main]]
   identifier = "twitter"
diff --git a/exampleSite/content/pagtest/_index.md b/exampleSite/content/pagtest/_index.md
new file mode 100644
index 00000000..a2578a5c
--- /dev/null
+++ b/exampleSite/content/pagtest/_index.md
@@ -0,0 +1,19 @@
+---
+title: "TEST"
+date: 2022-06-13T20:55:37+01:00
+draft: true
+
+showDate : false
+showDateUpdated : false
+showHeadingAnchors : false
+showPagination : false
+showReadingTime : false
+showTableOfContents : true
+showTaxonomies : false 
+showWordCount : false
+showSummary : false
+sharingLinks : false
+
+cardView: false
+---
+
diff --git a/exampleSite/content/pagtest/file1 copy 10.md b/exampleSite/content/pagtest/file1 copy 10.md
new file mode 100644
index 00000000..6c1f9414
--- /dev/null
+++ b/exampleSite/content/pagtest/file1 copy 10.md	
@@ -0,0 +1,7 @@
+---
+title: "Charts"
+date: 2019-03-06
+summary: "Blowfish includes Chart.js for powerful charts and data visualisations."
+tags: ["chart", "sample", "graph", "shortcodes"]
+showDate: false
+---
\ No newline at end of file
diff --git a/exampleSite/content/pagtest/file1 copy 11.md b/exampleSite/content/pagtest/file1 copy 11.md
new file mode 100644
index 00000000..6c1f9414
--- /dev/null
+++ b/exampleSite/content/pagtest/file1 copy 11.md	
@@ -0,0 +1,7 @@
+---
+title: "Charts"
+date: 2019-03-06
+summary: "Blowfish includes Chart.js for powerful charts and data visualisations."
+tags: ["chart", "sample", "graph", "shortcodes"]
+showDate: false
+---
\ No newline at end of file
diff --git a/exampleSite/content/pagtest/file1 copy 12.md b/exampleSite/content/pagtest/file1 copy 12.md
new file mode 100644
index 00000000..6c1f9414
--- /dev/null
+++ b/exampleSite/content/pagtest/file1 copy 12.md	
@@ -0,0 +1,7 @@
+---
+title: "Charts"
+date: 2019-03-06
+summary: "Blowfish includes Chart.js for powerful charts and data visualisations."
+tags: ["chart", "sample", "graph", "shortcodes"]
+showDate: false
+---
\ No newline at end of file
diff --git a/exampleSite/content/pagtest/file1 copy 13.md b/exampleSite/content/pagtest/file1 copy 13.md
new file mode 100644
index 00000000..6c1f9414
--- /dev/null
+++ b/exampleSite/content/pagtest/file1 copy 13.md	
@@ -0,0 +1,7 @@
+---
+title: "Charts"
+date: 2019-03-06
+summary: "Blowfish includes Chart.js for powerful charts and data visualisations."
+tags: ["chart", "sample", "graph", "shortcodes"]
+showDate: false
+---
\ No newline at end of file
diff --git a/exampleSite/content/pagtest/file1 copy 14.md b/exampleSite/content/pagtest/file1 copy 14.md
new file mode 100644
index 00000000..6c1f9414
--- /dev/null
+++ b/exampleSite/content/pagtest/file1 copy 14.md	
@@ -0,0 +1,7 @@
+---
+title: "Charts"
+date: 2019-03-06
+summary: "Blowfish includes Chart.js for powerful charts and data visualisations."
+tags: ["chart", "sample", "graph", "shortcodes"]
+showDate: false
+---
\ No newline at end of file
diff --git a/exampleSite/content/pagtest/file1 copy 15.md b/exampleSite/content/pagtest/file1 copy 15.md
new file mode 100644
index 00000000..6c1f9414
--- /dev/null
+++ b/exampleSite/content/pagtest/file1 copy 15.md	
@@ -0,0 +1,7 @@
+---
+title: "Charts"
+date: 2019-03-06
+summary: "Blowfish includes Chart.js for powerful charts and data visualisations."
+tags: ["chart", "sample", "graph", "shortcodes"]
+showDate: false
+---
\ No newline at end of file
diff --git a/exampleSite/content/pagtest/file1 copy 16.md b/exampleSite/content/pagtest/file1 copy 16.md
new file mode 100644
index 00000000..6c1f9414
--- /dev/null
+++ b/exampleSite/content/pagtest/file1 copy 16.md	
@@ -0,0 +1,7 @@
+---
+title: "Charts"
+date: 2019-03-06
+summary: "Blowfish includes Chart.js for powerful charts and data visualisations."
+tags: ["chart", "sample", "graph", "shortcodes"]
+showDate: false
+---
\ No newline at end of file
diff --git a/exampleSite/content/pagtest/file1 copy 17.md b/exampleSite/content/pagtest/file1 copy 17.md
new file mode 100644
index 00000000..6c1f9414
--- /dev/null
+++ b/exampleSite/content/pagtest/file1 copy 17.md	
@@ -0,0 +1,7 @@
+---
+title: "Charts"
+date: 2019-03-06
+summary: "Blowfish includes Chart.js for powerful charts and data visualisations."
+tags: ["chart", "sample", "graph", "shortcodes"]
+showDate: false
+---
\ No newline at end of file
diff --git a/exampleSite/content/pagtest/file1 copy 18.md b/exampleSite/content/pagtest/file1 copy 18.md
new file mode 100644
index 00000000..6c1f9414
--- /dev/null
+++ b/exampleSite/content/pagtest/file1 copy 18.md	
@@ -0,0 +1,7 @@
+---
+title: "Charts"
+date: 2019-03-06
+summary: "Blowfish includes Chart.js for powerful charts and data visualisations."
+tags: ["chart", "sample", "graph", "shortcodes"]
+showDate: false
+---
\ No newline at end of file
diff --git a/exampleSite/content/pagtest/file1 copy 19.md b/exampleSite/content/pagtest/file1 copy 19.md
new file mode 100644
index 00000000..6c1f9414
--- /dev/null
+++ b/exampleSite/content/pagtest/file1 copy 19.md	
@@ -0,0 +1,7 @@
+---
+title: "Charts"
+date: 2019-03-06
+summary: "Blowfish includes Chart.js for powerful charts and data visualisations."
+tags: ["chart", "sample", "graph", "shortcodes"]
+showDate: false
+---
\ No newline at end of file
diff --git a/exampleSite/content/pagtest/file1 copy 2.md b/exampleSite/content/pagtest/file1 copy 2.md
new file mode 100644
index 00000000..6c1f9414
--- /dev/null
+++ b/exampleSite/content/pagtest/file1 copy 2.md	
@@ -0,0 +1,7 @@
+---
+title: "Charts"
+date: 2019-03-06
+summary: "Blowfish includes Chart.js for powerful charts and data visualisations."
+tags: ["chart", "sample", "graph", "shortcodes"]
+showDate: false
+---
\ No newline at end of file
diff --git a/exampleSite/content/pagtest/file1 copy 20.md b/exampleSite/content/pagtest/file1 copy 20.md
new file mode 100644
index 00000000..6c1f9414
--- /dev/null
+++ b/exampleSite/content/pagtest/file1 copy 20.md	
@@ -0,0 +1,7 @@
+---
+title: "Charts"
+date: 2019-03-06
+summary: "Blowfish includes Chart.js for powerful charts and data visualisations."
+tags: ["chart", "sample", "graph", "shortcodes"]
+showDate: false
+---
\ No newline at end of file
diff --git a/exampleSite/content/pagtest/file1 copy 21.md b/exampleSite/content/pagtest/file1 copy 21.md
new file mode 100644
index 00000000..6c1f9414
--- /dev/null
+++ b/exampleSite/content/pagtest/file1 copy 21.md	
@@ -0,0 +1,7 @@
+---
+title: "Charts"
+date: 2019-03-06
+summary: "Blowfish includes Chart.js for powerful charts and data visualisations."
+tags: ["chart", "sample", "graph", "shortcodes"]
+showDate: false
+---
\ No newline at end of file
diff --git a/exampleSite/content/pagtest/file1 copy 22.md b/exampleSite/content/pagtest/file1 copy 22.md
new file mode 100644
index 00000000..6c1f9414
--- /dev/null
+++ b/exampleSite/content/pagtest/file1 copy 22.md	
@@ -0,0 +1,7 @@
+---
+title: "Charts"
+date: 2019-03-06
+summary: "Blowfish includes Chart.js for powerful charts and data visualisations."
+tags: ["chart", "sample", "graph", "shortcodes"]
+showDate: false
+---
\ No newline at end of file
diff --git a/exampleSite/content/pagtest/file1 copy 23.md b/exampleSite/content/pagtest/file1 copy 23.md
new file mode 100644
index 00000000..6c1f9414
--- /dev/null
+++ b/exampleSite/content/pagtest/file1 copy 23.md	
@@ -0,0 +1,7 @@
+---
+title: "Charts"
+date: 2019-03-06
+summary: "Blowfish includes Chart.js for powerful charts and data visualisations."
+tags: ["chart", "sample", "graph", "shortcodes"]
+showDate: false
+---
\ No newline at end of file
diff --git a/exampleSite/content/pagtest/file1 copy 24.md b/exampleSite/content/pagtest/file1 copy 24.md
new file mode 100644
index 00000000..6c1f9414
--- /dev/null
+++ b/exampleSite/content/pagtest/file1 copy 24.md	
@@ -0,0 +1,7 @@
+---
+title: "Charts"
+date: 2019-03-06
+summary: "Blowfish includes Chart.js for powerful charts and data visualisations."
+tags: ["chart", "sample", "graph", "shortcodes"]
+showDate: false
+---
\ No newline at end of file
diff --git a/exampleSite/content/pagtest/file1 copy 25.md b/exampleSite/content/pagtest/file1 copy 25.md
new file mode 100644
index 00000000..6c1f9414
--- /dev/null
+++ b/exampleSite/content/pagtest/file1 copy 25.md	
@@ -0,0 +1,7 @@
+---
+title: "Charts"
+date: 2019-03-06
+summary: "Blowfish includes Chart.js for powerful charts and data visualisations."
+tags: ["chart", "sample", "graph", "shortcodes"]
+showDate: false
+---
\ No newline at end of file
diff --git a/exampleSite/content/pagtest/file1 copy 26.md b/exampleSite/content/pagtest/file1 copy 26.md
new file mode 100644
index 00000000..6c1f9414
--- /dev/null
+++ b/exampleSite/content/pagtest/file1 copy 26.md	
@@ -0,0 +1,7 @@
+---
+title: "Charts"
+date: 2019-03-06
+summary: "Blowfish includes Chart.js for powerful charts and data visualisations."
+tags: ["chart", "sample", "graph", "shortcodes"]
+showDate: false
+---
\ No newline at end of file
diff --git a/exampleSite/content/pagtest/file1 copy 27.md b/exampleSite/content/pagtest/file1 copy 27.md
new file mode 100644
index 00000000..6c1f9414
--- /dev/null
+++ b/exampleSite/content/pagtest/file1 copy 27.md	
@@ -0,0 +1,7 @@
+---
+title: "Charts"
+date: 2019-03-06
+summary: "Blowfish includes Chart.js for powerful charts and data visualisations."
+tags: ["chart", "sample", "graph", "shortcodes"]
+showDate: false
+---
\ No newline at end of file
diff --git a/exampleSite/content/pagtest/file1 copy 28.md b/exampleSite/content/pagtest/file1 copy 28.md
new file mode 100644
index 00000000..6c1f9414
--- /dev/null
+++ b/exampleSite/content/pagtest/file1 copy 28.md	
@@ -0,0 +1,7 @@
+---
+title: "Charts"
+date: 2019-03-06
+summary: "Blowfish includes Chart.js for powerful charts and data visualisations."
+tags: ["chart", "sample", "graph", "shortcodes"]
+showDate: false
+---
\ No newline at end of file
diff --git a/exampleSite/content/pagtest/file1 copy 3.md b/exampleSite/content/pagtest/file1 copy 3.md
new file mode 100644
index 00000000..6c1f9414
--- /dev/null
+++ b/exampleSite/content/pagtest/file1 copy 3.md	
@@ -0,0 +1,7 @@
+---
+title: "Charts"
+date: 2019-03-06
+summary: "Blowfish includes Chart.js for powerful charts and data visualisations."
+tags: ["chart", "sample", "graph", "shortcodes"]
+showDate: false
+---
\ No newline at end of file
diff --git a/exampleSite/content/pagtest/file1 copy 4.md b/exampleSite/content/pagtest/file1 copy 4.md
new file mode 100644
index 00000000..6c1f9414
--- /dev/null
+++ b/exampleSite/content/pagtest/file1 copy 4.md	
@@ -0,0 +1,7 @@
+---
+title: "Charts"
+date: 2019-03-06
+summary: "Blowfish includes Chart.js for powerful charts and data visualisations."
+tags: ["chart", "sample", "graph", "shortcodes"]
+showDate: false
+---
\ No newline at end of file
diff --git a/exampleSite/content/pagtest/file1 copy 5.md b/exampleSite/content/pagtest/file1 copy 5.md
new file mode 100644
index 00000000..6c1f9414
--- /dev/null
+++ b/exampleSite/content/pagtest/file1 copy 5.md	
@@ -0,0 +1,7 @@
+---
+title: "Charts"
+date: 2019-03-06
+summary: "Blowfish includes Chart.js for powerful charts and data visualisations."
+tags: ["chart", "sample", "graph", "shortcodes"]
+showDate: false
+---
\ No newline at end of file
diff --git a/exampleSite/content/pagtest/file1 copy 6.md b/exampleSite/content/pagtest/file1 copy 6.md
new file mode 100644
index 00000000..6c1f9414
--- /dev/null
+++ b/exampleSite/content/pagtest/file1 copy 6.md	
@@ -0,0 +1,7 @@
+---
+title: "Charts"
+date: 2019-03-06
+summary: "Blowfish includes Chart.js for powerful charts and data visualisations."
+tags: ["chart", "sample", "graph", "shortcodes"]
+showDate: false
+---
\ No newline at end of file
diff --git a/exampleSite/content/pagtest/file1 copy 7.md b/exampleSite/content/pagtest/file1 copy 7.md
new file mode 100644
index 00000000..6c1f9414
--- /dev/null
+++ b/exampleSite/content/pagtest/file1 copy 7.md	
@@ -0,0 +1,7 @@
+---
+title: "Charts"
+date: 2019-03-06
+summary: "Blowfish includes Chart.js for powerful charts and data visualisations."
+tags: ["chart", "sample", "graph", "shortcodes"]
+showDate: false
+---
\ No newline at end of file
diff --git a/exampleSite/content/pagtest/file1 copy 8.md b/exampleSite/content/pagtest/file1 copy 8.md
new file mode 100644
index 00000000..6c1f9414
--- /dev/null
+++ b/exampleSite/content/pagtest/file1 copy 8.md	
@@ -0,0 +1,7 @@
+---
+title: "Charts"
+date: 2019-03-06
+summary: "Blowfish includes Chart.js for powerful charts and data visualisations."
+tags: ["chart", "sample", "graph", "shortcodes"]
+showDate: false
+---
\ No newline at end of file
diff --git a/exampleSite/content/pagtest/file1 copy 9.md b/exampleSite/content/pagtest/file1 copy 9.md
new file mode 100644
index 00000000..6c1f9414
--- /dev/null
+++ b/exampleSite/content/pagtest/file1 copy 9.md	
@@ -0,0 +1,7 @@
+---
+title: "Charts"
+date: 2019-03-06
+summary: "Blowfish includes Chart.js for powerful charts and data visualisations."
+tags: ["chart", "sample", "graph", "shortcodes"]
+showDate: false
+---
\ No newline at end of file
diff --git a/exampleSite/content/pagtest/file1 copy.md b/exampleSite/content/pagtest/file1 copy.md
new file mode 100644
index 00000000..6c1f9414
--- /dev/null
+++ b/exampleSite/content/pagtest/file1 copy.md	
@@ -0,0 +1,7 @@
+---
+title: "Charts"
+date: 2019-03-06
+summary: "Blowfish includes Chart.js for powerful charts and data visualisations."
+tags: ["chart", "sample", "graph", "shortcodes"]
+showDate: false
+---
\ No newline at end of file
diff --git a/exampleSite/content/pagtest/file1.md b/exampleSite/content/pagtest/file1.md
new file mode 100644
index 00000000..6c1f9414
--- /dev/null
+++ b/exampleSite/content/pagtest/file1.md
@@ -0,0 +1,7 @@
+---
+title: "Charts"
+date: 2019-03-06
+summary: "Blowfish includes Chart.js for powerful charts and data visualisations."
+tags: ["chart", "sample", "graph", "shortcodes"]
+showDate: false
+---
\ No newline at end of file
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 05a88421..0919d81c 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -227,7 +227,6 @@
             {{ end }}
             {{ end }}
           </section>
-          {{ partial "pagination.html" . }}
           {{ end }}
 
           {{ else }}
@@ -237,4 +236,8 @@
             </p>
           </section>
           {{ end }}
-          {{ end }}
\ No newline at end of file
+
+          {{ partial "pagination.html" . }}
+
+          {{ end }}
+          
\ No newline at end of file
diff --git a/layouts/partials/pagination.html b/layouts/partials/pagination.html
index 8f4cf25d..c5233132 100644
--- a/layouts/partials/pagination.html
+++ b/layouts/partials/pagination.html
@@ -1,39 +1,49 @@
-{{ $paginator := .Paginator }}
-{{ if gt $paginator.TotalPages 1 }}
-  <ul class="flex flex-row mt-8">
-    {{ if $paginator.HasPrev }}
-      <li>
-        <a
-          href="{{ $paginator.Prev.URL }}"
+{{- if gt .Paginator.TotalPages 1 -}}
+  <ul class="flex flex-row mt-8 justify-center">
+    {{- .Scratch.Set "paginator.ellipsed" false -}}
+    {{ if $.Paginator.HasPrev }}
+    <li>
+      <a
+          href="{{ $.Paginator.Prev.URL }}"
           class="mx-1 block min-w-[1.8rem] rounded text-center hover:bg-primary-600 hover:text-neutral"
           rel="prev"
-        >
-          &larr;
-        </a>
-      </li>
+      >&larr;</a>
+    </li>
     {{ end }}
-    {{ range $paginator.Pagers }}
-      <li>
-        <a
-          href="{{ .URL }}"
-          class="{{ if eq . $paginator }}
-            bg-primary-200 dark:bg-primary-400 dark:text-neutral-800
-          {{ end }} mx-1 block min-w-[1.8rem] rounded text-center hover:bg-primary-600 hover:text-neutral"
-        >
-          {{ .PageNumber }}
-        </a>
+    {{- range $.Paginator.Pagers -}}
+      {{- $right := sub .TotalPages .PageNumber -}}
+      {{- $showNumber := or (le .PageNumber 1) (eq $right 0) -}}
+      {{- $showNumber := or $showNumber (and (gt .PageNumber (sub $.Paginator.PageNumber 3)) (lt .PageNumber (add $.Paginator.PageNumber 3))) -}}
+      {{- if $showNumber -}}
+        {{- $.Scratch.Set "paginator.ellipsed" false -}}
+        {{- $.Scratch.Set "paginator.shouldEllipse" false -}}
+      {{- else -}}
+        {{- $.Scratch.Set "paginator.shouldEllipse" (not ($.Scratch.Get "paginator.ellipsed") ) -}}
+        {{- $.Scratch.Set "paginator.ellipsed" true -}}
+      {{- end -}}
+      {{- if $showNumber -}}
+        <li>
+          <a
+              href="{{ .URL }}"
+              class="{{ if eq . $.Paginator }}
+          bg-primary-200 dark:bg-primary-400 dark:text-neutral-800
+        {{ end }} mx-1 block min-w-[1.8rem] rounded text-center hover:bg-primary-600 hover:text-neutral"
+          >{{ .PageNumber }}</a>
       </li>
-    {{ end }}
-    {{ if $paginator.HasNext }}
-      <li>
-        <a
-          href="{{ $paginator.Next.URL }}"
+      {{- else if ($.Scratch.Get "paginator.shouldEllipse") -}}
+        <li class="page-item ">
+          <span class="page-link" aria-hidden="true">&hellip;</span>
+        </li>
+      {{- end -}}
+    {{- end -}}
+    {{ if $.Paginator.HasNext }}
+    <li>
+      <a
+          href="{{ $.Paginator.Next.URL }}"
           class="mx-1 block min-w-[1.8rem] rounded text-center hover:bg-primary-600 hover:text-neutral"
           rel="next"
-        >
-          &rarr;
-        </a>
-      </li>
+      >&rarr;</a>
+    </li>
     {{ end }}
   </ul>
-{{ end }}
+{{- end -}}
\ No newline at end of file