diff --git a/gatsby-node.js b/gatsby-node.js
index 81ece48..161bd3b 100644
--- a/gatsby-node.js
+++ b/gatsby-node.js
@@ -114,6 +114,15 @@ exports.createPages = ({ actions, graphql }) => {
               }
             }
           }
+          allWordpressPost {
+            edges {
+              node {
+                categories {
+                  slug
+                }
+              }
+            }
+          }
         }
       `)
     })
@@ -124,11 +133,23 @@ exports.createPages = ({ actions, graphql }) => {
       }
 
       const categoriesTemplate = path.resolve(`./src/templates/category.js`)
-
       // Create a Gatsby page for each WordPress Category
       _.each(result.data.allWordpressCategory.edges, ({ node: cat }) => {
-        createPage({
-          path: `/categories/${cat.slug}/`,
+        // Filter for posts attached to category
+        const catPosts = result.data.allWordpressPost.edges.filter(
+          ({ node }) =>
+            node.categories &&
+            node.categories.filter(postCat => postCat.slug === cat.slug)
+        )
+        // Create a paginated category archive, e.g., /category/<slug>, /category/<slug>/page/2,
+        paginate({
+          createPage,
+          items: catPosts,
+          itemsPerPage: 10,
+          pathPrefix: ({ pageNumber }) =>
+            pageNumber === 0
+              ? `/category/${cat.slug}`
+              : `/category/${cat.slug}/page`,
           component: categoriesTemplate,
           context: {
             name: cat.name,
@@ -149,6 +170,15 @@ exports.createPages = ({ actions, graphql }) => {
               }
             }
           }
+          allWordpressPost {
+            edges {
+              node {
+                tags {
+                  slug
+                }
+              }
+            }
+          }
         }
       `)
     })
@@ -163,8 +193,18 @@ exports.createPages = ({ actions, graphql }) => {
 
       // Create a Gatsby page for each WordPress tag
       _.each(result.data.allWordpressTag.edges, ({ node: tag }) => {
-        createPage({
-          path: `/tags/${tag.slug}/`,
+        // Filter for posts attached to tag
+        const tagPosts = result.data.allWordpressPost.edges.filter(
+          ({ node }) =>
+            node.tags && node.tags.filter(postTag => postTag.slug === tag.slug)
+        )
+        // Create a paginated tag archive, e.g., /tag/<slug>, /tag/<slug>/page/2,
+        paginate({
+          createPage,
+          items: tagPosts,
+          itemsPerPage: 10,
+          pathPrefix: ({ pageNumber }) =>
+            pageNumber === 0 ? `/tag/${tag.slug}` : `/tag/${tag.slug}/page`,
           component: tagsTemplate,
           context: {
             name: tag.name,
@@ -180,10 +220,20 @@ exports.createPages = ({ actions, graphql }) => {
             edges {
               node {
                 id
+                name
                 slug
               }
             }
           }
+          allWordpressPost {
+            edges {
+              node {
+                author {
+                  slug
+                }
+              }
+            }
+          }
         }
       `)
     })
@@ -196,11 +246,23 @@ exports.createPages = ({ actions, graphql }) => {
       const authorTemplate = path.resolve(`./src/templates/author.js`)
 
       _.each(result.data.allWordpressWpUsers.edges, ({ node: author }) => {
-        createPage({
-          path: `/author/${author.slug}`,
+        // Filter for posts attached to author
+        const authorPosts = result.data.allWordpressPost.edges.filter(
+          ({ node }) => node.author.slug === author.slug
+        )
+        // Create a paginated author archive, e.g., /author/<slug>, /author/<slug>/page/2,
+        paginate({
+          createPage,
+          items: authorPosts,
+          itemsPerPage: 10,
+          pathPrefix: ({ pageNumber }) =>
+            pageNumber === 0
+              ? `/author/${author.slug}`
+              : `/author/${author.slug}/page`,
           component: authorTemplate,
           context: {
-            id: author.id,
+            name: author.name,
+            slug: author.slug,
           },
         })
       })
diff --git a/src/components/Pagination.js b/src/components/Pagination.js
index 89c3a98..63870fe 100644
--- a/src/components/Pagination.js
+++ b/src/components/Pagination.js
@@ -1,8 +1,14 @@
 import React from 'react'
 import { Link } from 'gatsby'
 
-const Pagination = ({ pageContext, pathPrefix }) => {
-  const { previousPagePath, nextPagePath } = pageContext
+const Pagination = ({ pageContext, endSize = 1, midSize = 1 }) => {
+  const {
+    previousPagePath,
+    nextPagePath,
+    numberOfPages,
+    humanPageNumber,
+  } = pageContext
+  let dots = false
 
   return (
     <nav className="pagination" role="navigation">
@@ -14,6 +20,40 @@ const Pagination = ({ pageContext, pathPrefix }) => {
             </Link>
           </div>
         )}
+        {Array.from({ length: numberOfPages }, (_, i) => {
+          const index = i + 1
+          const renderLink =
+            index <= endSize ||
+            (index >= humanPageNumber - midSize &&
+              index <= humanPageNumber + midSize) ||
+            index > numberOfPages - endSize
+          let NavItem = null
+          if (index === humanPageNumber) {
+            dots = true
+            NavItem = (
+              <div className="navbar-item" key={`page-${index}`}>
+                <span aria-current="page" className="current">
+                  {index}
+                </span>
+              </div>
+            )
+          } else if (renderLink) {
+            dots = true
+            NavItem = (
+              <div className="navbar-item" key={`page-${index}`}>
+                <Link to={i === 0 ? `/` : `/${index}`}>{index}</Link>
+              </div>
+            )
+          } else if (dots) {
+            dots = false
+            NavItem = (
+              <div className="navbar-item" key={`page-${index}`}>
+                <span className="dots">&hellip;</span>
+              </div>
+            )
+          }
+          return NavItem
+        })}
         {nextPagePath && (
           <div className="navbar-item">
             <Link to={nextPagePath} rel="next">
diff --git a/src/templates/author.js b/src/templates/author.js
index 989cad4..c38af2e 100644
--- a/src/templates/author.js
+++ b/src/templates/author.js
@@ -3,25 +3,20 @@ import Helmet from 'react-helmet'
 import { graphql } from 'gatsby'
 import Layout from '../components/Layout'
 import PostList from '../components/PostList'
+import Pagination from '../components/Pagination'
 
 const Author = props => {
-  const { data } = props
-  const { authored_wordpress__POST, name } = data.wordpressWpUsers
-  const totalCount =
-    (authored_wordpress__POST && authored_wordpress__POST.length) || 0
+  const { data, pageContext } = props
+  const { name } = pageContext
+  const { edges: posts, totalCount } = data.allWordpressPost
   const { title: siteTitle } = data.site.siteMetadata
   const title = `${totalCount} post${totalCount === 1 ? '' : 's'} by ${name}`
 
-  // The `authored_wordpress__POST` returns a simple array instead of an array
-  // of edges / nodes. We therefore need to convert the array here.
-  const posts = authored_wordpress__POST.map(post => ({
-    node: post,
-  }))
-
   return (
     <Layout>
       <Helmet title={`${name} | ${siteTitle}`} />
       <PostList posts={posts} title={title} />
+      <Pagination pageContext={pageContext} />
     </Layout>
   )
 }
@@ -29,16 +24,22 @@ const Author = props => {
 export default Author
 
 export const pageQuery = graphql`
-  query AuthorPage($id: String!) {
+  query AuthorPage($slug: String!, $limit: Int!, $skip: Int!) {
     site {
       siteMetadata {
         title
       }
     }
-    wordpressWpUsers(id: { eq: $id }) {
-      name
-      authored_wordpress__POST {
-        ...PostListFields
+    allWordpressPost(
+      filter: { author: { slug: { eq: $slug } } }
+      limit: $limit
+      skip: $skip
+    ) {
+      totalCount
+      edges {
+        node {
+          ...PostListFields
+        }
       }
     }
   }
diff --git a/src/templates/blog.js b/src/templates/blog.js
index 049cc3b..3c2f461 100644
--- a/src/templates/blog.js
+++ b/src/templates/blog.js
@@ -13,7 +13,7 @@ export default class IndexPage extends React.Component {
     return (
       <Layout>
         <PostList posts={posts} title="Latest posts" />
-        <Pagination pageContext={pageContext} pathPrefix="/" />
+        <Pagination pageContext={pageContext} />
       </Layout>
     )
   }
diff --git a/src/templates/category.js b/src/templates/category.js
index 5e50948..c95d543 100644
--- a/src/templates/category.js
+++ b/src/templates/category.js
@@ -3,6 +3,7 @@ import Helmet from 'react-helmet'
 import { graphql } from 'gatsby'
 import Layout from '../components/Layout'
 import PostList from '../components/PostList'
+import Pagination from '../components/Pagination'
 
 const Category = props => {
   const { data, pageContext } = props
@@ -17,6 +18,7 @@ const Category = props => {
     <Layout>
       <Helmet title={`${category} | ${siteTitle}`} />
       <PostList posts={posts} title={title} />
+      <Pagination pageContext={pageContext} />
     </Layout>
   )
 }
@@ -24,13 +26,17 @@ const Category = props => {
 export default Category
 
 export const pageQuery = graphql`
-  query CategoryPage($slug: String!) {
+  query CategoryPage($slug: String!, $limit: Int!, $skip: Int!) {
     site {
       siteMetadata {
         title
       }
     }
-    allWordpressPost(filter: { categories: { slug: { eq: $slug } } }) {
+    allWordpressPost(
+      filter: { categories: { slug: { eq: $slug } } }
+      limit: $limit
+      skip: $skip
+    ) {
       totalCount
       edges {
         node {
diff --git a/src/templates/post.js b/src/templates/post.js
index 0f4004b..f3bdaf4 100644
--- a/src/templates/post.js
+++ b/src/templates/post.js
@@ -32,7 +32,7 @@ export const BlogPostTemplate = ({
                   <ul className="taglist">
                     {categories.map(category => (
                       <li key={`${category.slug}cat`}>
-                        <Link to={`/categories/${category.slug}/`}>
+                        <Link to={`/category/${category.slug}/`}>
                           {category.name}
                         </Link>
                       </li>
@@ -46,7 +46,7 @@ export const BlogPostTemplate = ({
                   <ul className="taglist">
                     {tags.map(tag => (
                       <li key={`${tag.slug}tag`}>
-                        <Link to={`/tags/${tag.slug}/`}>{tag.name}</Link>
+                        <Link to={`/tag/${tag.slug}/`}>{tag.name}</Link>
                       </li>
                     ))}
                   </ul>
diff --git a/src/templates/tag.js b/src/templates/tag.js
index 7758009..9ede039 100644
--- a/src/templates/tag.js
+++ b/src/templates/tag.js
@@ -3,6 +3,7 @@ import Helmet from 'react-helmet'
 import { graphql } from 'gatsby'
 import Layout from '../components/Layout'
 import PostList from '../components/PostList'
+import Pagination from '../components/Pagination'
 
 const Tag = props => {
   const { data, pageContext } = props
@@ -17,6 +18,7 @@ const Tag = props => {
     <Layout>
       <Helmet title={`${tag} | ${siteTitle}`} />
       <PostList posts={posts} title={title} />
+      <Pagination pageContext={pageContext} />
     </Layout>
   )
 }
@@ -24,13 +26,17 @@ const Tag = props => {
 export default Tag
 
 export const pageQuery = graphql`
-  query TagPage($slug: String!) {
+  query TagPage($slug: String!, $limit: Int!, $skip: Int!) {
     site {
       siteMetadata {
         title
       }
     }
-    allWordpressPost(filter: { tags: { slug: { eq: $slug } } }) {
+    allWordpressPost(
+      filter: { tags: { slug: { eq: $slug } } }
+      limit: $limit
+      skip: $skip
+    ) {
       totalCount
       edges {
         node {