diff --git a/.eleventy.js b/.eleventy.js
index 66d4aa5..14c56ff 100644
--- a/.eleventy.js
+++ b/.eleventy.js
@@ -1,3 +1,5 @@
+const siteURL = "https://tarasis.net";
+
 const fs = require("fs-extra");
 const sass = require("sass");
 const { promisify } = require("util");
@@ -14,6 +16,9 @@ const description = require("eleventy-plugin-description");
 const pluginRss = require("@11ty/eleventy-plugin-rss");
 const UpgradeHelper = require("@11ty/eleventy-upgrade-help");
 const xmlFiltersPlugin = require("eleventy-xml-plugin");
+const yaml = require("js-yaml");
+const syntaxHighlight = require("@11ty/eleventy-plugin-syntaxhighlight");
+
 
 const inspect = require("node:util").inspect;
 
@@ -25,6 +30,9 @@ const indexify = (url) => url.replace(/(\/[^.]*)$/, "$1index.html");
 module.exports = function (eleventyConfig) {
     let pathPrefix = "/";
 
+    eleventyConfig.addDataExtension("yaml", contents => yaml.load(contents));
+    eleventyConfig.addDataExtension("yml", contents => yaml.load(contents));
+
     eleventyConfig.addPlugin(pluginRss);
     //Blog excerpts
     eleventyConfig.addPlugin(description);
@@ -39,7 +47,32 @@ module.exports = function (eleventyConfig) {
     });
     // TODO https://www.npmjs.com/package/eleventy-plugin-meta-generator
     // Eleventy Syntax Highlighting (https://www.11ty.dev/docs/plugins/syntaxhighlight/)
-    eleventyConfig.addPlugin(require("@11ty/eleventy-plugin-syntaxhighlight"));
+    // eleventyConfig.addPlugin(require("@11ty/eleventy-plugin-syntaxhighlight"));
+    eleventyConfig.addPlugin(syntaxHighlight, {
+
+        alwaysWrapLineHighlights: true,
+                // Change which Eleventy template formats use syntax highlighters
+        // templateFormats: ["*"], // default
+
+        // Use only a subset of template types (11ty.js added in v4.0.0)
+        // templateFormats: ["liquid", "njk", "md", "11ty.js"],
+
+        // init callback lets you customize Prism
+        // init: function({ Prism }) {
+        //   Prism.languages.myCustomLanguage = /* */;
+        // },
+
+        // Added in 3.1.1, add HTML attributes to the <pre> or <code> tags
+        preAttributes: {
+          tabindex: 0,
+
+          // Added in 4.1.0 you can use callback functions too
+          "data-language": function({ language, content, options }) {
+            return language;
+          }
+        },
+        codeAttributes: {},
+      });
 
     eleventyConfig.addPlugin(xmlFiltersPlugin);
 
@@ -74,13 +107,22 @@ module.exports = function (eleventyConfig) {
     //     return collectionApi.getFilteredByGlob("./src/_posts/**/*.md");
     // });
 
+    eleventyConfig.addCollection("drafts", (collection) =>
+    collection
+        .getFilteredByGlob("./src/_drafts/**/*")
+        .sort((a, b) => a.data.weight - b.data.weight)
+)   ;
+
+
     eleventyConfig.addCollection("tags", (collection) => {
         let tags = new Set();
 
         collection.getAll().forEach((item) => {
             if ("tags" in item.data) {
-                for (const tag of item.data.tags) {
-                    tags.add(tag);
+                if (item.data.tags != undefined) {
+                    for (const tag of item.data.tags) {
+                        tags.add(tag);
+                    }
                 }
             }
         });
@@ -88,6 +130,22 @@ module.exports = function (eleventyConfig) {
         return [...tags];
     });
 
+    eleventyConfig.addCollection("categories", (collection) => {
+        let categories = new Set();
+
+        collection.getAll().forEach((item) => {
+            if ("category" in item.data) {
+                if (item.data.category != undefined) {
+                     for (const category of item.data.category) {
+                        categories.add(category);
+                    }
+                }
+            }
+        });
+
+        return [...categories];
+    });
+
     // Filters
 
     // eleventyConfig.addFilter("markdownify", (str) => {
@@ -123,7 +181,6 @@ module.exports = function (eleventyConfig) {
         require("moment")(date).format(format)
     );
 
-    // eleventyConfig.addFilter("absolute_url", relativeURL);
     eleventyConfig.addLiquidFilter("toUTCString", (date) => {
         const utc = date.toUTCString();
         return moment.utc(utc).format("MMMM Do YYYY");
@@ -131,8 +188,6 @@ module.exports = function (eleventyConfig) {
 
     eleventyConfig.addFilter("number_of_words", numberOfWords);
 
-    // eleventyConfig.addFilter("absolute_url", relativeUrl);
-
     // eleventyConfig.addShortcode("where_exp", function (item, exp) {
     //     console.log(exp);
     //     return eval(exp);
@@ -146,6 +201,8 @@ module.exports = function (eleventyConfig) {
         return inspect(obj, {sorted: true});
       });
 
+    eleventyConfig.addFilter('group_by', groupBy)
+
     eleventyConfig.addLayoutAlias(
         "archive-taxonomy",
         "layouts/archive-taxonomy.html"
@@ -164,6 +221,7 @@ module.exports = function (eleventyConfig) {
     eleventyConfig.addLayoutAlias("tag", "layouts/tag.html");
     eleventyConfig.addLayoutAlias("tags", "layouts/tags.html");
     eleventyConfig.addLayoutAlias("gallery", "layouts/gallery");
+    eleventyConfig.addLayoutAlias("drafts", "layouts/drafts");
 
     // Passthrough copy
     // don't use .gitignore (allows compiling sass to css into a monitored folder WITHOUT committing it to repo)
@@ -303,13 +361,16 @@ module.exports = function (eleventyConfig) {
     // );
 
     eleventyConfig.addFilter("relative_url", relativeURLALT);
-    eleventyConfig.addFilter("absolute_url", relativeURLALT);
+    eleventyConfig.addFilter("absolute_url", absoluteUrl);
 
     return {
         templateFormats: ["html", "liquid", "md", "njk"],
 
         pathPrefix,
 
+        environment: "production",
+
+        // absolute_url: "https://tarasis.net/",
         passthroughFileCopy: true,
 
         dir: {
@@ -412,3 +473,32 @@ function relativeURLALT(url, pathPrefix = undefined) {
     }`;
     return relativePath;
 }
+
+function absoluteUrl(url) {
+    if (url !== undefined) {
+        return siteURL + url
+    } else {
+        return siteURL
+    }
+}
+
+function groupBy(array, key) {
+    const get = entry => key.split('.').reduce((acc, key) => acc[key], entry)
+
+    const map = array.reduce((acc, entry) => {
+      const value = get(entry)
+
+      if (typeof acc[value] === 'undefined') {
+        acc[value] = []
+      }
+
+      acc[value].push(entry)
+      return acc
+    }, {})
+
+    return Object.keys(map).reduce(
+      (acc, key) => [...acc, { name: key, items: map[key] }],
+      []
+    )
+  }
+
diff --git a/eleventy-external-links-transform.js b/eleventy-external-links-transform.js
new file mode 100644
index 0000000..b6ea3b6
--- /dev/null
+++ b/eleventy-external-links-transform.js
@@ -0,0 +1,60 @@
+// Credits 🙇 for original ideas to:
+// Fork of https://github.com/vimtor/eleventy-plugin-external-links
+// css.gg SVG icon https://github.com/astrit/css.gg/blob/master/icons/svg/external.svg
+
+const { parse, HTMLElement } = require("node-html-parser");
+const { extname } = require("path");
+
+module.exports = eleventyConfig => {
+  const options = {
+    name: "external-links",
+    regex: new RegExp("^(([a-z]+:)|(//))", "i"),
+    target: "_blank",
+    rel: "noopener noreferrer nofollow",
+    extensions: [".html"],
+  };
+
+  eleventyConfig.addTransform(options.name, (content, outputPath) => {
+    if (outputPath && options.extensions.includes(extname(outputPath))) {
+      const root = parse(content);
+      const links = root.querySelectorAll("a");
+      links
+        .filter(link => {
+          const href = link.getAttribute("href");
+          return (
+            href &&
+            options.regex.test(href) &&
+            !link.getAttribute("rel") &&
+            !link.getAttribute("target")
+          );
+        })
+        .forEach(link => {
+          link.setAttribute("target", options.target);
+          link.setAttribute("rel", options.rel);
+
+          const srText = new HTMLElement("span", { class: "sr-only" });
+          srText.textContent = "(opens in a new window)";
+
+          const icon = new HTMLElement(
+            "svg",
+            {},
+            `viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true"`
+          );
+          icon.set_content(`
+<path
+  d="M15.6396 7.02527H12.0181V5.02527H19.0181V12.0253H17.0181V8.47528L12.1042 13.3892L10.6899 11.975L15.6396 7.02527Z"
+  fill="currentColor"
+/>
+<path
+  d="M10.9819 6.97473H4.98193V18.9747H16.9819V12.9747H14.9819V16.9747H6.98193V8.97473H10.9819V6.97473Z"
+  fill="currentColor"
+/>`);
+          link.appendChild(srText);
+          link.appendChild(icon);
+        });
+
+      return root.toString();
+    }
+    return content;
+  });
+};
diff --git a/itemdata.txt b/itemdata.txt
new file mode 100644
index 0000000..3c4b422
--- /dev/null
+++ b/itemdata.txt
@@ -0,0 +1,1316 @@
+{
+  authors: {
+    robert_mcgovern: {
+      name: 'Robert McGovern',
+      web: 'https://tarasis.net',
+      email: 'rob@tarasis.net',
+      bio: '',
+      avatar: 'bio-photo-2.jpg',
+      twitter: 'tarasis'
+    }
+  },
+  navigation: { main: [ [Object], [Object], [Object], [Object] ] },
+  site: {
+    theme: 'minimal-mistakes-jekyll',
+    minimal_mistakes_skin: 'neon',
+    locale: 'en-US',
+    title: 'TDN: RMCG',
+    title_separator: '-',
+    name: 'Robert McGovern',
+    description: 'Random Things',
+    url: 'https://tarasis.net',
+    baseurl: '',
+    repository: null,
+    teaser: null,
+    logo: '/assets/images/apple-touch-icon.png',
+    masthead_title: '',
+    subtitle: '👨‍💻 🚶‍♂️ 💭 🤯',
+    breadcrumbs: false,
+    breadcrumb_home_label: 'Home',
+    breadcrumb_separator: '>',
+    words_per_minute: 200,
+    head_scripts: [ '/assets/js/progress.js', '/assets/js/scroll-to-top.js' ],
+    comments: {
+      provider: 'disqus',
+      disqus: [Object],
+      discourse: [Object],
+      facebook: [Object],
+      utterances: [Object]
+    },
+    staticman: {
+      allowedFields: [Array],
+      branch: null,
+      commitMessage: 'New comment by {fields.name}',
+      filename: 'comment-{@timestamp}',
+      format: 'yml',
+      moderation: true,
+      path: '_data/comments/{options.slug}',
+      requiredFields: [Array],
+      transforms: [Object],
+      generatedFields: [Object],
+      endpoint: null
+    },
+    atom_feed: { path: null },
+    search: true,
+    search_full_content: true,
+    search_provider: 'lunr',
+    algolia: {
+      application_id: 'F5FF4IDLYX',
+      index_name: 'tarasis-blog',
+      search_only_api_key: 'ed656902b5bdd356f885bf9d99635fc1',
+      powered_by: true
+    },
+    google_site_verification: null,
+    bing_site_verification: null,
+    yandex_site_verification: null,
+    twitter: { username: 'tarasis' },
+    facebook: { username: 'tarasis', app_id: null, publisher: null },
+    og_image: '/assets/images/bio-photo.jpg',
+    social: { type: null, name: null, links: null },
+    analytics: { provider: false, google: [Object] },
+    author: {
+      name: 'Robert McGovern',
+      avatar: '/assets/images/bio-photo.jpg',
+      bio: 'Wannabe field researcher for the Hitchhikers Guide to the Galaxy',
+      location: 'ZZ9 Plural Z Alpha',
+      links: [Array]
+    },
+    footer: { links: [Array] },
+    include: [ '.htaccess', '_pages' ],
+    exclude: [
+      '*.sublime-project', '*.sublime-workspace',
+      'vendor',            '.asset-cache',
+      '.bundle',           '.jekyll-assets-cache',
+      '.jekyll-cache',     '.sass-cache',
+      'assets/js/plugins', 'assets/js/_main.js',
+      'assets/js/vendor',  'Capfile',
+      'CHANGELOG',         'config',
+      'Gemfile',           'Gruntfile.js',
+      'gulpfile.js',       'LICENSE',
+      'log',               'node_modules',
+      'package.json',      'Rakefile',
+      'README',            'tmp'
+    ],
+    keep_files: [ '.git', '.svn' ],
+    encoding: 'utf-8',
+    markdown_ext: 'markdown,mkdown,mkdn,mkd,md',
+    strict_front_matter: true,
+    liquid: { error_mode: 'strict' },
+    markdown: 'kramdown',
+    highlighter: 'rouge',
+    lsi: false,
+    excerpt_separator: '<!--more-->',
+    incremental: false,
+    kramdown: {
+      input: 'GFM',
+      hard_wrap: false,
+      auto_ids: true,
+      footnote_nr: 1,
+      entity_output: 'as_char',
+      toc_levels: '1..6',
+      smart_quotes: 'lsquo,rsquo,ldquo,rdquo',
+      enable_coderay: false
+    },
+    sass: { sass_dir: '_sass', style: 'compressed' },
+    permalink: '/:year/:month/:day/:title/',
+    paginate: 10,
+    paginate_path: '/page:num/',
+    timezone: null,
+    plugins: [
+      'jekyll-archives',
+      'jekyll-paginate',
+      'jekyll-sitemap',
+      'jekyll-gist',
+      'jekyll-feed',
+      'jemoji',
+      'jekyll-include-cache',
+      'jekyll-gist'
+    ],
+    whitelist: [
+      'jekyll-archives',
+      'jekyll-paginate',
+      'jekyll-sitemap',
+      'jekyll-gist',
+      'jekyll-feed',
+      'jemoji',
+      'jekyll-include-cache',
+      'jekyll-gist'
+    ],
+    category_archive: { type: 'liquid', path: '/categories/' },
+    tag_archive: { type: 'liquid', path: '/tags/' },
+    compress_html: { clippings: 'all', ignore: [Object] },
+    collections: { recipes: [Object], pets: [Object], portfolio: [Object] },
+    defaults: { posts: [Object], pages: [Object], recipies: [Object] },
+    post_ext: 'markdown',
+    page_ext: 'html',
+    post_layout: 'single',
+    page_layout: 'page',
+    titlecase: true
+  },
+  eleventy: {
+    version: '2.0.0',
+    generator: 'Eleventy v2.0.0',
+    env: {
+      source: 'cli',
+      config: '/Users/tarasis/Programming/Websites/tarasis.net/.eleventy.js',
+      root: '/Users/tarasis/Programming/Websites/tarasis.net',
+      isServerless: false
+    }
+  },
+  pkg: {
+    name: 'tarasis.net',
+    version: '2.0.0',
+    description: 'Second generation of site using 11ty for building but using Jekyll theme Minimal Mistakes (with mods to make it work)',
+    main: 'index.js',
+    scripts: {
+      'watch:sass': 'sass --watch src/_sass/**/*.scss dist/assets/styles/minimal-mistakes.css',
+      'build:sass': 'sass --style=compressed src/_sass/minimal-mistakes.scss dist/assets/styles/minimal-mistakes.css',
+      'build:mysass': 'sass  --style=compressed src/assets/css/main.scss dist/assets/css/main.css',
+      'watch:eleventy': 'eleventy --serve',
+      'build:eleventy': 'eleventy',
+      start: 'npm-run-all build:sass --parallel watch:*',
+      build: 'npm-run-all build:*',
+      debug: 'DEBUG=Eleventy:* eleventy'
+    },
+    repository: {
+      type: 'git',
+      url: 'forgejo@git.tarasis.net:tarasis/tarasis.net.git'
+    },
+    keywords: [ 'website', 'blog', '11ty', 'jekyll' ],
+    author: 'Robert McGovern et all',
+    license: 'MIT',
+    devDependencies: { '@11ty/eleventy': '^2.0.0-beta.1' },
+    dependencies: {
+      '@11ty/eleventy-navigation': '^0.3.5',
+      '@11ty/eleventy-plugin-rss': '^1.2.0',
+      '@11ty/eleventy-plugin-syntaxhighlight': '^4.2.0',
+      '@11ty/eleventy-upgrade-help': '^2.0.5',
+      autoprefixer: '^10.4.13',
+      const: '^1.0.0',
+      'eleventy-load': '^0.3.1',
+      'eleventy-load-css': '^0.3.0',
+      'eleventy-load-file': '^0.1.0',
+      'eleventy-load-html': '^0.1.1',
+      'eleventy-load-sass': '^0.1.2',
+      'eleventy-plugin-description': '^0.1.5',
+      'eleventy-plugin-toc': '^1.1.5',
+      'eleventy-xml-plugin': '^0.1.0',
+      'fs-extra': '^11.1.0',
+      'js-yaml': '^4.1.0',
+      'markdown-it': '^13.0.1',
+      'markdown-it-anchor': '^8.6.6',
+      'markdown-it-attrs': '^4.1.6',
+      'markdown-it-container': '^3.0.0',
+      'markdown-it-fontawesome': '^0.3.0',
+      'markdown-it-footnote': '^3.0.3',
+      markdownify: '^0.1.0',
+      moment: '^2.29.4',
+      'npm-run-all': '^4.1.5',
+      postcss: '^8.4.21',
+      sass: '^1.57.1',
+      slugify: '^1.6.5'
+    }
+  },
+  layout: 'single',
+  permalink: "/{{ page.date | date: 'Y/M/D' }}/{{ page.fileSlug }}/",
+  author_profile: true,
+  read_time: true,
+  share: true,
+  related: true,
+  title: 'Day 7 - Taking a break',
+  date: 2019-06-03T20:20:16.000Z,
+  category: null,
+  tags: [ 'camino', 'caminodesantiago', 'jakobsweg' ],
+  page: {
+    date: 2019-06-03T20:20:16.000Z,
+    inputPath: './src/_posts/2019-06-03-Day7.md',
+    fileSlug: 'Day7',
+    filePathStem: '/_posts/Day7',
+    outputFileExtension: 'html',
+    templateSyntax: 'liquid,md',
+    url: '/2019/6/3/Day7/',
+    outputPath: 'dist/2019/6/3/Day7/index.html'
+  },
+  collections: {
+    all: [
+      [Object], [Object], [Object], [Object],
+      [Object], [Object], [Object], [Object],
+      [Object], [Object], [Object], [Object],
+      [Object], [Object], [Object], [Object],
+      [Object], [Object], [Object], [Object],
+      [Object], [Object], [Object], [Object],
+      [Object], [Object], [Object], [Object],
+      [Object], [Object], [Object], [Object],
+      [Object], [Object], [Object], [Object],
+      [Object], [Object], [Object], [Object],
+      [Object], [Object], [Object], [Object],
+      [Object], [Object], [Object], [Object]
+    ],
+    life: [ [Object], [Object], [Object], [Object] ],
+    camino: [
+      [Object], [Object], [Object],
+      [Object], [Object], [Object],
+      [Object], [Object], [Object],
+      [Object], [Object], [Object],
+      [Object], [Object], [Object],
+      [Object], [Object], [Object],
+      [Object]
+    ],
+    caminodesantiago: [
+      [Object], [Object], [Object],
+      [Object], [Object], [Object],
+      [Object], [Object], [Object],
+      [Object], [Object], [Object],
+      [Object], [Object], [Object],
+      [Object], [Object], [Object],
+      [Object]
+    ],
+    webdev: [ [Object], [Object], [Object], [Object], [Object], [Object] ],
+    javascript: [ [Object], [Object] ],
+    freecodecamp: [ [Object] ],
+    css: [ [Object], [Object] ],
+    site: [ [Object], [Object], [Object], [Object] ],
+    frontendmentor: [ [Object], [Object] ],
+    programming: [ [Object], [Object], [Object], [Object], [Object] ],
+    ios: [ [Object], [Object], [Object], [Object] ],
+    swift: [ [Object], [Object], [Object], [Object] ],
+    'coding-challenges': [ [Object], [Object], [Object] ],
+    jakobsweg: [
+      [Object], [Object],
+      [Object], [Object],
+      [Object], [Object],
+      [Object], [Object],
+      [Object], [Object],
+      [Object], [Object],
+      [Object], [Object],
+      [Object], [Object],
+      [Object]
+    ],
+    caminofrances: [ [Object] ],
+    personal: [ [Object], [Object] ],
+    webdevelopment: [ [Object] ],
+    learning: [ [Object] ],
+    html: [ [Object] ],
+    swiftui: [ [Object] ],
+    pages: [
+      [Object], [Object],
+      [Object], [Object],
+      [Object], [Object],
+      [Object], [Object],
+      [Object], [Object]
+    ],
+    posts: [
+      [Object], [Object], [Object],
+      [Object], [Object], [Object],
+      [Object], [Object], [Object],
+      [Object], [Object], [Object],
+      [Object], [Object], [Object],
+      [Object], [Object], [Object],
+      [Object], [Object], [Object],
+      [Object], [Object], [Object]
+    ],
+    projects: [],
+    tags: [
+      'life',              'camino',
+      'caminodesantiago',  'webdev',
+      'javascript',        'freecodecamp',
+      'css',               'site',
+      'frontendmentor',    'programming',
+      'ios',               'swift',
+      'coding-challenges', 'jakobsweg',
+      'caminofrances',     'personal',
+      'webdevelopment',    'learning',
+      'html',              'swiftui'
+    ]
+  },
+  siblings: {
+    next: {
+      template: [Template],
+      data: [Object],
+      page: [Object],
+      inputPath: './src/_posts/2019-06-04-Day%208.md',
+      fileSlug: 'Day%208',
+      filePathStem: '/_posts/Day%208',
+      date: 2019-06-04T19:30:37.000Z,
+      outputPath: 'dist/2019/6/4/Day%208/index.html',
+      url: '/2019/6/4/Day%208/',
+      templateContent: [Getter/Setter],
+      content: [Getter]
+    },
+    prev: {
+      template: [Template],
+      data: [Object],
+      page: [Object],
+      inputPath: './src/_posts/2019-06-02-day6.md',
+      fileSlug: 'day6',
+      filePathStem: '/_posts/day6',
+      date: 2019-06-02T16:49:22.000Z,
+      outputPath: 'dist/2019/6/2/day6/index.html',
+      url: '/2019/6/2/day6/',
+      templateContent: [Getter/Setter],
+      content: [Getter]
+    }
+  }
+
+----
+
+{
+  template: Template {
+    _config: TemplateConfig {
+      userConfig: [UserConfig],
+      overrides: {},
+      projectConfigPaths: [Array],
+      customRootConfig: null,
+      rootConfig: [Object],
+      hasConfigMerged: true,
+      logger: [ConsoleLogger],
+      _usesGraph: [GlobalDependencyMap],
+      config: [Object],
+      verbose: true
+    },
+    inputPath: './src/_drafts/swiftui.md',
+    inputDir: 'src',
+    parsed: {
+      root: '',
+      dir: './src/_drafts',
+      base: 'swiftui.md',
+      ext: '.md',
+      name: 'swiftui'
+    },
+    extraOutputSubdirectory: '',
+    outputDir: 'dist',
+    _extensionMap: EleventyExtensionMap {
+      eleventyConfig: [TemplateConfig],
+      _config: [Object],
+      formatKeys: [Array],
+      unfilteredFormatKeys: [Array],
+      _extensionToKeyMap: [Object],
+      validTemplateLanguageKeys: [Array],
+      passthroughCopyKeys: [],
+      _spiderJsDepsCache: {},
+      _engineManager: [TemplateEngineManager]
+    },
+    linters: [],
+    transforms: [],
+    templateData: TemplateData {
+      eleventyConfig: [TemplateConfig],
+      config: [Object],
+      benchmarks: [Object],
+      inputDirNeedsCheck: false,
+      inputDir: 'src',
+      dataDir: 'src/_data',
+      rawImports: [Object],
+      globalData: [Promise],
+      templateDirectoryData: [Object],
+      _fsExistsCache: [FSExistsCache],
+      initialGlobalData: [TemplateDataInitialGlobalData],
+      _extensionMap: [EleventyExtensionMap],
+      _env: [Object],
+      fileSystemSearch: [FileSystemSearch],
+      configApiGlobalData: [Promise],
+      pathCache: [Array]
+    },
+    isVerbose: true,
+    isDryRun: false,
+    writeCount: 0,
+    fileSlug: TemplateFileSlug {
+      inputPath: '_drafts/swiftui.md',
+      cleanInputPath: '_drafts/swiftui.md',
+      dirs: [Array],
+      parsed: [Object],
+      filenameNoExt: 'swiftui'
+    },
+    fileSlugStr: 'swiftui',
+    filePathStem: '/_drafts/swiftui',
+    outputFormat: 'fs',
+    behavior: TemplateBehavior {
+      render: true,
+      write: true,
+      outputFormat: 'fs',
+      config: [Object]
+    },
+    serverlessUrls: null,
+    _logger: ConsoleLogger { _isVerbose: true, outputStream: [Readable] },
+    _templateRender: TemplateRender {
+      _config: [Object],
+      engineNameOrPath: './src/_drafts/swiftui.md',
+      inputDir: 'src',
+      includesDir: 'src/_includes',
+      parseMarkdownWith: 'liquid',
+      parseHtmlWith: 'liquid',
+      _extensionMap: [EleventyExtensionMap],
+      _engineName: 'md',
+      _engine: [Markdown],
+      useMarkdown: true
+    },
+    inputContent: Promise {
+      '---\n' +
+        'layout: single\n' +
+        'author_profile: true\n' +
+        'read_time: true\n' +
+        'share: true\n' +
+        'related: true\n' +
+        'title: SwiftUI\n' +
+        'tags: [swiftui,programming,ios, swift]\n' +
+        'category: Programming\n' +
+        '---\n' +
+        '\n' +
+        "Its been a long while since I sat and did programming, but between a life situation and the new technology from Apple for creating user interfaces (SwiftUI), I've been inspired to pickup again an idea I've been kicking around for 10 years.\n" +
+        '\n' +
+        '<!--more-->\n' +
+        '\n' +
+        'SwiftUI simplifies designing interfaces\n' +
+        'Provides a fast means of iterating design\n' +
+        'Able to quickly see results\n' +
+        'Easy to mock in data\n' +
+        '\n' +
+        'Buggy.\n' +
+        'Filled 3 bugs so far.\n' +
+        '\n' +
+        'Swift:\n' +
+        '\n' +
+        '{% highlight swift %}\n' +
+        '     override public func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {\n' +
+        '        super.touchesBegan(touches, with: event)\n' +
+        '        currentTouchPosition = touches.first?.location(in: self)\n' +
+        '\n' +
+        '        NSObject.cancelPreviousPerformRequests(withTarget: self)\n' +
+        '    }\n' +
+        '{% endhighlight %}\n' +
+        '\n' +
+        'Swift:\n' +
+        '\n' +
+        '```swift\n' +
+        'def print_hi(name)\n' +
+        '  puts "Hi, #{name}"\n' +
+        'end\n' +
+        "print_hi('Tom')\n" +
+        "#=> prints 'Hi, Tom' to STDOUT.\n" +
+        '```\n' +
+        '\n' +
+        'Bash: \n' +
+        '```bash\n' +
+        '\n' +
+        '#!/usr/bin/env bash\n' +
+        'set -e # halt script on error\n' +
+        '\n' +
+        'echo\n' +
+        'echo "------------------------------------------------------------------------------------------------------------------------"\n' +
+        'if [ "$TRAVIS_PULL_REQUEST" != "false" -a "$TRAVIS_BRANCH" == "comments" ]; then\n' +
+        '\n' +
+        '    echo\n' +
+        '    echo "Building site for pull request for $TRAVIS_BRANCH..."\n' +
+        '    bundle exec jekyll build --config _config.yml --source . --destination ./docs\n' +
+        '    echo "Site built into /docs"\n' +
+        '\n' +
+        '    echo\n' +
+        '    echo "Proofing links"\n' +
+        '    bundle exec htmlproofer ./docs --disable-external --allow_hash_href\n' +
+        '    echo "Proofing links complete"\n' +
+        '    echo\n' +
+        '    echo "------------------------------------------------------------------------------------------------------------------------"\n' +
+        '\n' +
+        '    exit 0\n' +
+        '\n' +
+        'elif [ "$TRAVIS_BRANCH" == "master" ]; then\n' +
+        '\n' +
+        '    echo\n' +
+        '    echo "Building site for $TRAVIS_BRANCH..."\n' +
+        '    bundle exec jekyll build --config _config.yml --source . --destination ./docs\n' +
+        '    echo "Site built into /docs"\n' +
+        '\n' +
+        '    echo\n' +
+        '    echo "Proofing links"\n' +
+        '    bundle exec htmlproofer ./docs --disable-external --allow_hash_href\n' +
+        '    echo "Proofing links complete"\n' +
+        '    echo\n' +
+        '    echo "------------------------------------------------------------------------------------------------------------------------"\n' +
+        '\n' +
+        '    exit 0\n' +
+        '\n' +
+        'else\n' +
+        '\n' +
+        '    echo\n' +
+        '    echo "Build not triggered internally"\n' +
+        '    echo\n' +
+        '    echo "------------------------------------------------------------------------------------------------------------------------"\n' +
+        '    exit 0\n' +
+        '\n' +
+        'fi\n' +
+        '```\n' +
+        '\n' +
+        'Ruby:\n' +
+        '\n' +
+        '{% highlight ruby %}\n' +
+        'require "gem"\n' +
+        '\n' +
+        'number = 0\n' +
+        'regexp = /[abc]/\n' +
+        '\n' +
+        '# This is a comment\n' +
+        'class Person\n' +
+        '  \n' +
+        '  attr_accessor :name\n' +
+        '  \n' +
+        '  def initialize(attributes = {})\n' +
+        '    @name = attributes[:name]\n' +
+        '  end\n' +
+        '  \n' +
+        '  def self.greet\n' +
+        '    "hello"\n' +
+        '  end\n' +
+        'end\n' +
+        '\n' +
+        'person1 = Person.new(:name => "Chris")\n' +
+        'puts "#{Person::greet} #{person1.name}\\n"\n' +
+        '{% endhighlight %}\n' +
+        '\n' +
+        'html:\n' +
+        '\n' +
+        '```html\n' +
+        '<!DOCTYPE html>\n' +
+        '<html>\n' +
+        '\n' +
+        '    <head>\n' +
+        '        <title>Title</title>\n' +
+        '    </head>\n' +
+        '\n' +
+        '    <body>\n' +
+        '        <h1 id="heading">Heading</h1>\n' +
+        '        <p class="class">This is an example paragraph.</p>\n' +
+        '    </body>\n' +
+        '\n' +
+        '</html>\n' +
+        '```\n' +
+        '\n' +
+        'css:\n' +
+        '```css\n' +
+        '.highlight pre {\n' +
+        '  width: 100%;\n' +
+        '}\n' +
+        '\n' +
+        '.highlight .hll {\n' +
+        '  background-color: $base06;\n' +
+        '}\n' +
+        '.highlight {\n' +
+        '  .c {\n' +
+        '    /* Comment */\n' +
+        '    color: $base04;\n' +
+        '  }\n' +
+        '}\n' +
+        '```\n' +
+        '\n' +
+        'Javascript:\n' +
+        '\n' +
+        '```javascript\n' +
+        '$(document).ready(function() {\n' +
+        '  // FitVids init\n' +
+        '  $("#main").fitVids();\n' +
+        '\n' +
+        '  // Sticky sidebar\n' +
+        '  var stickySideBar = function() {\n' +
+        '    var show =\n' +
+        '      $(".author__urls-wrapper button").length === 0\n' +
+        '        ? $(window).width() > 1024 // width should match $large Sass variable\n' +
+        '        : !$(".author__urls-wrapper button").is(":visible");\n' +
+        '    if (show) {\n' +
+        '      // fix\n' +
+        '      $(".sidebar").addClass("sticky");\n' +
+        '    } else {\n' +
+        '      // unfix\n' +
+        '      $(".sidebar").removeClass("sticky");\n' +
+        '    }\n' +
+        '  };\n' +
+        '}\n' +
+        '```\n' +
+        '\n' +
+        '<p>notice</p>{: .notice} \n' +
+        '<p>primary</p>{: .notice--primary}\n' +
+        '<p>info</p>{: .notice--info}\n' +
+        '<p>warning</p>{: .notice--warning}\n' +
+        '<p>success</p>{: .notice--success}\n' +
+        '<p>danger</p>{: .notice--danger}\n' +
+        '\n' +
+        '<div class="notice--success" markdown="1">\n' +
+        '  # Headline for the Notice\n' +
+        '  <br>\n' +
+        '  Text for the notice\n' +
+        '</div>'
+    },
+    readingPromise: Promise { [Object] },
+    _frontMatterDataCache: Promise { [Object] },
+    _frontMatter: {
+      content: '\n' +
+        "Its been a long while since I sat and did programming, but between a life situation and the new technology from Apple for creating user interfaces (SwiftUI), I've been inspired to pickup again an idea I've been kicking around for 10 years.\n" +
+        '\n' +
+        '<!--more-->\n' +
+        '\n' +
+        'SwiftUI simplifies designing interfaces\n' +
+        'Provides a fast means of iterating design\n' +
+        'Able to quickly see results\n' +
+        'Easy to mock in data\n' +
+        '\n' +
+        'Buggy.\n' +
+        'Filled 3 bugs so far.\n' +
+        '\n' +
+        'Swift:\n' +
+        '\n' +
+        '{% highlight swift %}\n' +
+        '     override public func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {\n' +
+        '        super.touchesBegan(touches, with: event)\n' +
+        '        currentTouchPosition = touches.first?.location(in: self)\n' +
+        '\n' +
+        '        NSObject.cancelPreviousPerformRequests(withTarget: self)\n' +
+        '    }\n' +
+        '{% endhighlight %}\n' +
+        '\n' +
+        'Swift:\n' +
+        '\n' +
+        '```swift\n' +
+        'def print_hi(name)\n' +
+        '  puts "Hi, #{name}"\n' +
+        'end\n' +
+        "print_hi('Tom')\n" +
+        "#=> prints 'Hi, Tom' to STDOUT.\n" +
+        '```\n' +
+        '\n' +
+        'Bash: \n' +
+        '```bash\n' +
+        '\n' +
+        '#!/usr/bin/env bash\n' +
+        'set -e # halt script on error\n' +
+        '\n' +
+        'echo\n' +
+        'echo "---------------------------------------------------------------------------------------------------------------------"\n' +
+        'if [ "$TRAVIS_PULL_REQUEST" != "false" -a "$TRAVIS_BRANCH" == "comments" ]; then\n' +
+        '\n' +
+        '    echo\n' +
+        '    echo "Building site for pull request for $TRAVIS_BRANCH..."\n' +
+        '    bundle exec jekyll build --config _config.yml --source . --destination ./docs\n' +
+        '    echo "Site built into /docs"\n' +
+        '\n' +
+        '    echo\n' +
+        '    echo "Proofing links"\n' +
+        '    bundle exec htmlproofer ./docs --disable-external --allow_hash_href\n' +
+        '    echo "Proofing links complete"\n' +
+        '    echo\n' +
+        '    echo "------------------------------------------------------------------------------------------------------------------------"\n' +
+        '\n' +
+        '    exit 0\n' +
+        '\n' +
+        'elif [ "$TRAVIS_BRANCH" == "master" ]; then\n' +
+        '\n' +
+        '    echo\n' +
+        '    echo "Building site for $TRAVIS_BRANCH..."\n' +
+        '    bundle exec jekyll build --config _config.yml --source . --destination ./docs\n' +
+        '    echo "Site built into /docs"\n' +
+        '\n' +
+        '    echo\n' +
+        '    echo "Proofing links"\n' +
+        '    bundle exec htmlproofer ./docs --disable-external --allow_hash_href\n' +
+        '    echo "Proofing links complete"\n' +
+        '    echo\n' +
+        '    echo "------------------------------------------------------------------------------------------------------------------------"\n' +
+        '\n' +
+        '    exit 0\n' +
+        '\n' +
+        'else\n' +
+        '\n' +
+        '    echo\n' +
+        '    echo "Build not triggered internally"\n' +
+        '    echo\n' +
+        '    echo "------------------------------------------------------------------------------------------------------------------------"\n' +
+        '    exit 0\n' +
+        '\n' +
+        'fi\n' +
+        '```\n' +
+        '\n' +
+        'Ruby:\n' +
+        '\n' +
+        '{% highlight ruby %}\n' +
+        'require "gem"\n' +
+        '\n' +
+        'number = 0\n' +
+        'regexp = /[abc]/\n' +
+        '\n' +
+        '# This is a comment\n' +
+        'class Person\n' +
+        '  \n' +
+        '  attr_accessor :name\n' +
+        '  \n' +
+        '  def initialize(attributes = {})\n' +
+        '    @name = attributes[:name]\n' +
+        '  end\n' +
+        '  \n' +
+        '  def self.greet\n' +
+        '    "hello"\n' +
+        '  end\n' +
+        'end\n' +
+        '\n' +
+        'person1 = Person.new(:name => "Chris")\n' +
+        'puts "#{Person::greet} #{person1.name}\\n"\n' +
+        '{% endhighlight %}\n' +
+        '\n' +
+        'html:\n' +
+        '\n' +
+        '```html\n' +
+        '<!DOCTYPE html>\n' +
+        '<html>\n' +
+        '\n' +
+        '    <head>\n' +
+        '        <title>Title</title>\n' +
+        '    </head>\n' +
+        '\n' +
+        '    <body>\n' +
+        '        <h1 id="heading">Heading</h1>\n' +
+        '        <p class="class">This is an example paragraph.</p>\n' +
+        '    </body>\n' +
+        '\n' +
+        '</html>\n' +
+        '```\n' +
+        '\n' +
+        'css:\n' +
+        '```css\n' +
+        '.highlight pre {\n' +
+        '  width: 100%;\n' +
+        '}\n' +
+        '\n' +
+        '.highlight .hll {\n' +
+        '  background-color: $base06;\n' +
+        '}\n' +
+        '.highlight {\n' +
+        '  .c {\n' +
+        '    /* Comment */\n' +
+        '    color: $base04;\n' +
+        '  }\n' +
+        '}\n' +
+        '```\n' +
+        '\n' +
+        'Javascript:\n' +
+        '\n' +
+        '```javascript\n' +
+        '$(document).ready(function() {\n' +
+        '  // FitVids init\n' +
+        '  $("#main").fitVids();\n' +
+        '\n' +
+        '  // Sticky sidebar\n' +
+        '  var stickySideBar = function() {\n' +
+        '    var show =\n' +
+        '      $(".author__urls-wrapper button").length === 0\n' +
+        '        ? $(window).width() > 1024 // width should match $large Sass variable\n' +
+        '        : !$(".author__urls-wrapper button").is(":visible");\n' +
+        '    if (show) {\n' +
+        '      // fix\n' +
+        '      $(".sidebar").addClass("sticky");\n' +
+        '    } else {\n' +
+        '      // unfix\n' +
+        '      $(".sidebar").removeClass("sticky");\n' +
+        '    }\n' +
+        '  };\n' +
+        '}\n' +
+        '```\n' +
+        '\n' +
+        '<p>notice</p>{: .notice} \n' +
+        '<p>primary</p>{: .notice--primary}\n' +
+        '<p>info</p>{: .notice--info}\n' +
+        '<p>warning</p>{: .notice--warning}\n' +
+        '<p>success</p>{: .notice--success}\n' +
+        '<p>danger</p>{: .notice--danger}\n' +
+        '\n' +
+        '<div class="notice--success" markdown="1">\n' +
+        '  # Headline for the Notice\n' +
+        '  <br>\n' +
+        '  Text for the notice\n' +
+        '</div>',
+      data: [Object],
+      isEmpty: false,
+      excerpt: '\n' +
+        "Its been a long while since I sat and did programming, but between a life situation and the new technology from Apple for creating user interfaces (SwiftUI), I've been inspired to pickup again an idea I've been kicking around for 10 years.\n" +
+        '\n' +
+        '<!--more-->\n' +
+        '\n' +
+        'SwiftUI simplifies designing interfaces\n' +
+        'Provides a fast means of iterating design\n' +
+        'Able to quickly see results\n' +
+        'Easy to mock in data\n' +
+        '\n' +
+        'Buggy.\n' +
+        'Filled 3 bugs so far.\n' +
+        '\n' +
+        'Swift:\n' +
+        '\n' +
+        '{% highlight swift %}\n' +
+        '     override public func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {\n' +
+        '        super.touchesBegan(touches, with: event)\n' +
+        '        currentTouchPosition = touches.first?.location(in: self)\n' +
+        '\n' +
+        '        NSObject.cancelPreviousPerformRequests(withTarget: self)\n' +
+        '    }\n' +
+        '{% endhighlight %}\n' +
+        '\n' +
+        'Swift:\n' +
+        '\n' +
+        '```swift\n' +
+        'def print_hi(name)\n' +
+        '  puts "Hi, #{name}"\n' +
+        'end\n' +
+        "print_hi('Tom')\n" +
+        "#=> prints 'Hi, Tom' to STDOUT.\n" +
+        '```\n' +
+        '\n' +
+        'Bash: \n' +
+        '```bash\n' +
+        '\n' +
+        '#!/usr/bin/env bash\n' +
+        'set -e # halt script on error\n' +
+        '\n' +
+        'echo\n' +
+        'echo "'
+    },
+    _stats: Promise { [Stats] },
+    _dataCache: {
+      authors: [Object],
+      navigation: [Object],
+      'ui-text': [Object],
+      site: [Object],
+      eleventy: [Object],
+      pkg: [Object],
+      layout: 'single',
+      author_profile: true,
+      read_time: true,
+      share: true,
+      related: true,
+      title: 'SwiftUI',
+      tags: [Array],
+      category: 'Programming',
+      page: [Object],
+      collections: [Object]
+    },
+    _usePermalinkRoot: undefined
+  },
+  data: {
+    authors: { robert_mcgovern: [Object] },
+    navigation: { main: [Array] },
+    'ui-text': {
+      en: [Object],
+      'en-US': [Object],
+      'en-CA': [Object],
+      'en-GB': [Object],
+      'en-AU': [Object],
+      es: [Object],
+      'es-ES': [Object],
+      'es-CO': [Object],
+      fr: [Object],
+      'fr-FR': [Object],
+      'fr-BE': [Object],
+      'fr-CH': [Object],
+      tr: [Object],
+      'tr-TR': [Object],
+      pt: [Object],
+      'pt-PT': [Object],
+      'pt-BR': [Object],
+      it: [Object],
+      'it-IT': [Object],
+      zh: [Object],
+      'zh-CN': [Object],
+      'zh-SG': [Object],
+      'zh-TW': [Object],
+      'zh-HK': [Object],
+      de: [Object],
+      'de-DE': [Object],
+      'de-AT': [Object],
+      'de-CH': [Object],
+      'de-BE': [Object],
+      'de-LI': [Object],
+      'de-LU': [Object],
+      ne: [Object],
+      'ne-NP': [Object],
+      ko: [Object],
+      'ko-KR': [Object],
+      ru: [Object],
+      'ru-RU': [Object],
+      lt: [Object],
+      'lt-LT': [Object],
+      gr: [Object],
+      'gr-GR': [Object],
+      sv: [Object],
+      'sv-SE': [Object],
+      'sv-FI': [Object],
+      nl: [Object],
+      'nl-BE': [Object],
+      'nl-NL': [Object],
+      id: [Object],
+      'id-ID': [Object],
+      vi: [Object],
+      'vi-VN': [Object],
+      da: [Object],
+      'da-DK': [Object],
+      pl: [Object],
+      'pl-PL': [Object],
+      ja: [Object],
+      'ja-JP': [Object],
+      sk: [Object],
+      'sk-SK': [Object],
+      hu: [Object],
+      'hu-HU': [Object],
+      ro: [Object],
+      'ro-RO': [Object],
+      pa: [Object],
+      'pa-IN': [Object],
+      fa: [Object],
+      'fa-IR': [Object],
+      ml: [Object],
+      'ml-IN': [Object],
+      th: [Object],
+      'th-TH': [Object],
+      hi: [Object],
+      'hi-IN': [Object],
+      ca: [Object],
+      'ca-ES': [Object],
+      ga: [Object],
+      'ga-IE': [Object],
+      fi: [Object],
+      my: [Object],
+      'my-MM': [Object],
+      no: [Object],
+      'no-NB': [Object],
+      'no-NN': [Object],
+      he: [Object],
+      'he-IL': [Object],
+      ar: [Object],
+      'ar-SD': [Object],
+      'ar-SA': [Object],
+      'ar-AE': [Object],
+      'ar-EG': [Object]
+    },
+    site: {
+      theme: 'minimal-mistakes-jekyll',
+      minimal_mistakes_skin: 'neon',
+      locale: 'en-US',
+      title: 'TDN: RMCG',
+      title_separator: '-',
+      name: 'Robert McGovern',
+      description: 'Random Things',
+      url: 'https://tarasis.net',
+      baseurl: '',
+      repository: null,
+      teaser: null,
+      logo: '/assets/images/apple-touch-icon.png',
+      masthead_title: '',
+      subtitle: '👨‍💻 🚶‍♂️ 💭 🤯',
+      breadcrumbs: false,
+      breadcrumb_home_label: 'Home',
+      breadcrumb_separator: '>',
+      words_per_minute: 200,
+      head_scripts: [Array],
+      comments: [Object],
+      staticman: [Object],
+      atom_feed: [Object],
+      search: true,
+      search_full_content: true,
+      search_provider: 'lunr',
+      algolia: [Object],
+      google_site_verification: null,
+      bing_site_verification: null,
+      yandex_site_verification: null,
+      twitter: [Object],
+      facebook: [Object],
+      og_image: '/assets/images/bio-photo.jpg',
+      social: [Object],
+      analytics: [Object],
+      author: [Object],
+      footer: [Object],
+      include: [Array],
+      exclude: [Array],
+      keep_files: [Array],
+      encoding: 'utf-8',
+      markdown_ext: 'markdown,mkdown,mkdn,mkd,md',
+      strict_front_matter: true,
+      liquid: [Object],
+      markdown: 'kramdown',
+      highlighter: 'rouge',
+      lsi: false,
+      excerpt_separator: '<!--more-->',
+      incremental: false,
+      kramdown: [Object],
+      sass: [Object],
+      permalink: '/:year/:month/:day/:title/',
+      paginate: 10,
+      paginate_path: '/page:num/',
+      timezone: null,
+      plugins: [Array],
+      whitelist: [Array],
+      category_archive: [Object],
+      tag_archive: [Object],
+      compress_html: [Object],
+      collections: [Object],
+      defaults: [Object],
+      post_ext: 'markdown',
+      page_ext: 'html',
+      post_layout: 'single',
+      page_layout: 'page',
+      titlecase: true
+    },
+    eleventy: { version: '2.0.0', generator: 'Eleventy v2.0.0', env: [Object] },
+    pkg: {
+      name: 'tarasis.net',
+      version: '2.0.0',
+      description: 'Second generation of site using 11ty for building but using Jekyll theme Minimal Mistakes (with mods to make it work)',
+      main: 'index.js',
+      scripts: [Object],
+      repository: [Object],
+      keywords: [Array],
+      author: 'Robert McGovern et all',
+      license: 'MIT',
+      devDependencies: [Object],
+      dependencies: [Object]
+    },
+    layout: 'single',
+    author_profile: true,
+    read_time: true,
+    share: true,
+    related: true,
+    title: 'SwiftUI',
+    tags: [ 'swiftui', 'programming', 'ios', 'swift' ],
+    category: 'Programming',
+    page: {
+      excerpt: '\n' +
+        "Its been a long while since I sat and did programming, but between a life situation and the new technology from Apple for creating user interfaces (SwiftUI), I've been inspired to pickup again an idea I've been kicking around for 10 years.\n" +
+        '\n' +
+        '<!--more-->\n' +
+        '\n' +
+        'SwiftUI simplifies designing interfaces\n' +
+        'Provides a fast means of iterating design\n' +
+        'Able to quickly see results\n' +
+        'Easy to mock in data\n' +
+        '\n' +
+        'Buggy.\n' +
+        'Filled 3 bugs so far.\n' +
+        '\n' +
+        'Swift:\n' +
+        '\n' +
+        '{% highlight swift %}\n' +
+        '     override public func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {\n' +
+        '        super.touchesBegan(touches, with: event)\n' +
+        '        currentTouchPosition = touches.first?.location(in: self)\n' +
+        '\n' +
+        '        NSObject.cancelPreviousPerformRequests(withTarget: self)\n' +
+        '    }\n' +
+        '{% endhighlight %}\n' +
+        '\n' +
+        'Swift:\n' +
+        '\n' +
+        '```swift\n' +
+        'def print_hi(name)\n' +
+        '  puts "Hi, #{name}"\n' +
+        'end\n' +
+        "print_hi('Tom')\n" +
+        "#=> prints 'Hi, Tom' to STDOUT.\n" +
+        '```\n' +
+        '\n' +
+        'Bash: \n' +
+        '```bash\n' +
+        '\n' +
+        '#!/usr/bin/env bash\n' +
+        'set -e # halt script on error\n' +
+        '\n' +
+        'echo\n' +
+        'echo "',
+      date: 2020-03-05T11:10:48.355Z,
+      inputPath: './src/_drafts/swiftui.md',
+      fileSlug: 'swiftui',
+      filePathStem: '/_drafts/swiftui',
+      outputFileExtension: 'html',
+      templateSyntax: 'liquid,md',
+      url: '/_drafts/swiftui/',
+      outputPath: 'dist/_drafts/swiftui/index.html'
+    },
+    collections: {
+      all: [Array],
+      life: [Array],
+      camino: [Array],
+      caminodesantiago: [Array],
+      webdev: [Array],
+      site: [Array],
+      frontendmentor: [Array],
+      javascript: [Array],
+      freecodecamp: [Array],
+      programming: [Array],
+      ios: [Array],
+      swift: [Array],
+      'coding-challenges': [Array],
+      jakobsweg: [Array],
+      css: [Array],
+      caminofrances: [Array],
+      personal: [Array],
+      webdevelopment: [Array],
+      learning: [Array],
+      html: [Array],
+      swiftui: [Array],
+      pages: [Array],
+      posts: [Array],
+      projects: [],
+      tags: [Array]
+    }
+  },
+  page: {
+    excerpt: '\n' +
+      "Its been a long while since I sat and did programming, but between a life situation and the new technology from Apple for creating user interfaces (SwiftUI), I've been inspired to pickup again an idea I've been kicking around for 10 years.\n" +
+      '\n' +
+      '<!--more-->\n' +
+      '\n' +
+      'SwiftUI simplifies designing interfaces\n' +
+      'Provides a fast means of iterating design\n' +
+      'Able to quickly see results\n' +
+      'Easy to mock in data\n' +
+      '\n' +
+      'Buggy.\n' +
+      'Filled 3 bugs so far.\n' +
+      '\n' +
+      'Swift:\n' +
+      '\n' +
+      '{% highlight swift %}\n' +
+      '     override public func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {\n' +
+      '        super.touchesBegan(touches, with: event)\n' +
+      '        currentTouchPosition = touches.first?.location(in: self)\n' +
+      '\n' +
+      '        NSObject.cancelPreviousPerformRequests(withTarget: self)\n' +
+      '    }\n' +
+      '{% endhighlight %}\n' +
+      '\n' +
+      'Swift:\n' +
+      '\n' +
+      '```swift\n' +
+      'def print_hi(name)\n' +
+      '  puts "Hi, #{name}"\n' +
+      'end\n' +
+      "print_hi('Tom')\n" +
+      "#=> prints 'Hi, Tom' to STDOUT.\n" +
+      '```\n' +
+      '\n' +
+      'Bash: \n' +
+      '```bash\n' +
+      '\n' +
+      '#!/usr/bin/env bash\n' +
+      'set -e # halt script on error\n' +
+      '\n' +
+      'echo\n' +
+      'echo "',
+    date: 2020-03-05T11:10:48.355Z,
+    inputPath: './src/_drafts/swiftui.md',
+    fileSlug: 'swiftui',
+    filePathStem: '/_drafts/swiftui',
+    outputFileExtension: 'html',
+    templateSyntax: 'liquid,md',
+    url: '/_drafts/swiftui/',
+    outputPath: 'dist/_drafts/swiftui/index.html'
+  },
+  inputPath: './src/_drafts/swiftui.md',
+  fileSlug: 'swiftui',
+  filePathStem: '/_drafts/swiftui',
+  date: 2020-03-05T11:10:48.355Z,
+  outputPath: 'dist/_drafts/swiftui/index.html',
+  url: '/_drafts/swiftui/',
+  templateContent: [Getter/Setter],
+  content: [Getter]
+}
+
+---
+
+content of object in collections.all
+
+{
+    content: [Getter],
+    data: {
+      'ui-text': [Object],
+      authors: [Object],
+      category: 'coding-challenges',
+      collections: [Object],
+      eleventy: [Object],
+      navigation: [Object],
+      page: [Object],
+      pkg: [Object],
+      site: [Object],
+      tags: [Array],
+      title: 'Swift Coding Challenge 3 and 4'
+    },
+    date: 2020-04-22T22:50:03.539Z,
+    filePathStem: '/_drafts/swift-coding-challenge-3-and-4',
+    fileSlug: 'swift-coding-challenge-3-and-4',
+    inputPath: './src/_drafts/swift-coding-challenge-3-and-4.md',
+    outputPath: 'dist/_drafts/swift-coding-challenge-3-and-4/index.html',
+    page: {
+      date: 2020-04-22T22:50:03.539Z,
+      filePathStem: '/_drafts/swift-coding-challenge-3-and-4',
+      fileSlug: 'swift-coding-challenge-3-and-4',
+      inputPath: './src/_drafts/swift-coding-challenge-3-and-4.md',
+      outputFileExtension: 'html',
+      outputPath: 'dist/_drafts/swift-coding-challenge-3-and-4/index.html',
+      templateSyntax: 'liquid,md',
+      url: '/_drafts/swift-coding-challenge-3-and-4/'
+    },
+    template: Template {
+      _cacheFinalContent: '
+Challenge 3
+
+\n' +
+        '
+Take two strings, random order of letters and compare if they contain the same letters
+
+\n' +
+        '
+This was very quickly done. I remembered about sorted
+
+\n' +
+        '
+Challenge 4
+
+\n',
+      _cacheRenderedContent: '
+Challenge 3
+
+\n' +
+        '
+Take two strings, random order of letters and compare if they contain the same letters
+
+\n' +
+        '
+This was very quickly done. I remembered about sorted
+
+\n' +
+        '
+Challenge 4
+
+\n',
+      _config: [TemplateConfig],
+      _dataCache: [Object],
+      _extensionMap: [EleventyExtensionMap],
+      _frontMatter: [Object],
+      _frontMatterDataCache: [Promise],
+      _logger: [ConsoleLogger],
+      _stats: [Promise],
+      _templateRender: [TemplateRender],
+      _usePermalinkRoot: undefined,
+      behavior: [TemplateBehavior],
+      extraOutputSubdirectory: '',
+      filePathStem: '/_drafts/swift-coding-challenge-3-and-4',
+      fileSlug: [TemplateFileSlug],
+      fileSlugStr: 'swift-coding-challenge-3-and-4',
+      inputContent: [Promise],
+      inputDir: 'src',
+      inputPath: './src/_drafts/swift-coding-challenge-3-and-4.md',
+      isDryRun: false,
+      isVerbose: true,
+      linters: [],
+      outputDir: 'dist',
+      outputFormat: 'fs',
+      parsed: [Object],
+      readingPromise: [Promise],
+      serverlessUrls: null,
+      templateData: [TemplateData],
+      transforms: [],
+      writeCount: 0
+    },
+    templateContent: [Getter/Setter],
+    url: '/_drafts/swift-coding-challenge-3-and-4/'
+  },
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 13dbb06..881623b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,6 +14,7 @@
         "@11ty/eleventy-plugin-syntaxhighlight": "^4.2.0",
         "@11ty/eleventy-upgrade-help": "^2.0.5",
         "autoprefixer": "^10.4.13",
+        "const": "^1.0.0",
         "eleventy-load": "^0.3.1",
         "eleventy-load-css": "^0.3.0",
         "eleventy-load-file": "^0.1.0",
@@ -23,6 +24,8 @@
         "eleventy-plugin-toc": "^1.1.5",
         "eleventy-xml-plugin": "^0.1.0",
         "fs-extra": "^11.1.0",
+        "js-yaml": "^4.1.0",
+        "lightningcss-cli": "^1.18.0",
         "markdown-it": "^13.0.1",
         "markdown-it-anchor": "^8.6.6",
         "markdown-it-attrs": "^4.1.6",
@@ -460,13 +463,9 @@
       }
     },
     "node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
     },
     "node_modules/array-differ": {
       "version": "3.0.0",
@@ -998,6 +997,11 @@
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
     },
+    "node_modules/const": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/const/-/const-1.0.0.tgz",
+      "integrity": "sha512-E24n5WFSXaU6+BFaCqImKvuoroCm4jzi4imyA0e20wODGm02n/PmfNLOdngkXAh9DYSEDZIQ/cR+ADEPD1GJpA=="
+    },
     "node_modules/constantinople": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/constantinople/-/constantinople-4.0.1.tgz",
@@ -1203,6 +1207,17 @@
         "node": ">= 0.6.0"
       }
     },
+    "node_modules/detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+      "bin": {
+        "detect-libc": "bin/detect-libc.js"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
     "node_modules/dev-ip": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/dev-ip/-/dev-ip-1.0.1.tgz",
@@ -1905,6 +1920,28 @@
         "node": ">=6.0"
       }
     },
+    "node_modules/gray-matter/node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/gray-matter/node_modules/js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
     "node_modules/hamljs": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/hamljs/-/hamljs-0.6.2.tgz",
@@ -2569,13 +2606,11 @@
       "dev": true
     },
     "node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dev": true,
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
       "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
+        "argparse": "^2.0.1"
       },
       "bin": {
         "js-yaml": "bin/js-yaml.js"
@@ -2732,6 +2767,187 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/lightningcss-cli": {
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-cli/-/lightningcss-cli-1.18.0.tgz",
+      "integrity": "sha512-vlb62UstivI6wrtHeEqQ+j2lDRgfqpDH7GRYIqRdMnGa+VqJsxtezkyUGN0eiYEIlvr0aFjDYPqsU4qW29UCfQ==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "detect-libc": "^1.0.3"
+      },
+      "bin": {
+        "lightningcss": "lightningcss"
+      },
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      },
+      "optionalDependencies": {
+        "lightningcss-cli-darwin-arm64": "1.18.0",
+        "lightningcss-cli-darwin-x64": "1.18.0",
+        "lightningcss-cli-linux-arm-gnueabihf": "1.18.0",
+        "lightningcss-cli-linux-arm64-gnu": "1.18.0",
+        "lightningcss-cli-linux-arm64-musl": "1.18.0",
+        "lightningcss-cli-linux-x64-gnu": "1.18.0",
+        "lightningcss-cli-linux-x64-musl": "1.18.0",
+        "lightningcss-cli-win32-x64-msvc": "1.18.0"
+      }
+    },
+    "node_modules/lightningcss-cli-darwin-arm64": {
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-cli-darwin-arm64/-/lightningcss-cli-darwin-arm64-1.18.0.tgz",
+      "integrity": "sha512-R52Gxx56roDw7GbfLFNnAalvTebirVASl42HDriVLlCgQYo0e9/ef2za0c+AYM/RZt7fgfGRIVXFEJVC5mESaw==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-cli-darwin-x64": {
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-cli-darwin-x64/-/lightningcss-cli-darwin-x64-1.18.0.tgz",
+      "integrity": "sha512-0F1xELsw/FdYcZJc7SvhQ14SRO0EXJPjuotS4hlWtQdl0bZQlI64IRGDAgFNnwrOl3ou3+bhmL/4dtVXzezKWA==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-cli-linux-arm-gnueabihf": {
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-cli-linux-arm-gnueabihf/-/lightningcss-cli-linux-arm-gnueabihf-1.18.0.tgz",
+      "integrity": "sha512-LGqRajP4x2/onNh8Z/UMhyumC3FukFv1xouAp4Vp8U/SwOx5VRWboxgzUHW7IhyPrEi+O53F6LNrx5JCzdgOmA==",
+      "cpu": [
+        "arm"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-cli-linux-arm64-gnu": {
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-cli-linux-arm64-gnu/-/lightningcss-cli-linux-arm64-gnu-1.18.0.tgz",
+      "integrity": "sha512-nDjCmZ9Kc3Be51Z7xL9tlYyCoE6bg7UzCZSSqBkOghId7DCmGoNf0RgU0+43YP27E29GyRJFRovsC8Rcv3wjgg==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-cli-linux-arm64-musl": {
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-cli-linux-arm64-musl/-/lightningcss-cli-linux-arm64-musl-1.18.0.tgz",
+      "integrity": "sha512-4aOR3ZAn6eixplfOblc+daGIlSvYnTC1sz08kipOCXF0jahaCwJ7SaBBBCLusqfgCEDEz4gesam0YavHa1qZEQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-cli-linux-x64-gnu": {
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-cli-linux-x64-gnu/-/lightningcss-cli-linux-x64-gnu-1.18.0.tgz",
+      "integrity": "sha512-0WfiSirImUiHv+bsYCSlkwJFk4U6tkCRGABNM/0h0F9LYuXD7wgRnnT7F1i+xFS90KP/8ABjtk9//hKhf7lZaQ==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-cli-linux-x64-musl": {
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-cli-linux-x64-musl/-/lightningcss-cli-linux-x64-musl-1.18.0.tgz",
+      "integrity": "sha512-mlNAzk486pT6LNWOmzP7QQ9+WhcLzK6eAcMjTW7MhK+o2lgLmjVeFk+VEJ23tMLjwwjm+/mUaJM8fjTVfniK2A==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-cli-win32-x64-msvc": {
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-cli-win32-x64-msvc/-/lightningcss-cli-win32-x64-msvc-1.18.0.tgz",
+      "integrity": "sha512-Sx3/QJL1BqOwtxR+yXGGItamu66CB28mWPTpJ6Mv3Zuezpx6up//HmFA06BABBqgtQS2ocrf8+mj2/HMx2j8YQ==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
     "node_modules/linkedom": {
       "version": "0.14.21",
       "resolved": "https://registry.npmjs.org/linkedom/-/linkedom-0.14.21.tgz",
@@ -2980,11 +3196,6 @@
       "resolved": "https://registry.npmjs.org/markdown-it-regexp/-/markdown-it-regexp-0.4.0.tgz",
       "integrity": "sha512-0XQmr46K/rMKnI93Y3CLXsHj4jIioRETTAiVnJnjrZCEkGaDOmUxTbZj/aZ17G5NlRcVpWBYjqpwSlQ9lj+Kxw=="
     },
-    "node_modules/markdown-it/node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
-    },
     "node_modules/markdownify": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/markdownify/-/markdownify-0.1.0.tgz",
diff --git a/package.json b/package.json
index de5ed4e..8340095 100644
--- a/package.json
+++ b/package.json
@@ -4,13 +4,13 @@
   "description": "Second generation of site using 11ty for building but using Jekyll theme Minimal Mistakes (with mods to make it work)",
   "main": "index.js",
   "scripts": {
-    "watch:sass": "sass --watch src/_sass/**/*.scss dist/assets/styles/minimal-mistakes.css",
-    "build:sass": "sass --style=compressed src/_sass/minimal-mistakes.scss dist/assets/styles/minimal-mistakes.css",
-    "build:mysass": "sass  --style=compressed src/assets/css/main.scss dist/assets/css/main.css",
+    "build:sass": "sass --load-path=src/_sass --style=compressed dist/assets/css/tocompile.scss dist/assets/css/main.css",
     "watch:eleventy": "eleventy --serve",
     "build:eleventy": "eleventy",
-    "start": "npm-run-all build:sass --parallel watch:*",
-    "build": "npm-run-all build:*",
+    "clean": "rm -rf dist",
+    "postbuild": "",
+    "start": "npm-run-all clean build:eleventy build:sass --parallel watch:*",
+    "build": "npm-run-all clean build:eleventy build:sass",
     "debug": "DEBUG=Eleventy:* eleventy"
   },
   "repository": {
@@ -34,6 +34,7 @@
     "@11ty/eleventy-plugin-syntaxhighlight": "^4.2.0",
     "@11ty/eleventy-upgrade-help": "^2.0.5",
     "autoprefixer": "^10.4.13",
+    "const": "^1.0.0",
     "eleventy-load": "^0.3.1",
     "eleventy-load-css": "^0.3.0",
     "eleventy-load-file": "^0.1.0",
@@ -43,6 +44,8 @@
     "eleventy-plugin-toc": "^1.1.5",
     "eleventy-xml-plugin": "^0.1.0",
     "fs-extra": "^11.1.0",
+    "js-yaml": "^4.1.0",
+    "lightningcss-cli": "^1.18.0",
     "markdown-it": "^13.0.1",
     "markdown-it-anchor": "^8.6.6",
     "markdown-it-attrs": "^4.1.6",
diff --git a/src/_data/navigation.yml b/src/_data/navigation.yml
index c8474b3..a1ae82b 100644
--- a/src/_data/navigation.yml
+++ b/src/_data/navigation.yml
@@ -1,9 +1,7 @@
 # main links
 main:
-#  - title: ""
-#    url: /docs/quick-start-guide/
-  - title: "Posts"
-    url: /year-archive/
+#  - title: "Posts"
+#    url: /year-archive/
   - title: "Tags"
     url: /tags/
   - title: "Categories"
diff --git a/src/_data/site.json b/src/_data/site.json
index e1f80fd..e61bd2f 100644
--- a/src/_data/site.json
+++ b/src/_data/site.json
@@ -136,6 +136,11 @@
         "icon": "fab fa-fw fa-twitter-square",
         "url": "https://twitter.com/tarasis"
       },
+      {
+        "label": "Mastodon",
+        "icon": "fab fa-fw fa-mastodon",
+        "url": "https://social.tarasis.net/@tarasis"
+      },
       {
         "label": "Facebook",
         "icon": "fab fa-fw fa-facebook",
@@ -190,6 +195,11 @@
         "icon": "fab fa-fw fa-twitter-square",
         "url": "https://twitter.com/tarasis"
       },
+      {
+        "label": "Mastodon",
+        "icon": "fab fa-fw fa-mastodon",
+        "url": "https://social.tarasis.net/@tarasis"
+      },
       {
         "label": "Facebook",
         "icon": "fab fa-fw fa-facebook",
diff --git a/src/_drafts/an-ending.md b/src/_drafts/an-ending.md
index 5df524d..ded91ef 100644
--- a/src/_drafts/an-ending.md
+++ b/src/_drafts/an-ending.md
@@ -6,6 +6,7 @@ share: true
 related: true
 title: 'An End of Sorts'
 tag: [Life, Work]
+eleventyExcludeFromCollections: true
 ---
 
 Lets be clear up front: ITS MY **FAULT**.
diff --git a/src/_drafts/camino-de-santiago.md b/src/_drafts/camino-de-santiago.md
deleted file mode 100644
index a20a4d1..0000000
--- a/src/_drafts/camino-de-santiago.md
+++ /dev/null
@@ -1,58 +0,0 @@
----
-title: A short look back on my Camino de Santiago journey
-
-tags:
-- life
-- camino
-- caminodesantiago
-category: camino
----
-
-A year ago tomorrow I began the most gruelling, yet immensely satisfying, journey of my life. I set off from my home in Buchholz in der Nordheide Germany, to fly to France to walk the Camino de Santiago.
-
-Ostensibly the point of the walk was to find myself, to seek out something that had been missing in me for a long time. But it was also about trying to make a decision about what I was doing and my relationship with my wife.
-
-I kinda failed at the latter point. I found while walking that often my brain zoned out and I wasn't thinking about what I should have been. I did however find something that (mostly) made me feel good.
-
-My original intention was to take time along the way to stop for an extra day here and there to see places that I was walking through, but it never really happened. I kind of regret that, although the point of the walk was not to be a tourist.
-
-I had fully intended to go back on the Camino this year (2020), but the unthinkable happened and the world entered a state of lock down that for now has no end in sight. The intention was to walk (mostly) different routes this time, because there are a heck of a lot of them.
-
-I didn't want to end when I did, I wasn't ready to back and quite honestly, I'm still not ready to.
-
-## Some Stats, Dates, and Figures
-
-- I walked 2 camino's. The Camino Frances & Camino Portuguese (Porto; More Costal Route + Espiritual Variente) 
-- I flew from Hamburg to France on the 28th of May 2019 
-- I started the Camino de Santiago, leaving Saint-Jean-Pied-de-Port on the 31st of May 2019 
-- I finished the Camino on the 8th July 2019, when I arrived in Santiago de Compostela 
-- I left the next day for Finisterre 
-- I arrived in Finisterre on the 11th of July 2019 
-- I start the Camino Portuguese on the 18th July 2019 
-- I arrived in Santiago de Compostela on the 31st of July 2019 
-- I flew back to Hamburg from Porto on the 6th of August 2019 (walking 14km to the airport from Porto)
-
--  I took 3 rest days (3rd, 8th and 23rd of June). The first 2 where not because I actually needed to rest, but because I had the wrong shoes and they where messing my feet up. (which gave me a couple of nasty blisters)
-- I bought a new pair of shoes on the evening of the 7th of June, which I then used the rest of the way.
-- I sent roughly 2kg of stuff home on the 8th of June, stuff I thought I needed but didn't
-
-Originally I was track my steps / distances using a Fitbit HR and my iPhone 6S. However because of issues charging the HR (connector area broke), I gave up using it on July 6th.
-
-In total I walked at least 1643km. This was a combination of the daily Camino walks, plus any extra after I arrived at my destination.
-
-| Section | Stage Distance Walked | Total walked that stage |
-| ------- | -------- | ------- |
-| Camino Frances | 793.04km | 972.3km |
-| Santiago to Finisterre | 96.16km | 105.9km |
-| Camino Portuguese | 299.14km | 402.9km |
-| **Totals:** | **1,188.34km** | **1,481.1km** |
-
-The remaining 160km was days walking around Finisterre, Muxia, Santiago and Porto.
-
-## Photos
-
-Over the next little while I am going to post photos from my journey, more than I did at the time on Instagram (which had a limit of 10 per post).
-
-I'll try and add context to them, and a bit about where they where taken.
-
-Anyway, enough for now. I intend, body willing, to locally repeat the Camino distances over the next 2 months.
\ No newline at end of file
diff --git a/src/_drafts/cashregister.md b/src/_drafts/cashregister.md
index a950df3..2e4b525 100644
--- a/src/_drafts/cashregister.md
+++ b/src/_drafts/cashregister.md
@@ -2,6 +2,8 @@
 title: Cash Register Challenge on freeCodeCamp
 tags: [webdev, javascript, freecodecamp]
 category: programming
+eleventyExcludeFromCollections: true
+layout: single
 ---
 
 I've been (slowly) working through the JavaScript module on [freeCodeCamp](https://freecodecamp.org) for a while now, and have recently been doing the certificate challenges. The last of which is the "Cash Register" challenge where you are to write a function that takes a price, a payment amount and an array that contains the cash in the drawer.
@@ -35,10 +37,10 @@ Example of the cash in drawer array:
 ]
 ```
 
-Sample input to function, 
+Sample input to function,
 
 ```javascript
-checkCashRegister(3.26, 100, [["PENNY", 1.01], ["NICKEL", 2.05], ["DIME", 3.1], ["QUARTER", 4.25], ["ONE", 90], ["FIVE", 55], ["TEN", 20], ["TWENTY", 60], ["ONE HUNDRED", 100]]) 
+checkCashRegister(3.26, 100, [["PENNY", 1.01], ["NICKEL", 2.05], ["DIME", 3.1], ["QUARTER", 4.25], ["ONE", 90], ["FIVE", 55], ["TEN", 20], ["TWENTY", 60], ["ONE HUNDRED", 100]])
 ```
 
 and the expected return object
diff --git a/src/_drafts/cssproperties.md b/src/_drafts/cssproperties.md
index 0fd771c..cfa0fd0 100644
--- a/src/_drafts/cssproperties.md
+++ b/src/_drafts/cssproperties.md
@@ -2,6 +2,7 @@
 title: CSS Properties, or I have a problem.
 tags: [webdev, css]
 category: programming
+eleventyExcludeFromCollections: true
 ---
 
 
diff --git a/src/_drafts/femdeploy.md b/src/_drafts/femdeploy.md
index ed39511..3bcab91 100644
--- a/src/_drafts/femdeploy.md
+++ b/src/_drafts/femdeploy.md
@@ -2,6 +2,7 @@
 title: What happens when I finish a Frontend Mentor Challenge
 tags: [webdev, site, frontendmentor]
 category: [programming, webdev]
+eleventyExcludeFromCollections: true
 ---
 
 I've been doing challenges from [Frontend Mentor](https://frontendmentor.io) as a means to practice frontend web development. Specifically working with plain HTML, CSS and JavaScript.
diff --git a/src/_drafts/filtering.md b/src/_drafts/filtering.md
index c45eda9..03189cd 100644
--- a/src/_drafts/filtering.md
+++ b/src/_drafts/filtering.md
@@ -2,9 +2,11 @@
 title: Filtering
 tags: [webdev, javascript]
 category: programming
+eleventyExcludeFromCollections: true
+
 ---
 
-I was watching the video [How To Create A Search Bar In JavaScript](https://www.youtube.com/watch?v=TlP5WIxVirU) by [Web Dev Simplified](https://www.youtube.com/channel/UCFbNIlppjAuEX4znoulh0Cw) to learn how to do a search bar in JavaScript. 
+I was watching the video [How To Create A Search Bar In JavaScript](https://www.youtube.com/watch?v=TlP5WIxVirU) by [Web Dev Simplified](https://www.youtube.com/channel/UCFbNIlppjAuEX4znoulh0Cw) to learn how to do a search bar in JavaScript.
 
 What I realised as I was coding along, was that the video was reallymore about filtering data than what I might think of as a search bar. Which is fine, and totally not wrong, but I do find some of Kyle's choices suspect / curious.
 
diff --git a/src/_drafts/pretty-terminal-configs.md b/src/_drafts/pretty-terminal-configs.md
index 6be6884..5f0688b 100644
--- a/src/_drafts/pretty-terminal-configs.md
+++ b/src/_drafts/pretty-terminal-configs.md
@@ -1,4 +1,5 @@
 ---
 layout: single
 title: pretty-terminal-configs
+eleventyExcludeFromCollections: true
 ---
diff --git a/src/_drafts/superheroes.md b/src/_drafts/superheroes.md
index 6f15301..089e9b1 100644
--- a/src/_drafts/superheroes.md
+++ b/src/_drafts/superheroes.md
@@ -6,6 +6,7 @@ share: true
 related: true
 title: 'Superheroes'
 tag: [Movies, TV, Comics]
+eleventyExcludeFromCollections: true
 ---
 
 Test
diff --git a/src/_drafts/swift-coding-challenge-3-and-4.md b/src/_drafts/swift-coding-challenge-3-and-4.md
index 179b847..72874c8 100644
--- a/src/_drafts/swift-coding-challenge-3-and-4.md
+++ b/src/_drafts/swift-coding-challenge-3-and-4.md
@@ -6,6 +6,7 @@ tags:
 - swift
 - coding-challenges
 category: coding-challenges
+eleventyExcludeFromCollections: true
 ---
 
 # Challenge 3
diff --git a/src/_drafts/swiftui.md b/src/_drafts/swiftui.md
index cf97089..e64aa8e 100644
--- a/src/_drafts/swiftui.md
+++ b/src/_drafts/swiftui.md
@@ -7,6 +7,7 @@ related: true
 title: SwiftUI
 tags: [swiftui,programming,ios, swift]
 category: Programming
+eleventyExcludeFromCollections: true
 ---
 
 Its been a long while since I sat and did programming, but between a life situation and the new technology from Apple for creating user interfaces (SwiftUI), I've been inspired to pickup again an idea I've been kicking around for 10 years.
@@ -42,7 +43,7 @@ print_hi('Tom')
 #=> prints 'Hi, Tom' to STDOUT.
 ```
 
-Bash: 
+Bash:
 ```bash
 
 #!/usr/bin/env bash
@@ -103,13 +104,13 @@ regexp = /[abc]/
 
 # This is a comment
 class Person
-  
+
   attr_accessor :name
-  
+
   def initialize(attributes = {})
     @name = attributes[:name]
   end
-  
+
   def self.greet
     "hello"
   end
@@ -178,7 +179,7 @@ $(document).ready(function() {
 }
 ```
 
-<p>notice</p>{: .notice} 
+<p>notice</p>{: .notice}
 <p>primary</p>{: .notice--primary}
 <p>info</p>{: .notice--info}
 <p>warning</p>{: .notice--warning}
diff --git a/src/_drafts/terminal-colors.md b/src/_drafts/terminal-colors.md
index 5e8d4ba..3d89b8c 100644
--- a/src/_drafts/terminal-colors.md
+++ b/src/_drafts/terminal-colors.md
@@ -4,12 +4,14 @@ title: terminal-colors
 tags:
 - programming
 category: programming
+eleventyExcludeFromCollections: true
+
 
 ---
 
 Color ... I have a problem ...
 
-Or Colour if you're from the UK and associated territories. 
+Or Colour if you're from the UK and associated territories.
 
 Seriously, I legitimately have a problem. I need color when I am working with source code, the terminal or when I am reading computer books (like images, or source code).
 
diff --git a/src/_drafts/writeup.md b/src/_drafts/writeup.md
index ca586ef..952f4f9 100644
--- a/src/_drafts/writeup.md
+++ b/src/_drafts/writeup.md
@@ -2,6 +2,7 @@
 title: Writeup
 tags: [camino,caminodesantiago,jakobsweg,life]
 category: personal
+eleventyExcludeFromCollections: true
 ---
 Its been a long while since I posted. I fell behind on my Camino posts, although I continued to take notes for a while, before I ended up giving up on those too.
 
diff --git a/src/_includes/archive-single.html b/src/_includes/archive-single.html
index 6817480..09fb3c8 100644
--- a/src/_includes/archive-single.html
+++ b/src/_includes/archive-single.html
@@ -1,13 +1,13 @@
-{% if post.header.teaser %}
-  {% capture teaser %}{{ post.header.teaser }}{% endcapture %}
+{% if include.aPost.data.title.header.teaser %}
+  {% capture teaser %}{{ include.aPost.data.title.header.teaser }}{% endcapture %}
 {% else %}
   {% assign teaser = site.teaser %}
 {% endif %}
 
-{% if post.id %}
-  {% assign title = post.title | markdownify | remove: "<p>" | remove: "</p>" %}
+{% if include.aPost.data.id %}
+  {% assign title = include.aPost.data.title | markdownify | remove: "<p>" | remove: "</p>" %}
 {% else %}
-  {% assign title = post.title %}
+  {% assign title = include.aPost.data.title %}
 {% endif %}
 
 <div class="{{ include.type | default: 'list' }}__item">
@@ -18,13 +18,22 @@
       </div>
     {% endif %}
     <h2 class="archive__item-title no_toc" itemprop="headline">
-      {% if post.link %}
-        <a href="{{ post.link }}">{{ title }}</a> <a href="{{ post.url | relative_url }}" rel="permalink"><i class="fas fa-link" aria-hidden="true" title="permalink"></i><span class="sr-only">Permalink</span></a>
+      {% if include.aPost.data.link %}
+        <a href="{{ include.aPost.data.link }}">{{ title }}</a> <a href="{{ include.aPost.data.page.url | relative_url }}" rel="permalink"><i class="fas fa-link" aria-hidden="true" title="permalink"></i><span class="sr-only">Permalink</span></a>
       {% else %}
-        <a href="{{ post.url | relative_url }}" rel="permalink">{{ title }}</a>
+        <a href="{{ include.aPost.data.page.url | relative_url }}" rel="permalink">{{ title }}</a>
       {% endif %}
     </h2>
-    {% include page__meta.html type=include.type %}
-    {% if post.excerpt %}<p class="archive__item-excerpt" itemprop="description">{{ post.excerpt | markdownify | strip_html | truncate: 160 }}</p>{% endif %}
+    <!-- RMCG consider removing truncate from first 2 where we've explicitly provided a excerpt -->
+    {% include page__meta.html type=include.type content=include.aPost.data.content %}
+    {% if include.aPost.data.page.excerpt %}
+      <p class="archive__item-excerpt" itemprop="description">{{ include.aPost.data.page.excerpt | markdownify | strip_html | truncate: 160 }}</p>
+    {% elsif include.aPost.data.excerpt %}
+      <p class="archive__item-excerpt" itemprop="description">{{ include.aPost.data.excerpt | markdownify | strip_html | truncate: 160 }}</p>
+    {% else %}
+    <!-- RMCG - Result of this isn't perfect but it works, so now all posts show an excerpt of sorts -->
+      <p class="archive__item-excerpt" itemprop="description">{{ include.aPost.template._frontMatter.content strip_html | markdownify | truncate: 160 }}</p>
+    {% endif %}
+
   </article>
 </div>
diff --git a/src/_includes/author-profile.html b/src/_includes/author-profile.html
index b5a4f41..c3cbc7c 100644
--- a/src/_includes/author-profile.html
+++ b/src/_includes/author-profile.html
@@ -29,7 +29,7 @@
   </div>
 
   <div class="author__urls-wrapper">
-    <button class="btn btn--inverse">{{ site.data.ui-text[site.locale].follow_label | remove: ":" | default: "Follow" }}</button>
+    <button class="btn btn--inverse">{{ ui-text[site.locale].follow_label | remove: ":" | default: "Follow" }}</button>
     <ul class="author__urls social-icons">
       {% if author.location %}
         <li itemprop="homeLocation" itemscope itemtype="https://schema.org/Place">
@@ -48,7 +48,7 @@
       {% if author.uri %}
         <li>
           <a href="{{ author.uri }}" itemprop="url">
-            <i class="fas fa-fw fa-link" aria-hidden="true"></i><span class="label">{{ site.data.ui-text[site.locale].website_label | default: "Website" }}</span>
+            <i class="fas fa-fw fa-link" aria-hidden="true"></i><span class="label">{{ ui-text[site.locale].website_label | default: "Website" }}</span>
           </a>
         </li>
       {% endif %}
@@ -57,7 +57,7 @@
         <li>
           <a href="mailto:{{ author.email }}">
             <meta itemprop="email" content="{{ author.email }}" />
-            <i class="fas fa-fw fa-envelope-square" aria-hidden="true"></i><span class="label">{{ site.data.ui-text[site.locale].email_label | default: "Email" }}</span>
+            <i class="fas fa-fw fa-envelope-square" aria-hidden="true"></i><span class="label">{{ ui-text[site.locale].email_label | default: "Email" }}</span>
           </a>
         </li>
       {% endif %}
@@ -241,7 +241,7 @@
       {% if author.vine %}
         <li>
           <a href="https://vine.co/u/{{ author.vine }}" itemprop="sameAs" rel="nofollow noopener noreferrer">
-            <i class="fab fa-fw fa-vine" aria-hidden="true"></i><span class="label">{{ site.data.ui-text[site.locale].email_label | default: "Email" }}</span>
+            <i class="fab fa-fw fa-vine" aria-hidden="true"></i><span class="label">{{ ui-text[site.locale].email_label | default: "Email" }}</span>
           </a>
         </li>
       {% endif %}
diff --git a/src/_includes/breadcrumbs.html b/src/_includes/breadcrumbs.html
index cba3d41..b065f44 100644
--- a/src/_includes/breadcrumbs.html
+++ b/src/_includes/breadcrumbs.html
@@ -19,10 +19,10 @@
     {% for crumb in crumbs offset: 1 %}
       {% if forloop.first %}
         <li itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem">
-          <a href="{{ site.url }}{{ site.baseurl }}/" itemprop="item"><span itemprop="name">{{ site.data.ui-text[site.locale].breadcrumb_home_label | default: "Home" }}</span></a>
+          <a href="{{ site.url }}{{ site.baseurl }}/" itemprop="item"><span itemprop="name">{{ ui-text[site.locale].breadcrumb_home_label | default: "Home" }}</span></a>
           <meta itemprop="position" content="{{ i }}" />
         </li>
-        <span class="sep">{{ site.data.ui-text[site.locale].breadcrumb_separator | default: "/" }}</span>
+        <span class="sep">{{ ui-text[site.locale].breadcrumb_separator | default: "/" }}</span>
       {% endif %}
       {% if forloop.last %}
         <li class="current">{{ page.title }}</li>
@@ -32,7 +32,7 @@
           <a href="{{ crumb | downcase | replace: '%20', '-' | prepend: path_type | prepend: crumb_path | relative_url }}" itemprop="item"><span itemprop="name">{{ crumb | replace: '-', ' ' | replace: '%20', ' ' | capitalize }}</span></a>
           <meta itemprop="position" content="{{ i }}" />
         </li>
-        <span class="sep">{{ site.data.ui-text[site.locale].breadcrumb_separator | default: "/" }}</span>
+        <span class="sep">{{ ui-text[site.locale].breadcrumb_separator | default: "/" }}</span>
       {% endif %}
     {% endfor %}
   </ol>
diff --git a/src/_includes/category-list.html b/src/_includes/category-list.html
index 1439f14..177ad94 100644
--- a/src/_includes/category-list.html
+++ b/src/_includes/category-list.html
@@ -9,7 +9,7 @@
   {% assign categories_sorted = page.categories | sort_natural %}
 
   <p class="page__taxonomy">
-    <strong><i class="fas fa-fw fa-folder-open" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].categories_label | default: "Categories:" }} </strong>
+    <strong><i class="fas fa-fw fa-folder-open" aria-hidden="true"></i> {{ ui-text[site.locale].categories_label | default: "Categories:" }} </strong>
     <span itemprop="keywords">
     {% for category_word in categories_sorted %}
       <a href="{{ category_word | slugify | prepend: path_type | prepend: site.category_archive.path | relative_url }}" class="page__taxonomy-item" rel="tag">{{ category_word }}</a>{% unless forloop.last %}<span class="sep">, </span>{% endunless %}
diff --git a/src/_includes/comments-providers/staticman.html b/src/_includes/comments-providers/staticman.html
index ae3991d..d818b66 100644
--- a/src/_includes/comments-providers/staticman.html
+++ b/src/_includes/comments-providers/staticman.html
@@ -5,7 +5,7 @@
       var form = this;
 
       $(form).addClass('disabled');
-      $('#comment-form-submit').html('<i class="fas fa-spinner fa-spin fa-fw"></i> {{ site.data.ui-text[site.locale].loading_label | default: "Loading..." }}');
+      $('#comment-form-submit').html('<i class="fas fa-spinner fa-spin fa-fw"></i> {{ ui-text[site.locale].loading_label | default: "Loading..." }}');
 
       $.ajax({
         type: $(this).attr('method'),
@@ -13,17 +13,17 @@
         data: $(this).serialize(),
         contentType: 'application/x-www-form-urlencoded',
         success: function (data) {
-          $('#comment-form-submit').html('{{ site.data.ui-text[site.locale].comment_btn_submitted | default: "Submitted" }}');
+          $('#comment-form-submit').html('{{ ui-text[site.locale].comment_btn_submitted | default: "Submitted" }}');
           $('.page__comments-form .js-notice').removeClass('notice--danger');
           $('.page__comments-form .js-notice').addClass('notice--success');
-          showAlert('{{ site.data.ui-text[site.locale].comment_success_msg | default: "Thanks for your comment! It will show on the site once it has been approved." }}');
+          showAlert('{{ ui-text[site.locale].comment_success_msg | default: "Thanks for your comment! It will show on the site once it has been approved." }}');
         },
         error: function (err) {
           console.log(err);
-          $('#comment-form-submit').html('{{ site.data.ui-text[site.locale].comment_btn_submit  | default: "Submit Comment" }}');
+          $('#comment-form-submit').html('{{ ui-text[site.locale].comment_btn_submit  | default: "Submit Comment" }}');
           $('.page__comments-form .js-notice').removeClass('notice--success');
           $('.page__comments-form .js-notice').addClass('notice--danger');
-          showAlert('{{ site.data.ui-text[site.locale].comment_error_msg | default: "Sorry, there was an error with your submission. Please make sure all required fields have been completed and try again." }}');
+          showAlert('{{ ui-text[site.locale].comment_error_msg | default: "Sorry, there was an error with your submission. Please make sure all required fields have been completed and try again." }}');
           $(form).removeClass('disabled');
         }
       });
diff --git a/src/_includes/comments-providers/staticman_v2.html b/src/_includes/comments-providers/staticman_v2.html
index 3d8ba11..f3bd8cd 100644
--- a/src/_includes/comments-providers/staticman_v2.html
+++ b/src/_includes/comments-providers/staticman_v2.html
@@ -5,7 +5,7 @@
       var form = this;
 
       $(form).addClass('disabled');
-      $('#comment-form-submit').html('<i class="fas fa-spinner fa-spin fa-fw"></i> {{ site.data.ui-text[site.locale].loading_label | default: "Loading..." }}');
+      $('#comment-form-submit').html('<i class="fas fa-spinner fa-spin fa-fw"></i> {{ ui-text[site.locale].loading_label | default: "Loading..." }}');
 
       $.ajax({
         type: $(this).attr('method'),
@@ -13,17 +13,17 @@
         data: $(this).serialize(),
         contentType: 'application/x-www-form-urlencoded',
         success: function (data) {
-          $('#comment-form-submit').html('{{ site.data.ui-text[site.locale].comment_btn_submitted | default: "Submitted" }}');
+          $('#comment-form-submit').html('{{ ui-text[site.locale].comment_btn_submitted | default: "Submitted" }}');
           $('.page__comments-form .js-notice').removeClass('notice--danger');
           $('.page__comments-form .js-notice').addClass('notice--success');
-          showAlert('{{ site.data.ui-text[site.locale].comment_success_msg | default: "Thanks for your comment! It will show on the site once it has been approved." }}');
+          showAlert('{{ ui-text[site.locale].comment_success_msg | default: "Thanks for your comment! It will show on the site once it has been approved." }}');
         },
         error: function (err) {
           console.log(err);
-          $('#comment-form-submit').html('{{ site.data.ui-text[site.locale].comment_btn_submit  | default: "Submit Comment" }}');
+          $('#comment-form-submit').html('{{ ui-text[site.locale].comment_btn_submit  | default: "Submit Comment" }}');
           $('.page__comments-form .js-notice').removeClass('notice--success');
           $('.page__comments-form .js-notice').addClass('notice--danger');
-          showAlert('{{ site.data.ui-text[site.locale].comment_error_msg | default: "Sorry, there was an error with your submission. Please make sure all required fields have been completed and try again." }}');
+          showAlert('{{ ui-text[site.locale].comment_error_msg | default: "Sorry, there was an error with your submission. Please make sure all required fields have been completed and try again." }}');
           $(form).removeClass('disabled');
         }
       });
diff --git a/src/_includes/comments.html b/src/_includes/comments.html
index 4ff59e2..4f3e6bb 100644
--- a/src/_includes/comments.html
+++ b/src/_includes/comments.html
@@ -1,5 +1,5 @@
 <div class="page__comments">
-  {% capture comments_label %}{{ site.data.ui-text[site.locale].comments_label | default: "Comments" }}{% endcapture %}
+  {% capture comments_label %}{{ ui-text[site.locale].comments_label | default: "Comments" }}{% endcapture %}
   {% case site.comments.provider %}
     {% when "discourse" %}
       <h4 class="page__comments-title">{{ comments_label }}</h4>
@@ -16,7 +16,7 @@
           <!-- Start static comments -->
           <div class="js-comments">
             {% if site.data.comments[page.slug] %}
-              <h4 class="page__comments-title">{{ site.data.ui-text[site.locale].comments_title | default: "Comments" }}</h4>
+              <h4 class="page__comments-title">{{ ui-text[site.locale].comments_title | default: "Comments" }}</h4>
               {% assign comments = site.data.comments[page.slug] | sort %}
 
               {% for comment in comments %}
@@ -33,29 +33,29 @@
 
           <!-- Start new comment form -->
           <div class="page__comments-form">
-            <h4 class="page__comments-title">{{ site.data.ui-text[site.locale].comments_label | default: "Leave a Comment" }}</h4>
-            <p class="small">{{ site.data.ui-text[site.locale].comment_form_info | default: "Your email address will not be published. Required fields are marked" }} <span class="required">*</span></p>
+            <h4 class="page__comments-title">{{ ui-text[site.locale].comments_label | default: "Leave a Comment" }}</h4>
+            <p class="small">{{ ui-text[site.locale].comment_form_info | default: "Your email address will not be published. Required fields are marked" }} <span class="required">*</span></p>
             <form id="new_comment" class="page__comments-form js-form form" method="post" action="{{ site.comments.staticman.endpoint }}{{ site.repository }}/{{ site.comments.staticman.branch }}/comments">
               <div class="form__spinner">
                 <i class="fas fa-spinner fa-spin fa-3x fa-fw"></i>
-                <span class="sr-only">{{ site.data.ui-text[site.locale].loading_label | default: "Loading..." }}</span>
+                <span class="sr-only">{{ ui-text[site.locale].loading_label | default: "Loading..." }}</span>
               </div>
 
               <div class="form-group">
-                <label for="comment-form-message">{{ site.data.ui-text[site.locale].comment_form_comment_label | default: "Comment" }} <small class="required">*</small></label>
+                <label for="comment-form-message">{{ ui-text[site.locale].comment_form_comment_label | default: "Comment" }} <small class="required">*</small></label>
                 <textarea type="text" rows="3" id="comment-form-message" name="fields[message]" tabindex="1"></textarea>
-                <div class="small help-block"><a href="https://daringfireball.net/projects/markdown/">{{ site.data.ui-text[site.locale].comment_form_md_info | default: "Markdown is supported." }}</a></div>
+                <div class="small help-block"><a href="https://daringfireball.net/projects/markdown/">{{ ui-text[site.locale].comment_form_md_info | default: "Markdown is supported." }}</a></div>
               </div>
               <div class="form-group">
-                <label for="comment-form-name">{{ site.data.ui-text[site.locale].comment_form_name_label | default: "Name" }} <small class="required">*</small></label>
+                <label for="comment-form-name">{{ ui-text[site.locale].comment_form_name_label | default: "Name" }} <small class="required">*</small></label>
                 <input type="text" id="comment-form-name" name="fields[name]" tabindex="2" />
               </div>
               <div class="form-group">
-                <label for="comment-form-email">{{ site.data.ui-text[site.locale].comment_form_email_label | default: "Email address" }} <small class="required">*</small></label>
+                <label for="comment-form-email">{{ ui-text[site.locale].comment_form_email_label | default: "Email address" }} <small class="required">*</small></label>
                 <input type="email" id="comment-form-email" name="fields[email]" tabindex="3" />
               </div>
               <div class="form-group">
-                <label for="comment-form-url">{{ site.data.ui-text[site.locale].comment_form_website_label | default: "Website (optional)" }}</label>
+                <label for="comment-form-url">{{ ui-text[site.locale].comment_form_website_label | default: "Website (optional)" }}</label>
                 <input type="url" id="comment-form-url" name="fields[url]" tabindex="4"/>
               </div>
               <div class="form-group hidden" style="display: none;">
@@ -76,7 +76,7 @@
                 </div>
               {% endif %}
               <div class="form-group">
-                <button type="submit" id="comment-form-submit" tabindex="5" class="btn btn--primary btn--large">{{ site.data.ui-text[site.locale].comment_btn_submit | default: "Submit Comment" }}</button>
+                <button type="submit" id="comment-form-submit" tabindex="5" class="btn btn--primary btn--large">{{ ui-text[site.locale].comment_btn_submit | default: "Submit Comment" }}</button>
               </div>
             </form>
           </div>
@@ -90,7 +90,7 @@
           <!-- Start static comments -->
           <div class="js-comments">
             {% if site.data.comments[page.slug] %}
-              <h4 class="page__comments-title">{{ site.data.ui-text[site.locale].comments_title | default: "Comments" }}</h4>
+              <h4 class="page__comments-title">{{ ui-text[site.locale].comments_title | default: "Comments" }}</h4>
               {% assign comments = site.data.comments[page.slug] | sort %}
 
               {% for comment in comments %}
@@ -107,29 +107,29 @@
 
           <!-- Start new comment form -->
           <div class="page__comments-form">
-            <h4 class="page__comments-title">{{ site.data.ui-text[site.locale].comments_label | default: "Leave a Comment" }}</h4>
-            <p class="small">{{ site.data.ui-text[site.locale].comment_form_info | default: "Your email address will not be published. Required fields are marked" }} <span class="required">*</span></p>
+            <h4 class="page__comments-title">{{ ui-text[site.locale].comments_label | default: "Leave a Comment" }}</h4>
+            <p class="small">{{ ui-text[site.locale].comment_form_info | default: "Your email address will not be published. Required fields are marked" }} <span class="required">*</span></p>
             <form id="new_comment" class="page__comments-form js-form form" method="post" action="https://api.staticman.net/v1/entry/{{ site.repository }}/{{ site.staticman.branch }}">
               <div class="form__spinner">
                 <i class="fas fa-spinner fa-spin fa-3x fa-fw"></i>
-                <span class="sr-only">{{ site.data.ui-text[site.locale].loading_label | default: "Loading..." }}</span>
+                <span class="sr-only">{{ ui-text[site.locale].loading_label | default: "Loading..." }}</span>
               </div>
 
               <div class="form-group">
-                <label for="comment-form-message">{{ site.data.ui-text[site.locale].comment_form_comment_label | default: "Comment" }} <small class="required">*</small></label>
+                <label for="comment-form-message">{{ ui-text[site.locale].comment_form_comment_label | default: "Comment" }} <small class="required">*</small></label>
                 <textarea type="text" rows="3" id="comment-form-message" name="fields[message]" tabindex="1"></textarea>
-                <div class="small help-block"><a href="https://daringfireball.net/projects/markdown/">{{ site.data.ui-text[site.locale].comment_form_md_info | default: "Markdown is supported." }}</a></div>
+                <div class="small help-block"><a href="https://daringfireball.net/projects/markdown/">{{ ui-text[site.locale].comment_form_md_info | default: "Markdown is supported." }}</a></div>
               </div>
               <div class="form-group">
-                <label for="comment-form-name">{{ site.data.ui-text[site.locale].comment_form_name_label | default: "Name" }} <small class="required">*</small></label>
+                <label for="comment-form-name">{{ ui-text[site.locale].comment_form_name_label | default: "Name" }} <small class="required">*</small></label>
                 <input type="text" id="comment-form-name" name="fields[name]" tabindex="2" />
               </div>
               <div class="form-group">
-                <label for="comment-form-email">{{ site.data.ui-text[site.locale].comment_form_email_label | default: "Email address" }} <small class="required">*</small></label>
+                <label for="comment-form-email">{{ ui-text[site.locale].comment_form_email_label | default: "Email address" }} <small class="required">*</small></label>
                 <input type="email" id="comment-form-email" name="fields[email]" tabindex="3" />
               </div>
               <div class="form-group">
-                <label for="comment-form-url">{{ site.data.ui-text[site.locale].comment_form_website_label | default: "Website (optional)" }}</label>
+                <label for="comment-form-url">{{ ui-text[site.locale].comment_form_website_label | default: "Website (optional)" }}</label>
                 <input type="url" id="comment-form-url" name="fields[url]" tabindex="4"/>
               </div>
               <div class="form-group hidden" style="display: none;">
@@ -143,7 +143,7 @@
               </p>
               <!-- End comment form alert messaging -->
               <div class="form-group">
-                <button type="submit" id="comment-form-submit" tabindex="5" class="btn btn--primary btn--large">{{ site.data.ui-text[site.locale].comment_btn_submit | default: "Submit Comment" }}</button>
+                <button type="submit" id="comment-form-submit" tabindex="5" class="btn btn--primary btn--large">{{ ui-text[site.locale].comment_btn_submit | default: "Submit Comment" }}</button>
               </div>
             </form>
           </div>
diff --git a/src/_includes/feature_row.liquid b/src/_includes/feature_row.liquid
index 03f09c1..fb2666e 100644
--- a/src/_includes/feature_row.liquid
+++ b/src/_includes/feature_row.liquid
@@ -31,7 +31,7 @@
           {% endif %}
 
           {% if f.url %}
-            <p><a href="{{ f.url | relative_url }}" class="btn {{ f.btn_class }}">{{ f.btn_label | default: site.data.ui-text[site.locale].more_label | default: "Learn More" }}</a></p>
+            <p><a href="{{ f.url | relative_url }}" class="btn {{ f.btn_class }}">{{ f.btn_label | default: ui-text[site.locale].more_label | default: "Learn More" }}</a></p>
           {% endif %}
         </div>
       </div>
diff --git a/src/_includes/footer.html b/src/_includes/footer.html
index 2b53a25..9fbcfe8 100644
--- a/src/_includes/footer.html
+++ b/src/_includes/footer.html
@@ -1,7 +1,7 @@
 <div class="page__footer-follow">
   <ul class="social-icons">
-    {% if site.data.ui-text[site.locale].follow_label %}
-      <li><strong>{{ site.data.ui-text[site.locale].follow_label }}</strong></li>
+    {% if ui-text[site.locale].follow_label %}
+      <li><strong>{{ ui-text[site.locale].follow_label }}</strong></li>
     {% endif %}
 
     {% if site.footer.links %}
@@ -13,9 +13,9 @@
     {% endif %}
 
     {% unless site.atom_feed.hide %}
-      <li><a href="{% if site.atom_feed.path %}{{ site.atom_feed.path }}{% else %}{{ '/feed.xml' | relative_url }}{% endif %}"><i class="fas fa-fw fa-rss-square" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].feed_label | default: "Feed" }}</a></li>
+      <li><a href="{% if site.atom_feed.path %}{{ site.atom_feed.path }}{% else %}{{ '/feed.xml' | relative_url }}{% endif %}"><i class="fas fa-fw fa-rss-square" aria-hidden="true"></i> {{ ui-text[site.locale].feed_label | default: "Feed" }}</a></li>
     {% endunless %}
   </ul>
 </div>
 
-<div class="page__footer-copyright">&copy; {{ site.time | date: '%Y' }} {{ site.name | default: site.title }}. {{ site.data.ui-text[site.locale].powered_by | default: "Powered by" }} <a href="https://jekyllrb.com" rel="nofollow">Jekyll</a> &amp; <a href="https://mademistakes.com/work/minimal-mistakes-jekyll-theme/" rel="nofollow">Minimal Mistakes</a>.</div>
+<div class="page__footer-copyright">&copy; {{ site.time | date: '%Y' }} {{ site.name | default: site.title }}. {{ ui-text[site.locale].powered_by | default: "Powered by" }} <a href="https://jekyllrb.com" rel="nofollow">Jekyll</a> &amp; <a href="https://mademistakes.com/work/minimal-mistakes-jekyll-theme/" rel="nofollow">Minimal Mistakes</a>.</div>
diff --git a/src/_includes/head.html b/src/_includes/head.html
index 73e5637..e6c6276 100644
--- a/src/_includes/head.html
+++ b/src/_includes/head.html
@@ -15,6 +15,9 @@
 
 <!-- For all browsers -->
 <link rel="stylesheet" href="{{ '/assets/css/main.css' | relative_url }}">
+<!-- <link href="https://unpkg.com/prismjs@1.20.0/themes/prism-okaidia.css" rel="stylesheet"> -->
+<link rel="stylesheet" href="/assets/css/colddark-theme.css">
+
 <link rel="preload" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5/css/all.min.css" as="style" onload="this.onload=null;this.rel='stylesheet'">
 <noscript><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5/css/all.min.css"></noscript>
 
diff --git a/src/_includes/layouts/archive-taxonomy.html b/src/_includes/layouts/archive-taxonomy.html
index eb62a87..04c396a 100644
--- a/src/_includes/layouts/archive-taxonomy.html
+++ b/src/_includes/layouts/archive-taxonomy.html
@@ -3,13 +3,13 @@ layout: default
 author_profile: false
 ---
 
-{% if page.header.overlay_color or page.header.overlay_image or page.header.image %}
+{% if header.overlay_color or header.overlay_image or header.image %}
   {% include page__hero.html %}
-{% elsif page.header.video.id and page.header.video.provider %}
+{% elsif header.video.id and header.video.provider %}
   {% include page__hero_video.html %}
 {% endif %}
 
-{% if page.url != "/" and site.breadcrumbs %}
+{% if url != "/" and site.breadcrumbs %}
   {% unless paginator %}
     {% include breadcrumbs.html %}
   {% endunless %}
@@ -19,10 +19,10 @@ author_profile: false
   {% include sidebar.html %}
 
   <div class="archive">
-    {% unless page.header.overlay_color or page.header.overlay_image %}
-      <h1 id="page-title" class="page__title">{{ page.title }}</h1>
+    {% unless header.overlay_color or header.overlay_image %}
+      <h1 id="page-title" class="page__title">{{ title }}</h1>
     {% endunless %}
-    {% for post in page.posts %}
+    {% for post in posts %}
       {% include archive-single.html %}
     {% endfor %}
   </div>
diff --git a/src/_includes/layouts/archive.html b/src/_includes/layouts/archive.html
index 08beb89..a59ae38 100644
--- a/src/_includes/layouts/archive.html
+++ b/src/_includes/layouts/archive.html
@@ -2,9 +2,9 @@
 layout: default
 ---
 
-{% if page.header.overlay_color or page.header.overlay_image or page.header.image %}
+{% if header.overlay_color or header.overlay_image or header.image %}
   {% include page__hero.html %}
-{% elsif page.header.video.id and page.header.video.provider %}
+{% elsif header.video.id and header.video.provider %}
   {% include page__hero_video.html %}
 {% endif %}
 
@@ -18,8 +18,8 @@ layout: default
   {% include sidebar.html %}
 
   <div class="archive">
-    {% unless page.header.overlay_color or page.header.overlay_image %}
-      <h1 id="page-title" class="page__title">{{ page.title }}</h1>
+    {% unless header.overlay_color or header.overlay_image %}
+      <h1 id="page-title" class="page__title">{{ title }}</h1>
     {% endunless %}
     {{ content }}
   </div>
diff --git a/src/_includes/layouts/categories.html b/src/_includes/layouts/categories.html
index f5448a2..587f974 100644
--- a/src/_includes/layouts/categories.html
+++ b/src/_includes/layouts/categories.html
@@ -2,22 +2,20 @@
 layout: archive
 ---
 
-{{ content }}
-
 {% assign categories_max = 0 %}
-{% for category in site.categories %}
-  {% if category[1].size > categories_max %}
-    {% assign categories_max = category[1].size %}
+{% for category in collections.categories %}
+  {% if collections[category].size > categories_max %}
+    {% assign categories_max = collections[category].size %}
   {% endif %}
 {% endfor %}
 
 <ul class="taxonomy__index">
   {% for i in (1..categories_max) reversed %}
-    {% for category in site.categories %}
-      {% if category[1].size == i %}
+    {% for category in collections.categories %}
+      {% if collections[category].size == i %}
         <li>
-          <a href="#{{ category[0] | slugify }}">
-            <strong>{{ category[0] }}</strong> <span class="taxonomy__count">{{ i }}</span>
+          <a href="#{{ category | slugify }}">
+            <strong>{{ category }}</strong> <span class="taxonomy__count">{{ i }}</span>
           </a>
         </li>
       {% endif %}
@@ -25,18 +23,18 @@ layout: archive
   {% endfor %}
 </ul>
 
-{% assign entries_layout = page.entries_layout | default: 'list' %}
+{% assign entries_layout = entries_layout | default: 'list' %}
 {% for i in (1..categories_max) reversed %}
-  {% for category in site.categories %}
-    {% if category[1].size == i %}
-      <section id="{{ category[0] | slugify | downcase }}" class="taxonomy__section">
-        <h2 class="archive__subtitle">{{ category[0] }}</h2>
+  {% for category in collections.categories %}
+    {% if collections[category].size == i %}
+      <section id="{{ category | slugify | downcase }}" class="taxonomy__section">
+        <h2 class="archive__subtitle">{{ category }}</h2>
         <div class="entries-{{ entries_layout }}">
-          {% for post in category.last %}
-            {% include archive-single.html type=entries_layout %}
+          {% for post in collections[category] %}
+            {% include archive-single.html type=entries_layout aPost=post%}
           {% endfor %}
         </div>
-        <a href="#page-title" class="back-to-top">{{ site.data.ui-text[site.locale].back_to_top | default: 'Back to Top' }} &uarr;</a>
+        <a href="#page-title" class="back-to-top">{{ ui-text[site.locale].back_to_top | default: 'Back to Top' }} &uarr;</a>
       </section>
     {% endif %}
   {% endfor %}
diff --git a/src/_includes/layouts/default.html b/src/_includes/layouts/default.html
index bf7d12f..57f1592 100644
--- a/src/_includes/layouts/default.html
+++ b/src/_includes/layouts/default.html
@@ -14,7 +14,7 @@
     {% include head/custom.html %}
   </head>
 
-  <body class="layout--{{ page.layout | default: layout.layout }}{% if page.classes or layout.classes %}{{ page.classes | default: layout.classes | join: ' ' | prepend: ' ' }}{% endif %}">
+  <body class="layout--{{ layout | default: site.defaults.posts.layout }}{% if classes or site.defaults.posts.classes %}{{ classes | default: site.defaults.posts.classes | join: ' ' | prepend: ' ' }}{% endif %}">
     {% include skip-links.html %}
     {% include browser-upgrade.html %}
     {% include masthead.html %}
diff --git a/src/_includes/layouts/drafts.html b/src/_includes/layouts/drafts.html
new file mode 100644
index 0000000..7f4dc09
--- /dev/null
+++ b/src/_includes/layouts/drafts.html
@@ -0,0 +1,11 @@
+---
+layout: archive
+---
+
+TEST
+
+{{collections.drafts.size}}
+
+{% for post in collections.drafts %}
+    {% include archive-single.html type=entries_layout, aPost=post %}
+{% endfor %}
diff --git a/src/_includes/layouts/home.html b/src/_includes/layouts/home.html
index 75a0785..1c221fd 100644
--- a/src/_includes/layouts/home.html
+++ b/src/_includes/layouts/home.html
@@ -7,7 +7,7 @@ paginator:
 
 ---
 
-<h3 class="archive__subtitle">{{ site.data.ui-text[site.locale].recent_posts | default: "Recent Posts" }}</h3>
+<h3 class="archive__subtitle">{{ ui-text[site.locale].recent_posts | default: "Recent Posts" }}</h3>
 
 {% if paginator %}
   {% assign posts = collections.posts %}
@@ -18,7 +18,7 @@ paginator:
 {% assign entries_layout = page.entries_layout | default: 'list' %}
 <div class="entries-{{ entries_layout }}">
   {% for post in posts %}
-    {% include archive-single.html type=entries_layout %}
+    {% include archive-single.html type=entries_layout aPost=post %}
   {% endfor %}
 </div>
 
diff --git a/src/_includes/layouts/posts.html b/src/_includes/layouts/posts.html
index 904782f..288825e 100644
--- a/src/_includes/layouts/posts.html
+++ b/src/_includes/layouts/posts.html
@@ -4,6 +4,10 @@ layout: archive
 
 {{ content }}
 
+{% assign sortedPosts = collections.posts | group_by: "date" %}
+
+{{ sortedPosts | inspect }}
+
 {% comment %}
 <ul class="taxonomy__index">
   {% assign postsInYear = site.posts | where_exp: "item", "item.hidden != true" | group_by_exp: 'post', 'post.date | date: "%Y"' %}
@@ -26,7 +30,7 @@ layout: archive
         {% include archive-single.html type=entries_layout %}
       {% endfor %}
     </div>
-    <a href="#page-title" class="back-to-top">{{ site.data.ui-text[site.locale].back_to_top | default: 'Back to Top' }} &uarr;</a>
+    <a href="#page-title" class="back-to-top">{{ ui-text[site.locale].back_to_top | default: 'Back to Top' }} &uarr;</a>
   </section>
 {% endfor %}
-{% endcomment %}
+{% endcomment %}
\ No newline at end of file
diff --git a/src/_includes/layouts/search.html b/src/_includes/layouts/search.html
index 9e661a3..2b7a6e1 100644
--- a/src/_includes/layouts/search.html
+++ b/src/_includes/layouts/search.html
@@ -25,11 +25,11 @@ layout: default
     {%- assign search_provider = site.search_provider | default: "lunr" -%}
     {%- case search_provider -%}
       {%- when "lunr" -%}
-        <input type="text" id="search" class="search-input" placeholder="{{ site.data.ui-text[site.locale].search_placeholder_text | default: 'Enter your search term...' }}" />
+        <input type="text" id="search" class="search-input" placeholder="{{ ui-text[site.locale].search_placeholder_text | default: 'Enter your search term...' }}" />
         <div id="results" class="results"></div>
       {%- when "google" -%}
         <form onsubmit="return googleCustomSearchExecute();" id="cse-search-box-form-id">
-        <input type="text" id="cse-search-input-box-id" class="search-input" placeholder="{{ site.data.ui-text[site.locale].search_placeholder_text | default: 'Enter your search term...' }}" />
+        <input type="text" id="cse-search-input-box-id" class="search-input" placeholder="{{ ui-text[site.locale].search_placeholder_text | default: 'Enter your search term...' }}" />
         </form>
         <div id="results" class="results">
           <gcse:searchresults-only></gcse:searchresults-only>
diff --git a/src/_includes/layouts/single.html b/src/_includes/layouts/single.html
index 71cb4e8..cf1f08d 100644
--- a/src/_includes/layouts/single.html
+++ b/src/_includes/layouts/single.html
@@ -2,9 +2,9 @@
 layout: default
 ---
 
-{% if page.header.overlay_color or page.header.overlay_image or page.header.image %}
+{% if header.overlay_color or header.overlay_image or header.image %}
   {% include page__hero.html %}
-{% elsif page.header.video.id and page.header.video.provider %}
+{% elsif header.video.id and header.video.provider %}
   {% include page__hero_video.html %}
 {% endif %}
 
@@ -18,54 +18,56 @@ layout: default
   {% include sidebar.html %}
 
   <article class="page" itemscope itemtype="https://schema.org/CreativeWork">
-    {% if page.title %}<meta itemprop="headline" content="{{ page.title | markdownify | strip_html | strip_newlines | escape_once }}">{% endif %}
-    {% if page.excerpt %}<meta itemprop="description" content="{{ page.excerpt | markdownify | strip_html | strip_newlines | escape_once }}">{% endif %}
-    {% if page.date %}<meta itemprop="datePublished" content="{{ page.date | date_to_xmlschema }}">{% endif %}
-    {% if page.last_modified_at %}<meta itemprop="dateModified" content="{{ page.last_modified_at | date_to_xmlschema }}">{% endif %}
+    {% if title %}<meta itemprop="headline" content="{{ title | markdownify | strip_html | strip_newlines | escape_once }}">{% endif %}
+    {% if excerpt %}<meta itemprop="description" content="{{ excerpt | markdownify | strip_html | strip_newlines | escape_once }}">{% endif %}
+    {% if date %}<meta itemprop="datePublished" content="{{ date | date_to_xmlschema }}">{% endif %}
+    {% if last_modified_at %}<meta itemprop="dateModified" content="{{ last_modified_at | date_to_xmlschema }}">{% endif %}
 
     <div class="page__inner-wrap">
-      {% unless page.header.overlay_color or page.header.overlay_image %}
+      {% unless header.overlay_color or header.overlay_image %}
         <header>
-          {% if page.title %}<h1 id="page-title" class="page__title" itemprop="headline">{{ page.title | markdownify | remove: "<p>" | remove: "</p>" }}</h1>{% endif %}
+          {% if title %}<h1 id="page-title" class="page__title" itemprop="headline">{{ title | markdownify | remove: "<p>" | remove: "</p>" }}</h1>{% endif %}
           {% include page__meta.html %}
         </header>
       {% endunless %}
 
       <section class="page__content" itemprop="text">
-        {% if page.toc %}
-          <aside class="sidebar__right {% if page.toc_sticky %}sticky{% endif %}">
+        {% if toc %}
+          <aside class="sidebar__right {% if toc_sticky %}sticky{% endif %}">
             <nav class="toc">
-              <header><h4 class="nav__title"><i class="fas fa-{{ page.toc_icon | default: 'file-alt' }}"></i> {{ page.toc_label | default: site.data.ui-text[site.locale].toc_label | default: "On this page" }}</h4></header>
+              <header><h4 class="nav__title"><i class="fas fa-{{ page.toc_icon | default: 'file-alt' }}"></i> {{ toc_label | default: ui-text[site.locale].toc_label | default: "On this page" }}</h4></header>
               {% include toc.html sanitize=true html=content h_min=1 h_max=6 class="toc__menu" %}
             </nav>
           </aside>
         {% endif %}
         {{ content }}
-        {% if page.link %}<div><a href="{{ page.link }}" class="btn btn--primary">{{ site.data.ui-text[site.locale].ext_link_label | default: "Direct Link" }}</a></div>{% endif %}
+        {% if page.link %}<div><a href="{{ page.link }}" class="btn btn--primary">{{ ui-text[site.locale].ext_link_label | default: "Direct Link" }}</a></div>{% endif %}
       </section>
 
       <footer class="page__meta">
-        {% if site.data.ui-text[site.locale].meta_label %}
-          <h4 class="page__meta-title">{{ site.data.ui-text[site.locale].meta_label }}</h4>
+        {% if ui-text[site.locale].meta_label %}
+          <h4 class="page__meta-title">{{ ui-text[site.locale].meta_label }}</h4>
         {% endif %}
         {% include page__taxonomy.html %}
         {% include page__date.html %}
       </footer>
 
-      {% if page.share %}{% include social-share.html %}{% endif %}
-
-      {% include post_pagination.html %}
+      {% if share or site.defaults.posts.share %}{% include social-share.html %}{% endif %}
+      {% include post_pagination.html siblings=siblings %}
     </div>
 
-    {% if jekyll.environment == 'production' and site.comments.provider and page.comments %}
+    {% comment %}
+    {% if environment == 'production' and site.comments.provider and comments or site.defaults.post.comments %}
+    {% endcomment %}
+    {% if site.comments.provider and comments or site.defaults.posts.comments %}
       {% include comments.html %}
     {% endif %}
   </article>
 
   {% comment %}<!-- only show related on a post page when `related: true` -->{% endcomment %}
-  {% if page.id and page.related and site.related_posts.size > 0 %}
+  {% if id and related and site.related_posts.size > 0 %}
     <div class="page__related">
-      <h4 class="page__related-title">{{ site.data.ui-text[site.locale].related_label | default: "You May Also Enjoy" }}</h4>
+      <h4 class="page__related-title">{{ ui-text[site.locale].related_label | default: "You May Also Enjoy" }}</h4>
       <div class="grid__wrapper">
         {% for post in site.related_posts limit:4 %}
           {% include archive-single.html type="grid" %}
@@ -73,11 +75,11 @@ layout: default
       </div>
     </div>
   {% comment %}<!-- otherwise show recent posts if no related when `related: true` -->{% endcomment %}
-  {% elsif page.id and page.related %}
+  {% elsif id and related %}
     <div class="page__related">
-      <h4 class="page__related-title">{{ site.data.ui-text[site.locale].related_label | default: "You May Also Enjoy" }}</h4>
+      <h4 class="page__related-title">{{ ui-text[site.locale].related_label | default: "You May Also Enjoy" }}</h4>
       <div class="grid__wrapper">
-        {% for post in site.posts limit:4 %}
+        {% for post in collections.posts limit:4 %}
           {% if post.id == page.id %}
             {% continue %}
           {% endif %}
diff --git a/src/_includes/layouts/splash.html b/src/_includes/layouts/splash.html
index 2116502..2cd6157 100644
--- a/src/_includes/layouts/splash.html
+++ b/src/_includes/layouts/splash.html
@@ -2,15 +2,15 @@
 layout: default
 ---
 
-{% if page.header.overlay_color or page.header.overlay_image or page.header.image %}
+{% if header.overlay_color or header.overlay_image or header.image %}
   {% include page__hero.html %}
-{% elsif page.header.video.id and page.header.video.provider %}
+{% elsif header.video.id and header.video.provider %}
   {% include page__hero_video.html %}
 {% endif %}
 
 <div id="main" role="main">
   <article class="splash" itemscope itemtype="https://schema.org/CreativeWork">
-    {% if page.title %}<meta itemprop="headline" content="{{ page.title | markdownify | strip_html | strip_newlines | escape_once }}">{% endif %}
+    {% if title %}<meta itemprop="headline" content="{{ title | markdownify | strip_html | strip_newlines | escape_once }}">{% endif %}
     {% if page.excerpt %}<meta itemprop="description" content="{{ page.excerpt | markdownify | strip_html | strip_newlines | escape_once }}">{% endif %}
     {% if page.date %}<meta itemprop="datePublished" content="{{ page.date | date_to_xmlschema }}">{% endif %}
     {% if page.last_modified_at %}<meta itemprop="dateModified" content="{{ page.last_modified_at | date_to_xmlschema }}">{% endif %}
diff --git a/src/_includes/layouts/tags.html b/src/_includes/layouts/tags.html
index daa1182..a81bda0 100644
--- a/src/_includes/layouts/tags.html
+++ b/src/_includes/layouts/tags.html
@@ -5,19 +5,21 @@ layout: archive
 {{ content }}
 
 {% assign tags_max = 0 %}
-{% for tag in site.tags %}
-  {% if tag[1].size > tags_max %}
-    {% assign tags_max = tag[1].size %}
+{% for tag in collections.tags %}
+  {% if collections[tag].size > tags_max %}
+    {% assign tags_max = collections[tag].size %}
   {% endif %}
 {% endfor %}
 
+
+
 <ul class="taxonomy__index">
   {% for i in (1..tags_max) reversed %}
-    {% for tag in site.tags %}
-      {% if tag[1].size == i %}
+    {% for tag in collections.tags %}
+      {% if collections[tag].size == i %}
         <li>
-          <a href="#{{ tag[0] | slugify }}">
-            <strong>{{ tag[0] }}</strong> <span class="taxonomy__count">{{ i }}</span>
+          <a href="#{{ tag | slugify }}">
+            <strong>{{ tag }}</strong> <span class="taxonomy__count">{{ i }}</span>
           </a>
         </li>
       {% endif %}
@@ -27,16 +29,16 @@ layout: archive
 
 {% assign entries_layout = page.entries_layout | default: 'list' %}
 {% for i in (1..tags_max) reversed %}
-  {% for tag in site.tags %}
-    {% if tag[1].size == i %}
-      <section id="{{ tag[0] | slugify | downcase }}" class="taxonomy__section">
-        <h2 class="archive__subtitle">{{ tag[0] }}</h2>
+  {% for tag in collections.tags %}
+    {% if collections[tag].size == i %}
+      <section id="{{ tag | slugify | downcase }}" class="taxonomy__section">
+        <h2 class="archive__subtitle">{{ tag }}</h2>
         <div class="entries-{{ entries_layout }}">
-          {% for post in tag.last %}
-            {% include archive-single.html type=entries_layout %}
+          {% for post in collections[tag] %}
+            {% include archive-single.html type=entries_layout, aPost=post %}
           {% endfor %}
         </div>
-        <a href="#page-title" class="back-to-top">{{ site.data.ui-text[site.locale].back_to_top | default: 'Back to Top' }} &uarr;</a>
+        <a href="#page-title" class="back-to-top">{{ ui-text[site.locale].back_to_top | default: 'Back to Top' }} &uarr;</a>
       </section>
     {% endif %}
   {% endfor %}
diff --git a/src/_includes/masthead.html b/src/_includes/masthead.html
index 0c66aa6..e787577 100644
--- a/src/_includes/masthead.html
+++ b/src/_includes/masthead.html
@@ -12,7 +12,7 @@
           {% if site.subtitle %}<span class="site-subtitle">{{ site.subtitle }}</span>{% endif %}
         </a>
         <ul class="visible-links">
-          {%- for link in site.data.navigation.main -%}
+          {%- for link in navigation.main -%}
             <li class="masthead__menu-item">
               <a href="{{ link.url | relative_url }}"{% if link.description %} title="{{ link.description }}"{% endif %}>{{ link.title }}</a>
             </li>
@@ -20,12 +20,12 @@
         </ul>
         {% if site.search == true %}
         <button class="search__toggle" type="button">
-          <span class="visually-hidden">{{ site.data.ui-text[site.locale].search_label | default: "Toggle search" }}</span>
+          <span class="visually-hidden">{{ ui-text[site.locale].search_label | default: "Toggle search" }}</span>
           <i class="fas fa-search"></i>
         </button>
         {% endif %}
         <button class="greedy-nav__toggle hidden" type="button">
-          <span class="visually-hidden">{{ site.data.ui-text[site.locale].menu_label | default: "Toggle menu" }}</span>
+          <span class="visually-hidden">{{ ui-text[site.locale].menu_label | default: "Toggle menu" }}</span>
           <div class="navicon"></div>
         </button>
         <ul class="hidden-links hidden"></ul>
diff --git a/src/_includes/nav_list.liquid b/src/_includes/nav_list.liquid
index a035a5b..21781e4 100644
--- a/src/_includes/nav_list.liquid
+++ b/src/_includes/nav_list.liquid
@@ -3,7 +3,7 @@
 <nav class="nav__list">
   {% if page.sidebar.title %}<h3 class="nav__title" style="padding-left: 0;">{{ page.sidebar.title }}</h3>{% endif %}
   <input id="ac-toc" name="accordion-toc" type="checkbox" />
-  <label for="ac-toc">{{ site.data.ui-text[site.locale].menu_label | default: "Toggle Menu" }}</label>
+  <label for="ac-toc">{{ ui-text[site.locale].menu_label | default: "Toggle Menu" }}</label>
   <ul class="nav__items">
     {% for nav in navigation %}
       <li>
diff --git a/src/_includes/page__date.html b/src/_includes/page__date.html
index 4f995ed..17cbacc 100644
--- a/src/_includes/page__date.html
+++ b/src/_includes/page__date.html
@@ -1,6 +1,7 @@
-{% assign date_format = site.date_format | default: "%B %-d, %Y" %}
-{% if page.last_modified_at %}
-  <p class="page__date"><strong><i class="fas fa-fw fa-calendar-alt" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].date_label | default: "Updated:" }}</strong> <time datetime="{{ page.last_modified_at | date: "%Y-%m-%d" }}">{{ page.last_modified_at | date: date_format }}</time></p>
-{% elsif page.date %}
-  <p class="page__date"><strong><i class="fas fa-fw fa-calendar-alt" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].date_label | default: "Updated:" }}</strong> <time datetime="{{ page.date | date_to_xmlschema }}">{{ page.date | date: date_format }}</time></p>
+{% assign date_format = site.date_format | default: "dddd, LL" %}
+{% if date %}
+<p class="page__date"><strong><i class="fas fa-fw fa-calendar-alt" aria-hidden="true"></i> {{ ui-text[site.locale].date_posted | default: "Posted:" }}</strong> <time datetime="{{ date | date_to_xmlschema }}">{{ date | date: date_format }}</time></p>
+{% endif %}
+{% if last_modified %}
+  <p class="page__date"><strong><i class="fas fa-fw fa-calendar-alt" aria-hidden="true"></i> {{ ui-text[site.locale].date_label | default: "Updated:" }}</strong> <time datetime="{{ page.last_modified_at | date: "Y-M-D" }}">{{ last_modified | date: date_format }}</time></p>
 {% endif %}
diff --git a/src/_includes/page__hero.html b/src/_includes/page__hero.html
index dd1c26f..fe5c89a 100644
--- a/src/_includes/page__hero.html
+++ b/src/_includes/page__hero.html
@@ -1,55 +1,55 @@
-{% capture overlay_img_path %}{{ page.header.overlay_image | relative_url }}{% endcapture %}
+{% capture overlay_img_path %}{{ header.overlay_image | relative_url }}{% endcapture %}
 
-{% if page.header.overlay_filter contains "gradient" %}
-  {% capture overlay_filter %}{{ page.header.overlay_filter }}{% endcapture %}
-{% elsif page.header.overlay_filter contains "rgba" %}
-  {% capture overlay_filter %}{{ page.header.overlay_filter }}{% endcapture %}
+{% if header.overlay_filter contains "gradient" %}
+  {% capture overlay_filter %}{{ header.overlay_filter }}{% endcapture %}
+{% elsif header.overlay_filter contains "rgba" %}
+  {% capture overlay_filter %}{{ header.overlay_filter }}{% endcapture %}
   {% capture overlay_filter %}linear-gradient({{ overlay_filter }}, {{ overlay_filter }}){% endcapture %}
-{% elsif page.header.overlay_filter %}
-  {% capture overlay_filter %}rgba(0, 0, 0, {{ page.header.overlay_filter }}){% endcapture %}
+{% elsif header.overlay_filter %}
+  {% capture overlay_filter %}rgba(0, 0, 0, {{ header.overlay_filter }}){% endcapture %}
   {% capture overlay_filter %}linear-gradient({{ overlay_filter }}, {{ overlay_filter }}){% endcapture %}
 {% endif %}
 
-{% if page.header.image_description %}
-  {% assign image_description = page.header.image_description %}
+{% if header.image_description %}
+  {% assign image_description = header.image_description %}
 {% else %}
-  {% assign image_description = page.title %}
+  {% assign image_description = title %}
 {% endif %}
 
 {% assign image_description = image_description | markdownify | strip_html | strip_newlines | escape_once %}
 
-<div class="page__hero{% if page.header.overlay_color or page.header.overlay_image %}--overlay{% endif %}"
-  style="{% if page.header.overlay_color %}background-color: {{ page.header.overlay_color | default: 'transparent' }};{% endif %} {% if overlay_img_path %}background-image: {% if overlay_filter %}{{ overlay_filter }}, {% endif %}url('{{ overlay_img_path }}');{% endif %}"
+<div class="page__hero{% if header.overlay_color or header.overlay_image %}--overlay{% endif %}"
+  style="{% if header.overlay_color %}background-color: {{ header.overlay_color | default: 'transparent' }};{% endif %} {% if overlay_img_path %}background-image: {% if overlay_filter %}{{ overlay_filter }}, {% endif %}url('{{ overlay_img_path }}');{% endif %}"
 >
-  {% if page.header.overlay_color or page.header.overlay_image %}
+  {% if header.overlay_color or header.overlay_image %}
     <div class="wrapper">
       <h1 id="page-title" class="page__title" itemprop="headline">
         {% if paginator and site.paginate_show_page_num %}
-          {{ site.title }}{% unless paginator.page == 1 %} {{ site.data.ui-text[site.locale].page | default: "Page" }} {{ paginator.page }}{% endunless %}
+          {{ site.title }}{% unless paginator.page == 1 %} {{ ui-text[site.locale].page | default: "Page" }} {{ paginator.page }}{% endunless %}
         {% else %}
-          {{ page.title | default: site.title | markdownify | remove: "<p>" | remove: "</p>" }}
+          {{ title | default: site.title | markdownify | remove: "<p>" | remove: "</p>" }}
         {% endif %}
       </h1>
-      {% if page.tagline %}
-        <p class="page__lead">{{ page.tagline | markdownify | remove: "<p>" | remove: "</p>" }}</p>
-      {% elsif page.header.show_overlay_excerpt != false and page.excerpt %}
-        <p class="page__lead">{{ page.excerpt | markdownify | remove: "<p>" | remove: "</p>" }}</p>
+      {% if tagline %}
+        <p class="page__lead">{{ tagline | markdownify | remove: "<p>" | remove: "</p>" }}</p>
+      {% elsif header.show_overlay_excerpt != false and page.excerpt %}
+        <p class="page__lead">{{ excerpt | markdownify | remove: "<p>" | remove: "</p>" }}</p>
       {% endif %}
       {% include page__meta.html %}
-      {% if page.header.cta_url %}
-        <p><a href="{{ page.header.cta_url | relative_url }}" class="btn btn--light-outline btn--large">{{ page.header.cta_label | default: site.data.ui-text[site.locale].more_label | default: "Learn More" }}</a></p>
+      {% if header.cta_url %}
+        <p><a href="{{ header.cta_url | relative_url }}" class="btn btn--light-outline btn--large">{{ header.cta_label | default: ui-text[site.locale].more_label | default: "Learn More" }}</a></p>
       {% endif %}
-      {% if page.header.actions %}
+      {% if header.actions %}
         <p>
-        {% for action in page.header.actions %}
-          <a href="{{ action.url | relative_url }}" class="btn btn--light-outline btn--large">{{ action.label | default: site.data.ui-text[site.locale].more_label | default: "Learn More" }}</a>
+        {% for action in header.actions %}
+          <a href="{{ action.url | relative_url }}" class="btn btn--light-outline btn--large">{{ action.label | default: ui-text[site.locale].more_label | default: "Learn More" }}</a>
         {% endfor %}
       {% endif %}
     </div>
   {% else %}
-    <img src="{{ page.header.image | relative_url }}" alt="{{ image_description }}" class="page__hero-image">
+    <img src="{{ header.image | relative_url }}" alt="{{ image_description }}" class="page__hero-image">
   {% endif %}
-  {% if page.header.caption %}
-    <span class="page__hero-caption">{{ page.header.caption | markdownify | remove: "<p>" | remove: "</p>" }}</span>
+  {% if header.caption %}
+    <span class="page__hero-caption">{{ header.caption | markdownify | remove: "<p>" | remove: "</p>" }}</span>
   {% endif %}
 </div>
diff --git a/src/_includes/page__hero_video.html b/src/_includes/page__hero_video.html
index a313a23..fd79386 100644
--- a/src/_includes/page__hero_video.html
+++ b/src/_includes/page__hero_video.html
@@ -1,2 +1,2 @@
-{% assign video = page.header.video %}
+{% assign video = header.video %}
 {% include video id=video.id provider=video.provider danmaku=video.danmaku %}
diff --git a/src/_includes/page__meta.html b/src/_includes/page__meta.html
index 8516e0e..af9b063 100644
--- a/src/_includes/page__meta.html
+++ b/src/_includes/page__meta.html
@@ -1,10 +1,6 @@
 {% assign document = post | default: page %}
 {% assign document = document.data.page %}
 
-
-{{document | inspect}}
-{{site.defaults.posts.show_date | json}}
-{{document.date | json}}
 {% if document.read_time or document.show_date or site.defaults.posts.show_date %}
 
   <p class="page__meta">
@@ -16,21 +12,24 @@
         <time datetime="{{ date | date_to_xmlschema }}">{{ date | date: date_format }}</time>
       </span>
     {% endif %}
-
-    {% if document.read_time or site.defaults.posts.read_time and document.show_date or site.defaults.posts.show_date %}<span class="page__meta-sep"></span>{% endif %}
+    {% if document and document.read_time or site.defaults.posts.read_time and document.show_date or site.defaults.posts.show_date %}<span class="page__meta-sep"></span>{% endif %}
 
     {% if document.read_time or site.defaults.posts.read_time %}
       {% assign words_per_minute = document.words_per_minute | default: site.words_per_minute | default: 200 %}
-      {% assign words = document.content | strip_html | number_of_words %}
+
+      {% assign con = include.content | default: content %}
+      {% assign words = con | strip_html | number_of_words %}
+
+      <!-- There is a minute difference between the time to read on the list pages, and on the article itself. So 5 minutes to read in the list, 4 minutes to read on article itself -->
 
       <span class="page__meta-readtime">
         <i class="far {% if include.type == 'grid' and document.read_time and document.show_date %}fa-fw {% endif %}fa-clock" aria-hidden="true"></i>
         {% if words < words_per_minute %}
-          {{ site.data.ui-text[site.locale].less_than | default: "less than" }} 1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }}
+          {{ ui-text[site.locale].less_than | default: "less than" }} 1 {{ ui-text[site.locale].minute_read | default: "minute read" }}
         {% elsif words == words_per_minute %}
-          1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }}
+          1 {{ ui-text[site.locale].minute_read | default: "minute read" }}
         {% else %}
-          {{ words | divided_by: words_per_minute }} {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }}
+          {{ words | divided_by: words_per_minute | round }} {{ ui-text[site.locale].minute_read | default: "minute read" }}
         {% endif %}
       </span>
     {% endif %}
diff --git a/src/_includes/page__taxonomy.html b/src/_includes/page__taxonomy.html
index 75c76c8..055789b 100644
--- a/src/_includes/page__taxonomy.html
+++ b/src/_includes/page__taxonomy.html
@@ -1,7 +1,7 @@
-{% if site.tag_archive.type and page.tags[0] %}
+{% if site.tag_archive.type and tags[0] %}
   {% include tag-list.html %}
 {% endif %}
 
-{% if site.category_archive.type and page.categories[0] %}
+{% if site.category_archive.type and categories[0] %}
   {% include category-list.html %}
 {% endif %}
\ No newline at end of file
diff --git a/src/_includes/paginator.html b/src/_includes/paginator.html
index bffa079..2a18f06 100644
--- a/src/_includes/paginator.html
+++ b/src/_includes/paginator.html
@@ -5,12 +5,12 @@
     {% comment %} Link for previous page {% endcomment %}
     {% if paginator.previous_page %}
       {% if paginator.previous_page == 1 %}
-        <li><a href="{{ first_page_path }}">{{ site.data.ui-text[site.locale].pagination_previous | default: "Previous" }}</a></li>
+        <li><a href="{{ first_page_path }}">{{ ui-text[site.locale].pagination_previous | default: "Previous" }}</a></li>
       {% else %}
-        <li><a href="{{ site.paginate_path | replace: ':num', paginator.previous_page | replace: '//', '/' | relative_url }}">{{ site.data.ui-text[site.locale].pagination_previous | default: "Previous" }}</a></li>
+        <li><a href="{{ site.paginate_path | replace: ':num', paginator.previous_page | replace: '//', '/' | relative_url }}">{{ ui-text[site.locale].pagination_previous | default: "Previous" }}</a></li>
       {% endif %}
     {% else %}
-    <li><a href="#" class="disabled"><span aria-hidden="true">{{ site.data.ui-text[site.locale].pagination_previous | default: "Previous" }}</span></a></li>
+    <li><a href="#" class="disabled"><span aria-hidden="true">{{ ui-text[site.locale].pagination_previous | default: "Previous" }}</span></a></li>
     {% endif %}
 
     {% comment %} First page {% endcomment %}
@@ -60,9 +60,9 @@
 
     {% comment %} Link next page {% endcomment %}
     {% if paginator.next_page %}
-      <li><a href="{{ site.paginate_path | replace: ':num', paginator.next_page | replace: '//', '/' | relative_url }}">{{ site.data.ui-text[site.locale].pagination_next | default: "Next" }}</a></li>
+      <li><a href="{{ site.paginate_path | replace: ':num', paginator.next_page | replace: '//', '/' | relative_url }}">{{ ui-text[site.locale].pagination_next | default: "Next" }}</a></li>
     {% else %}
-      <li><a href="#" class="disabled"><span aria-hidden="true">{{ site.data.ui-text[site.locale].pagination_next | default: "Next" }}</span></a></li>
+      <li><a href="#" class="disabled"><span aria-hidden="true">{{ ui-text[site.locale].pagination_next | default: "Next" }}</span></a></li>
     {% endif %}
   </ul>
 </nav>
diff --git a/src/_includes/post_pagination.html b/src/_includes/post_pagination.html
index a93c627..5cc4207 100644
--- a/src/_includes/post_pagination.html
+++ b/src/_includes/post_pagination.html
@@ -1,14 +1,15 @@
-{% if page.previous or page.next %}
+
+{% if include.siblings.prev or include.siblings.next %}
   <nav class="pagination">
-    {% if page.previous %}
-      <a href="{{ page.previous.url | relative_url }}" class="pagination--pager" title="{{ page.previous.title | markdownify | strip_html }}">{{ site.data.ui-text[site.locale].pagination_previous | default: "Previous" }}</a>
+    {% if include.siblings.prev %}
+      <a href="{{ include.siblings.prev.url | relative_url }}" class="pagination--pager" title="{{ include.siblings.prev.data.title | markdownify | strip_html }}">{{ ui-text[site.locale].pagination_previous | default: "Previous" }}</a>
     {% else %}
-      <a href="#" class="pagination--pager disabled">{{ site.data.ui-text[site.locale].pagination_previous | default: "Previous" }}</a>
+      <a href="#" class="pagination--pager disabled">{{ ui-text[site.locale].pagination_previous | default: "Previous" }}</a>
     {% endif %}
-    {% if page.next %}
-      <a href="{{ page.next.url | relative_url }}" class="pagination--pager" title="{{ page.next.title | markdownify | strip_html }}">{{ site.data.ui-text[site.locale].pagination_next | default: "Next" }}</a>
+    {% if include.siblings.next %}
+      <a href="{{ include.siblings.next.url | relative_url }}" class="pagination--pager" title="{{ include.siblings.next.data.title | markdownify | strip_html }}">{{ ui-text[site.locale].pagination_next | default: "Next" }}</a>
     {% else %}
-      <a href="#" class="pagination--pager disabled">{{ site.data.ui-text[site.locale].pagination_next | default: "Next" }}</a>
+      <a href="#" class="pagination--pager disabled">{{ ui-text[site.locale].pagination_next | default: "Next" }}</a>
     {% endif %}
   </nav>
 {% endif %}
\ No newline at end of file
diff --git a/src/_includes/search/algolia-search-scripts.html b/src/_includes/search/algolia-search-scripts.html
index 2728d29..b6a02e6 100644
--- a/src/_includes/search/algolia-search-scripts.html
+++ b/src/_includes/search/algolia-search-scripts.html
@@ -37,7 +37,7 @@ search.addWidget(
   instantsearch.widgets.searchBox({
     container: '.search-searchbar',
     {% unless site.algolia.powered_by == false %}poweredBy: true,{% endunless %}
-    placeholder: '{{ site.data.ui-text[site.locale].search_placeholder_text | default: "Enter your search term..." }}'
+    placeholder: '{{ ui-text[site.locale].search_placeholder_text | default: "Enter your search term..." }}'
   })
 );
 search.addWidget(
@@ -45,7 +45,7 @@ search.addWidget(
     container: '.search-hits',
     templates: {
       item: hitTemplate,
-      empty: '{{ site.data.ui-text[site.locale].search_algolia_no_results | default: "No results" }}',
+      empty: '{{ ui-text[site.locale].search_algolia_no_results | default: "No results" }}',
     }
   })
 );
diff --git a/src/_includes/search/search_form.html b/src/_includes/search/search_form.html
index c346379..2416a75 100644
--- a/src/_includes/search/search_form.html
+++ b/src/_includes/search/search_form.html
@@ -4,17 +4,17 @@
   {%- when "lunr" -%}
   <form class="search-content__form" onkeydown="return event.key != 'Enter';">
     <label class="sr-only" for="search">
-      {{ site.data.ui-text[site.locale].search_label_text | default: 'Enter your search term...' }}
+      {{ ui-text[site.locale].search_label_text | default: 'Enter your search term...' }}
     </label>
-    <input type="search" id="search" class="search-input" tabindex="-1" placeholder="{{ site.data.ui-text[site.locale].search_placeholder_text | default: 'Enter your search term...' }}" />
+    <input type="search" id="search" class="search-input" tabindex="-1" placeholder="{{ ui-text[site.locale].search_placeholder_text | default: 'Enter your search term...' }}" />
   </form>
   <div id="results" class="results"></div>
   {%- when "google" -%}
   <form onsubmit="return googleCustomSearchExecute();" id="cse-search-box-form-id">
     <label class="sr-only" for="cse-search-input-box-id">
-      {{ site.data.ui-text[site.locale].search_label_text | default: 'Enter your search term...' }}
+      {{ ui-text[site.locale].search_label_text | default: 'Enter your search term...' }}
     </label>
-    <input type="search" id="cse-search-input-box-id" class="search-input" tabindex="-1" placeholder="{{ site.data.ui-text[site.locale].search_placeholder_text | default: 'Enter your search term...' }}" />
+    <input type="search" id="cse-search-input-box-id" class="search-input" tabindex="-1" placeholder="{{ ui-text[site.locale].search_placeholder_text | default: 'Enter your search term...' }}" />
   </form>
   <div id="results" class="results">
     <gcse:searchresults-only></gcse:searchresults-only>
diff --git a/src/_includes/seo.html b/src/_includes/seo.html
index c9d01e9..315d01c 100644
--- a/src/_includes/seo.html
+++ b/src/_includes/seo.html
@@ -6,8 +6,8 @@
 
 {% assign title_separator = site.title_separator | default: '-' | replace: '|', '&#124;' %}
 
-{%- if page.title -%}
-  {%- assign seo_title = page.title | append: " " | append: title_separator | append: " " | append: site.title -%}
+{%- if title -%}
+  {%- assign seo_title = title | append: " " | append: title_separator | append: " " | append: site.title -%}
 {%- endif -%}
 
 {%- if seo_title -%}
@@ -20,34 +20,34 @@
   {%- assign canonical_url = page.url | replace: "index.html", "" | absolute_url %}
 {% endif %}
 
-{%- assign seo_description = page.description | default: page.excerpt | default: site.description -%}
+{%- assign seo_description = description | default: excerpt | default: site.description -%}
 {%- if seo_description -%}
   {%- assign seo_description = seo_description | markdownify | strip_html | newline_to_br | strip_newlines | replace: '<br />', ' ' | escape_once | strip -%}
 {%- endif -%}
 
-{%- assign author = page.author | default: page.authors[0] | default: site.author -%}
-{%- assign author = site.data.authors[author] | default: author -%}
+{%- assign author = author | default: authors[0] | default: site.author -%}
+{%- assign author = authors[author] | default: author -%}
 
 {%- if author.twitter -%}
   {%- assign author_twitter = author.twitter | replace: "@", "" -%}
 {%- endif -%}
 
-{%- assign page_large_image = page.header.og_image | default: page.header.overlay_image | default: page.header.image | absolute_url -%}
+{%- assign page_large_image = header.og_image | default: header.overlay_image | default: header.image | absolute_url -%}
 {%- assign page_large_image = page_large_image | escape -%}
 
-{%- assign page_teaser_image = page.header.teaser | default: site.og_image | absolute_url -%}
+{%- assign page_teaser_image = header.teaser | default: site.og_image | absolute_url -%}
 {%- assign page_teaser_image = page_teaser_image | escape -%}
 
 {%- assign site_og_image = site.og_image | absolute_url -%}
 {%- assign site_og_image = site_og_image | escape -%}
 
-{%- if page.date -%}
+{%- if date -%}
   {%- assign og_type = "article" -%}
 {%- else -%}
   {%- assign og_type = "website" -%}
 {%- endif -%}
 
-<title>{{ seo_title | default: site.title }}{% if paginator %}{% unless paginator.page == 1 %} {{ title_separator }} {{ site.data.ui-text[site.locale].page | default: "Page" }} {{ paginator.page }}{% endunless %}{% endif %}</title>
+<title>{{ seo_title | default: site.title }}{% if paginator %}{% unless paginator.page == 1 %} {{ title_separator }} {{ ui-text[site.locale].page | default: "Page" }} {{ paginator.page }}{% endunless %}{% endif %}</title>
 <meta name="description" content="{{ seo_description }}">
 
 {% if author.name %}
@@ -60,7 +60,7 @@
 <meta property="og:type" content="{{ og_type }}">
 <meta property="og:locale" content="{{ site.locale | replace: "-", "_" | default: "en_US" }}">
 <meta property="og:site_name" content="{{ site.title }}">
-<meta property="og:title" content="{{ page.title | default: site.title | markdownify | strip_html | strip_newlines | escape_once }}">
+<meta property="og:title" content="{{ title | default: site.title | markdownify | strip_html | strip_newlines | escape_once }}">
 <meta property="og:url" content="{{ canonical_url }}">
 
 {% if seo_description %}
@@ -75,7 +75,7 @@
 
 {% if site.twitter.username %}
   <meta name="twitter:site" content="@{{ site.twitter.username | replace: "@", "" }}">
-  <meta name="twitter:title" content="{{ page.title | default: site.title | markdownify | strip_html | strip_newlines | escape_once }}">
+  <meta name="twitter:title" content="{{ title | default: site.title | markdownify | strip_html | strip_newlines | escape_once }}">
   <meta name="twitter:description" content="{{ seo_description }}">
   <meta name="twitter:url" content="{{ canonical_url }}">
 
@@ -94,12 +94,12 @@
   {% endif %}
 {% endif %}
 
-{% if page.date %}
-  <meta property="article:published_time" content="{{ page.date | date_to_xmlschema }}">
+{% if date %}
+  <meta property="article:published_time" content="{{ date | date_to_xmlschema }}">
 {% endif %}
 
 {% if og_type == "article" and page.last_modified_at %}
-  <meta property="article:modified_time" content="{{ page.last_modified_at | date_to_xmlschema }}">
+  <meta property="article:modified_time" content="{{ last_modified_at | date_to_xmlschema }}">
 {% endif %}
 
 {% if site.facebook %}
diff --git a/src/_includes/skip-links.html b/src/_includes/skip-links.html
index c2d5223..5786317 100644
--- a/src/_includes/skip-links.html
+++ b/src/_includes/skip-links.html
@@ -1,7 +1,7 @@
 <nav class="skip-links">
   <ul>
-    <li><a href="#site-nav" class="screen-reader-shortcut">{{ site.data.ui-text[site.locale].skip_primary_nav | default: 'Skip to primary navigation' }}</a></li>
-    <li><a href="#main" class="screen-reader-shortcut">{{ site.data.ui-text[site.locale].skip_content | default: 'Skip to content' }}</a></li>
-    <li><a href="#footer" class="screen-reader-shortcut">{{ site.data.ui-text[site.locale].skip_footer | default: 'Skip to footer' }}</a></li>
+    <li><a href="#site-nav" class="screen-reader-shortcut">{{ ui-text[site.locale].skip_primary_nav | default: 'Skip to primary navigation' }}</a></li>
+    <li><a href="#main" class="screen-reader-shortcut">{{ ui-text[site.locale].skip_content | default: 'Skip to content' }}</a></li>
+    <li><a href="#footer" class="screen-reader-shortcut">{{ ui-text[site.locale].skip_footer | default: 'Skip to footer' }}</a></li>
   </ul>
 </nav>
diff --git a/src/_includes/social-share.html b/src/_includes/social-share.html
index 0b37798..6fe7710 100644
--- a/src/_includes/social-share.html
+++ b/src/_includes/social-share.html
@@ -1,11 +1,11 @@
 <section class="page__share">
-  {% if site.data.ui-text[site.locale].share_on_label %}
-    <h4 class="page__share-title">{{ site.data.ui-text[site.locale].share_on_label | default: "Share on" }}</h4>
+  {% if ui-text[site.locale].share_on_label %}
+    <h4 class="page__share-title">{{ ui-text[site.locale].share_on_label | default: "Share on" }}</h4>
   {% endif %}
 
-  <a href="https://twitter.com/intent/tweet?{% if site.twitter.username %}via={{ site.twitter.username | url_encode }}&{% endif %}text={{ page.title | url_encode }}%20{{ page.url | absolute_url | url_encode }}" class="btn btn--twitter" onclick="window.open(this.href, 'window', 'left=20,top=20,width=500,height=500,toolbar=1,resizable=0'); return false;" title="{{ site.data.ui-text[site.locale].share_on_label | default: 'Share on' }} Twitter"><i class="fab fa-fw fa-twitter" aria-hidden="true"></i><span> Twitter</span></a>
+  <a href="https://twitter.com/intent/tweet?{% if site.twitter.username %}via={{ site.twitter.username | url_encode }}&{% endif %}text={{ page.title | url_encode }}%20{{ page.url | absolute_url | url_encode }}" class="btn btn--twitter" onclick="window.open(this.href, 'window', 'left=20,top=20,width=500,height=500,toolbar=1,resizable=0'); return false;" title="{{ ui-text[site.locale].share_on_label | default: 'Share on' }} Twitter"><i class="fab fa-fw fa-twitter" aria-hidden="true"></i><span> Twitter</span></a>
 
-  <a href="https://www.facebook.com/sharer/sharer.php?u={{ page.url | absolute_url | url_encode }}" class="btn btn--facebook" onclick="window.open(this.href, 'window', 'left=20,top=20,width=500,height=500,toolbar=1,resizable=0'); return false;" title="{{ site.data.ui-text[site.locale].share_on_label | default: 'Share on' }} Facebook"><i class="fab fa-fw fa-facebook" aria-hidden="true"></i><span> Facebook</span></a>
+  <a href="https://www.facebook.com/sharer/sharer.php?u={{ page.url | absolute_url | url_encode }}" class="btn btn--facebook" onclick="window.open(this.href, 'window', 'left=20,top=20,width=500,height=500,toolbar=1,resizable=0'); return false;" title="{{ ui-text[site.locale].share_on_label | default: 'Share on' }} Facebook"><i class="fab fa-fw fa-facebook" aria-hidden="true"></i><span> Facebook</span></a>
 
-  <a href="https://www.linkedin.com/shareArticle?mini=true&url={{ page.url | absolute_url | url_encode }}" class="btn btn--linkedin" onclick="window.open(this.href, 'window', 'left=20,top=20,width=500,height=500,toolbar=1,resizable=0'); return false;" title="{{ site.data.ui-text[site.locale].share_on_label | default: 'Share on' }} LinkedIn"><i class="fab fa-fw fa-linkedin" aria-hidden="true"></i><span> LinkedIn</span></a>
+  <a href="https://www.linkedin.com/shareArticle?mini=true&url={{ page.url | absolute_url | url_encode }}" class="btn btn--linkedin" onclick="window.open(this.href, 'window', 'left=20,top=20,width=500,height=500,toolbar=1,resizable=0'); return false;" title="{{ ui-text[site.locale].share_on_label | default: 'Share on' }} LinkedIn"><i class="fab fa-fw fa-linkedin" aria-hidden="true"></i><span> LinkedIn</span></a>
 </section>
diff --git a/src/_includes/tag-list.html b/src/_includes/tag-list.html
index b16eca2..a6c0368 100644
--- a/src/_includes/tag-list.html
+++ b/src/_includes/tag-list.html
@@ -6,10 +6,10 @@
 {% endcase %}
 
 {% if site.tag_archive.path %}
-  {% assign tags_sorted = page.tags | sort_natural %}
+  {% assign tags_sorted = tags | sort_natural %}
 
   <p class="page__taxonomy">
-    <strong><i class="fas fa-fw fa-tags" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].tags_label | default: "Tags:" }} </strong>
+    <strong><i class="fas fa-fw fa-tags" aria-hidden="true"></i> {{ ui-text[site.locale].tags_label | default: "Tags:" }} </strong>
     <span itemprop="keywords">
     {% for tag_word in tags_sorted %}
       <a href="{{ tag_word | slugify | prepend: path_type | prepend: site.tag_archive.path | relative_url }}" class="page__taxonomy-item" rel="tag">{{ tag_word }}</a>{% unless forloop.last %}<span class="sep">, </span>{% endunless %}
diff --git a/src/_includes/toc.liquid b/src/_includes/toc.liquid
index 6423ccd..80fa323 100644
--- a/src/_includes/toc.liquid
+++ b/src/_includes/toc.liquid
@@ -1,6 +1,6 @@
 <aside class="sidebar__right">
 <nav class="toc" markdown="1">
-<header><h4 class="nav__title"><i class="fas fa-{{ include.icon | default: 'file-alt' }}"></i> {{ include.title | default: site.data.ui-text[site.locale].toc_label }}</h4></header>
+<header><h4 class="nav__title"><i class="fas fa-{{ include.icon | default: 'file-alt' }}"></i> {{ include.title | default: ui-text[site.locale].toc_label }}</h4></header>
 *  Auto generated table of contents
 {:toc .toc__menu}
 </nav>
diff --git a/src/_layouts/single.html b/src/_layouts/single.html
index 71cb4e8..8223293 100644
--- a/src/_layouts/single.html
+++ b/src/_layouts/single.html
@@ -35,18 +35,18 @@ layout: default
         {% if page.toc %}
           <aside class="sidebar__right {% if page.toc_sticky %}sticky{% endif %}">
             <nav class="toc">
-              <header><h4 class="nav__title"><i class="fas fa-{{ page.toc_icon | default: 'file-alt' }}"></i> {{ page.toc_label | default: site.data.ui-text[site.locale].toc_label | default: "On this page" }}</h4></header>
+              <header><h4 class="nav__title"><i class="fas fa-{{ page.toc_icon | default: 'file-alt' }}"></i> {{ page.toc_label | default: ui-text[site.locale].toc_label | default: "On this page" }}</h4></header>
               {% include toc.html sanitize=true html=content h_min=1 h_max=6 class="toc__menu" %}
             </nav>
           </aside>
         {% endif %}
         {{ content }}
-        {% if page.link %}<div><a href="{{ page.link }}" class="btn btn--primary">{{ site.data.ui-text[site.locale].ext_link_label | default: "Direct Link" }}</a></div>{% endif %}
+        {% if page.link %}<div><a href="{{ page.link }}" class="btn btn--primary">{{ ui-text[site.locale].ext_link_label | default: "Direct Link" }}</a></div>{% endif %}
       </section>
 
       <footer class="page__meta">
-        {% if site.data.ui-text[site.locale].meta_label %}
-          <h4 class="page__meta-title">{{ site.data.ui-text[site.locale].meta_label }}</h4>
+        {% if ui-text[site.locale].meta_label %}
+          <h4 class="page__meta-title">{{ ui-text[site.locale].meta_label }}</h4>
         {% endif %}
         {% include page__taxonomy.html %}
         {% include page__date.html %}
@@ -65,7 +65,7 @@ layout: default
   {% comment %}<!-- only show related on a post page when `related: true` -->{% endcomment %}
   {% if page.id and page.related and site.related_posts.size > 0 %}
     <div class="page__related">
-      <h4 class="page__related-title">{{ site.data.ui-text[site.locale].related_label | default: "You May Also Enjoy" }}</h4>
+      <h4 class="page__related-title">{{ ui-text[site.locale].related_label | default: "You May Also Enjoy" }}</h4>
       <div class="grid__wrapper">
         {% for post in site.related_posts limit:4 %}
           {% include archive-single.html type="grid" %}
@@ -75,7 +75,7 @@ layout: default
   {% comment %}<!-- otherwise show recent posts if no related when `related: true` -->{% endcomment %}
   {% elsif page.id and page.related %}
     <div class="page__related">
-      <h4 class="page__related-title">{{ site.data.ui-text[site.locale].related_label | default: "You May Also Enjoy" }}</h4>
+      <h4 class="page__related-title">{{ ui-text[site.locale].related_label | default: "You May Also Enjoy" }}</h4>
       <div class="grid__wrapper">
         {% for post in site.posts limit:4 %}
           {% if post.id == page.id %}
diff --git a/src/_pages/404.md b/src/_pages/404.md
index 9d0f860..b524dc2 100644
--- a/src/_pages/404.md
+++ b/src/_pages/404.md
@@ -2,6 +2,7 @@
 title: "Page Not Found"
 excerpt: "Page not found. Your pixels are in another canvas."
 sitemap: false
+layout: default
 permalink: /404.html
 ---
 
diff --git a/src/_pages/drafts.md b/src/_pages/drafts.md
new file mode 100644
index 0000000..dfe4900
--- /dev/null
+++ b/src/_pages/drafts.md
@@ -0,0 +1,5 @@
+---
+title: "Drafts"
+permalink: /drafts/
+layout: drafts
+---
diff --git a/src/_posts/2019-05-28-Day%20One.md b/src/_posts/2019-05-28-Day-One.md
similarity index 100%
rename from src/_posts/2019-05-28-Day%20One.md
rename to src/_posts/2019-05-28-Day-One.md
diff --git a/src/_posts/2019-06-04-Day%208.md b/src/_posts/2019-06-04-Day-8.md
similarity index 100%
rename from src/_posts/2019-06-04-Day%208.md
rename to src/_posts/2019-06-04-Day-8.md
diff --git a/src/_posts/2019-06-05-Day%209%20-TWTFSSMTW.md b/src/_posts/2019-06-05-Day-9-TWTFSSMTW.md
similarity index 100%
rename from src/_posts/2019-06-05-Day%209%20-TWTFSSMTW.md
rename to src/_posts/2019-06-05-Day-9-TWTFSSMTW.md
diff --git a/src/_posts/2019-06-06-Day%2010.md b/src/_posts/2019-06-06-Day-10.md
similarity index 100%
rename from src/_posts/2019-06-06-Day%2010.md
rename to src/_posts/2019-06-06-Day-10.md
diff --git a/src/_posts/2019-06-07-Day%2011.md b/src/_posts/2019-06-07-Day-11.md
similarity index 100%
rename from src/_posts/2019-06-07-Day%2011.md
rename to src/_posts/2019-06-07-Day-11.md
diff --git a/src/_posts/2019-06-08-Day%2012.md b/src/_posts/2019-06-08-Day-12.md
similarity index 100%
rename from src/_posts/2019-06-08-Day%2012.md
rename to src/_posts/2019-06-08-Day-12.md
diff --git a/src/_posts/2019-06-11-Day%2015.md b/src/_posts/2019-06-11-Day-15.md
similarity index 100%
rename from src/_posts/2019-06-11-Day%2015.md
rename to src/_posts/2019-06-11-Day-15.md
diff --git a/src/_posts/2019-06-13-Day%2017.md b/src/_posts/2019-06-13-Day-17.md
similarity index 100%
rename from src/_posts/2019-06-13-Day%2017.md
rename to src/_posts/2019-06-13-Day-17.md
diff --git a/src/_posts/2019-06-14-Day%2018.md b/src/_posts/2019-06-14-Day-18.md
similarity index 100%
rename from src/_posts/2019-06-14-Day%2018.md
rename to src/_posts/2019-06-14-Day-18.md
diff --git a/src/_posts/2020-04-20-swift-coding-challenge-2.md b/src/_posts/2020-04-20-swift-coding-challenge-2.md
index e0227f9..fcb5387 100644
--- a/src/_posts/2020-04-20-swift-coding-challenge-2.md
+++ b/src/_posts/2020-04-20-swift-coding-challenge-2.md
@@ -12,7 +12,7 @@ Second one within 13 hours, good lord, that would never do.
 
 So this challenge was to test if a string matched against the reverse of itself. Basically a palindrome checker.
 
-This took me less time, partly because my first approach was similar to the approach for challenge 1. I used a copy of the string as a ``Character`` Array with two indexes (one counting up from 0, the other down from the max number of characters), and compared each character of the array against the one at the opposite end of the array. 
+This took me less time, partly because my first approach was similar to the approach for challenge 1. I used a copy of the string as a ``Character`` Array with two indexes (one counting up from 0, the other down from the max number of characters), and compared each character of the array against the one at the opposite end of the array.
 
 So for ```['R', 'A', 'R']```, my solution compared if the character at index ```[0]``` was equal to the one at index ```[2]```, then ```[1]``` to ```[1]```. If at any point there wasn't a match, then it would have returned ```false```, otherwise it would have returned ```true```.
 
@@ -26,11 +26,11 @@ Anyway, this was my first attempt at the challenge
 ```swift
 func challenge2(input: String) -> Bool {
     let arrayOfCharacters = Array(input.lowercased())
-    
+
     //start from either end of the string, return false the first time they don't match
     var index = 0
     var reverseIndex = arrayOfCharacters.count - 1
-    
+
     while index != reverseIndex {
         if (arrayOfCharacters[index] != arrayOfCharacters[reverseIndex]) {
             return false
@@ -38,9 +38,8 @@ func challenge2(input: String) -> Bool {
         reverseIndex -= 1
         index += 1
     }
-    
+
     return true
 }
 ```
-
 (As an aside, to my mind index, reverseIndex and arrayOfCharacters should be highlighted the same color the whole way through the code, not in two different colors. Not sure what I can do about that.)
diff --git a/src/_posts/2020-04-21-learning-web-development.md b/src/_posts/2020-04-21-learning-web-development.md
index f2737e9..0b9d788 100644
--- a/src/_posts/2020-04-21-learning-web-development.md
+++ b/src/_posts/2020-04-21-learning-web-development.md
@@ -23,7 +23,7 @@ gallery:
   title: DevOps Roadmap
 date: 2020-04-21 00:44:00 +01:00
 ---
-I mentioned in the [goals post]({% post_url 2020-04-17-goals %}), one of the things I am aiming to do is to start learning web development.
+I mentioned in the [goals post]({% post_url collections.posts, "goals" %}), one of the things I am aiming to do is to start learning web development.
 
 I was well aware that what falls under the banner of web development is massive, I just hadn't realised quite how large it was.
 
@@ -37,13 +37,13 @@ What I find overwhelming is what to use for learning in terms of tutorials, vide
 
 At the moment my focus is split between the following multiple sources
 
-Text: 
+Text:
 
 - [FreeCodeCamp](https://www.freecodecamp.org)
 - [HTML Dog](https://htmldog.com/guides/)
 - and a couple of others (links are on my iPad, will update later)
 
-Video: 
+Video:
 - [The Complete 2020 Web Development Bootcamp](https://www.udemy.com/course/the-complete-web-development-bootcamp/) by Angela Yu
 - [CS50’s Web Programming with Python and JavaScript](https://cs50.harvard.edu/web/) (via [edx](https://www.edx.org/course/cs50s-web-programming-with-python-and-javascript)) - (although this is kinda a mix of both video and text)
 - [Colt's Code Camp (Learn Coding From Scratch)](https://www.youtube.com/watch?v=SF_Xl5TOGlY&list=PLblA84xge2_xNtaFnZhefjFbnDrpySKD3) by Colt Steele
@@ -52,4 +52,4 @@ I'm trying to get a feel for what works best for me, what sits in my mind more a
 
 Right now I'm still vetting, I def like Angela's course, or at least her voice, style, and humour (even if I'm watching the videos at 1.5-2.0x speed). However it is the only thing I've linked to that requires payment.
 
-I really like FreeCodeCamp's site, and the mechanics of teaching in the browser. I seriously question the 300 hours it suggests per module. I'm virtually finished the first module within about 6 hours. I'm currently working on the first "assignment", and I could easily see spending a bunch of time doing those and making them look great. 
+I really like FreeCodeCamp's site, and the mechanics of teaching in the browser. I seriously question the 300 hours it suggests per module. I'm virtually finished the first module within about 6 hours. I'm currently working on the first "assignment", and I could easily see spending a bunch of time doing those and making them look great.
diff --git a/src/_posts/2023-01-21-moving-blog.md b/src/_posts/2023-01-21-moving-blog.md
index 01f1aa1..5962cb0 100644
--- a/src/_posts/2023-01-21-moving-blog.md
+++ b/src/_posts/2023-01-21-moving-blog.md
@@ -3,6 +3,8 @@ title: Moving site from Jekyll to ???
 tags: [webdev, site, personal]
 category: [site, webdev, personal]
 date: 2023-01-21
+last_modified: 2023-01-22 13:11
+excerpt: Goal is that at some point in the not to distant future I will move the blog from [Jekyll](https://jekyllrb.com) & the [Minimal Mistakes Theme](https://mmistakes.github.io/minimal-mistakes/) to something built with [11ty](https://www.11ty.dev/).
 ---
 
 Goal is that at some point in the not to distant future I will move the blog from [Jekyll](https://jekyllrb.com) & the [Minimal Mistakes Theme](https://mmistakes.github.io/minimal-mistakes/) to something built with [11ty](https://www.11ty.dev/).
diff --git a/src/_sass/minimal-mistakes/skins/_neon.scss b/src/_sass/minimal-mistakes/skins/_neon.scss
index a4f2ef5..c55772d 100644
--- a/src/_sass/minimal-mistakes/skins/_neon.scss
+++ b/src/_sass/minimal-mistakes/skins/_neon.scss
@@ -44,9 +44,16 @@ $base0f: #cc6633 !default;
 .author__urls.social-icons .svg-inline--fa,
 .page__footer-follow .social-icons i,
 .page__footer-follow .social-icons .svg-inline--fa  {
-  color: inherit;
+  /* comment the following out to get coloured icons in the sidebar and footer
+     but you will also need to override github as its then hard to see
+
+     haven't found way to override this rule in main.scss so disabling here
+     RMCG
+   */
+  /* color: inherit;*/ 
 }
 
+
 /* next/previous buttons */
 .pagination--pager {
   color: $text-color;
@@ -60,4 +67,4 @@ $base0f: #cc6633 !default;
 
 .ais-search-box .ais-search-box--input {
   background-color: $form-background-color;
-}
\ No newline at end of file
+}
diff --git a/src/assets/css/colddark-theme.css b/src/assets/css/colddark-theme.css
new file mode 100644
index 0000000..88eb20f
--- /dev/null
+++ b/src/assets/css/colddark-theme.css
@@ -0,0 +1,317 @@
+/**
+ * Coldark Theme for Prism.js
+ * Theme variation: Dark
+ * Tested with HTML, CSS, JS, JSON, PHP, YAML, Bash script
+ * @author Armand Philippot <contact@armandphilippot.com>
+ * @homepage https://github.com/ArmandPhilippot/coldark-prism
+ * @license MIT
+ */
+ code[class*="language-"],
+ pre[class*="language-"] {
+     color: #e3eaf2;
+     background: none;
+     font-family: Consolas, Monaco, "Andale Mono", "Ubuntu Mono", monospace;
+     text-align: left;
+     white-space: pre;
+     word-spacing: normal;
+     word-break: normal;
+     word-wrap: normal;
+     line-height: 1.5;
+     -moz-tab-size: 4;
+     -o-tab-size: 4;
+     tab-size: 4;
+     -webkit-hyphens: none;
+     -moz-hyphens: none;
+     -ms-hyphens: none;
+     hyphens: none;
+ }
+
+ pre[class*="language-"]::-moz-selection,
+ pre[class*="language-"] ::-moz-selection,
+ code[class*="language-"]::-moz-selection,
+ code[class*="language-"] ::-moz-selection {
+     background: #3c526d;
+ }
+
+ pre[class*="language-"]::selection,
+ pre[class*="language-"] ::selection,
+ code[class*="language-"]::selection,
+ code[class*="language-"] ::selection {
+     background: #3c526d;
+ }
+
+ /* Code blocks */
+ pre[class*="language-"] {
+     padding: 1em;
+     margin: 0.5em 0;
+     overflow: auto;
+ }
+
+ :not(pre) > code[class*="language-"],
+ pre[class*="language-"] {
+     background: #111b27;
+ }
+
+ /* Inline code */
+ :not(pre) > code[class*="language-"] {
+     padding: 0.1em 0.3em;
+     border-radius: 0.3em;
+     white-space: normal;
+ }
+
+ .token.comment,
+ .token.prolog,
+ .token.doctype,
+ .token.cdata {
+     color: #8da1b9;
+ }
+
+ .token.punctuation {
+     color: #e3eaf2;
+ }
+
+ .token.delimiter.important,
+ .token.selector .parent,
+ .token.tag,
+ .token.tag .token.punctuation {
+     color: #66cccc;
+ }
+
+ .token.attr-name,
+ .token.boolean,
+ .token.boolean.important,
+ .token.number,
+ .token.constant,
+ .token.selector .token.attribute {
+     color: #e6d37a;
+ }
+
+ .token.class-name,
+ .token.key,
+ .token.parameter,
+ .token.property,
+ .token.property-access,
+ .token.variable {
+     color: #6cb8e6;
+ }
+
+ .token.attr-value,
+ .token.inserted,
+ .token.color,
+ .token.selector .token.value,
+ .token.string,
+ .token.string .token.url-link {
+     color: #91d076;
+ }
+
+ .token.builtin,
+ .token.keyword-array,
+ .token.package,
+ .token.regex {
+     color: #f4adf4;
+ }
+
+ .token.function,
+ .token.selector .token.class,
+ .token.selector .token.id {
+     color: #c699e3;
+ }
+
+ .token.atrule .token.rule,
+ .token.combinator,
+ .token.keyword,
+ .token.operator,
+ .token.pseudo-class,
+ .token.pseudo-element,
+ .token.selector,
+ .token.unit {
+     color: #e9ae7e;
+ }
+
+ .token.deleted,
+ .token.important {
+     color: #cd6660;
+ }
+
+ .token.keyword-this,
+ .token.this {
+     color: #6cb8e6;
+ }
+
+ .token.important,
+ .token.keyword-this,
+ .token.this,
+ .token.bold {
+     font-weight: bold;
+ }
+
+ .token.delimiter.important {
+     font-weight: inherit;
+ }
+
+ .token.italic {
+     font-style: italic;
+ }
+
+ .token.entity {
+     cursor: help;
+ }
+
+ .language-markdown .token.title,
+ .language-markdown .token.title .token.punctuation {
+     color: #6cb8e6;
+     font-weight: bold;
+ }
+
+ .language-markdown .token.blockquote.punctuation {
+     color: #f4adf4;
+ }
+
+ .language-markdown .token.code {
+     color: #66cccc;
+ }
+
+ .language-markdown .token.hr.punctuation {
+     color: #6cb8e6;
+ }
+
+ .language-markdown .token.url .token.content {
+     color: #91d076;
+ }
+
+ .language-markdown .token.url-link {
+     color: #e6d37a;
+ }
+
+ .language-markdown .token.list.punctuation {
+     color: #f4adf4;
+ }
+
+ .language-markdown .token.table-header {
+     color: #e3eaf2;
+ }
+
+ .language-json .token.operator {
+     color: #e3eaf2;
+ }
+
+ .language-scss .token.variable {
+     color: #66cccc;
+ }
+
+ /* overrides color-values for the Show Invisibles plugin
+  * https://prismjs.com/plugins/show-invisibles/
+  */
+ .token.token.tab:not(:empty):before,
+ .token.token.cr:before,
+ .token.token.lf:before,
+ .token.token.space:before {
+     color: #8da1b9;
+ }
+
+ /* overrides color-values for the Toolbar plugin
+  * https://prismjs.com/plugins/toolbar/
+  */
+ div.code-toolbar > .toolbar.toolbar > .toolbar-item > a,
+ div.code-toolbar > .toolbar.toolbar > .toolbar-item > button {
+     color: #111b27;
+     background: #6cb8e6;
+ }
+
+ div.code-toolbar > .toolbar.toolbar > .toolbar-item > a:hover,
+ div.code-toolbar > .toolbar.toolbar > .toolbar-item > a:focus,
+ div.code-toolbar > .toolbar.toolbar > .toolbar-item > button:hover,
+ div.code-toolbar > .toolbar.toolbar > .toolbar-item > button:focus {
+     color: #111b27;
+     background: #6cb8e6da;
+     text-decoration: none;
+ }
+
+ div.code-toolbar > .toolbar.toolbar > .toolbar-item > span,
+ div.code-toolbar > .toolbar.toolbar > .toolbar-item > span:hover,
+ div.code-toolbar > .toolbar.toolbar > .toolbar-item > span:focus {
+     color: #111b27;
+     background: #8da1b9;
+ }
+
+ /* overrides color-values for the Line Highlight plugin
+  * http://prismjs.com/plugins/line-highlight/
+  */
+ .line-highlight.line-highlight {
+     background: #3c526d5f;
+     background: linear-gradient(to right, #3c526d5f 70%, #3c526d55);
+ }
+
+ .line-highlight.line-highlight:before,
+ .line-highlight.line-highlight[data-end]:after {
+     background-color: #8da1b9;
+     color: #111b27;
+     box-shadow: 0 1px #3c526d;
+ }
+
+ pre[id].linkable-line-numbers.linkable-line-numbers span.line-numbers-rows > span:hover:before {
+     background-color: #8da1b918;
+ }
+
+ /* overrides color-values for the Line Numbers plugin
+  * http://prismjs.com/plugins/line-numbers/
+  */
+ .line-numbers.line-numbers .line-numbers-rows {
+     border-right: 1px solid #0b121b;
+     background: #0b121b7a;
+ }
+
+ .line-numbers .line-numbers-rows > span:before {
+     color: #8da1b9da;
+ }
+
+ /* overrides color-values for the Match Braces plugin
+  * https://prismjs.com/plugins/match-braces/
+  */
+ .rainbow-braces .token.token.punctuation.brace-level-1,
+ .rainbow-braces .token.token.punctuation.brace-level-5,
+ .rainbow-braces .token.token.punctuation.brace-level-9 {
+     color: #e6d37a;
+ }
+
+ .rainbow-braces .token.token.punctuation.brace-level-2,
+ .rainbow-braces .token.token.punctuation.brace-level-6,
+ .rainbow-braces .token.token.punctuation.brace-level-10 {
+     color: #f4adf4;
+ }
+
+ .rainbow-braces .token.token.punctuation.brace-level-3,
+ .rainbow-braces .token.token.punctuation.brace-level-7,
+ .rainbow-braces .token.token.punctuation.brace-level-11 {
+     color: #6cb8e6;
+ }
+
+ .rainbow-braces .token.token.punctuation.brace-level-4,
+ .rainbow-braces .token.token.punctuation.brace-level-8,
+ .rainbow-braces .token.token.punctuation.brace-level-12 {
+     color: #c699e3;
+ }
+
+ /* overrides color-values for the Diff Highlight plugin
+  * https://prismjs.com/plugins/diff-highlight/
+  */
+ pre.diff-highlight > code .token.token.deleted:not(.prefix),
+ pre > code.diff-highlight .token.token.deleted:not(.prefix) {
+     background-color: #cd66601f;
+ }
+
+ pre.diff-highlight > code .token.token.inserted:not(.prefix),
+ pre > code.diff-highlight .token.token.inserted:not(.prefix) {
+     background-color: #91d0761f;
+ }
+
+ /* overrides color-values for the Command Line plugin
+  * https://prismjs.com/plugins/command-line/
+  */
+ .command-line .command-line-prompt {
+     border-right: 1px solid #0b121b;
+ }
+
+ .command-line .command-line-prompt > span:before {
+     color: #8da1b9da;
+ }
\ No newline at end of file
diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss.liquid
similarity index 85%
rename from src/assets/css/main.scss
rename to src/assets/css/main.scss.liquid
index 2e41eaa..3d6fca6 100644
--- a/src/assets/css/main.scss
+++ b/src/assets/css/main.scss.liquid
@@ -1,5 +1,6 @@
 ---
-# Only the main Sass file needs front matter (the dashes are enough)
+# made a liquid file so theme is correctly compiled into import below
+permalink: /assets/css/tocompile.scss
 ---
 
 @charset "utf-8";
@@ -26,6 +27,7 @@ $warning-color: #d67f05 !default;
 $danger-color: #ff0000 !default;
 $info-color: #3b9cba !default;
 
+// section not needed under 11ty
 /* neon syntax highlighting (base16) */
 $base00: #1a191a;
 $base01: #e0e0e0;
@@ -55,6 +57,7 @@ $base0f: #926e5c;
  // base16-classic-dark
  // base16-brewer
 
+ // section not needed under 11ty
  // Hacking the syntax highlighting
  .nb {
   /* Name.Builtin */
@@ -80,7 +83,7 @@ $base0f: #926e5c;
 
 // Progress Bar
 #progress-bar {
-  background: linear-gradient(to right, red, orange , yellow, green,   
+  background: linear-gradient(to right, red, orange , yellow, green,
   blue, indigo, violet var(--scroll), transparent 0);
   position: fixed;
   overflow: hidden;
@@ -91,7 +94,7 @@ $base0f: #926e5c;
 
 // Scroll to top
 #scroll-to-top {
-  background: black;
+  background: rgb(215, 210, 210);
  display:block;
  position:fixed;
  font-size:25px;
@@ -123,7 +126,7 @@ $base0f: #926e5c;
 }
 #scroll-to-top span {
  cursor:pointer;
- color:#1a1d24
+ color:#dee3ee
 }
 #scroll-to-top span:hover .up-arrow,
 #scroll-to-top span:active .up-arrow {
@@ -138,8 +141,12 @@ pre {
   color: #1bb6be !important
 }
 
+$github-color: #fff !default;
+
 //@import "progress.css"; // for progress bar
-@import "minimal-mistakes/skins/{{ site.minimal_mistakes_skin | default: 'default' }}"; // skin
+//@import "minimal-mistakes/skins/{{ site.minimal_mistakes_skin | default: 'default' }}"; // skin
+@import "minimal-mistakes/skins/_{{ site.minimal_mistakes_skin | default: 'default' }}.scss"; // skin
 @import "minimal-mistakes"; // main partials
 //@import "assets/css/override-notices.scss"
-@import "override-notices.scss"
+@import "override-notices.scss";
+
diff --git a/src/assets/js/lunr/lunr-en.js b/src/assets/js/lunr/lunr-en.js
index 4342930..a65a03e 100644
--- a/src/assets/js/lunr/lunr-en.js
+++ b/src/assets/js/lunr/lunr-en.js
@@ -39,7 +39,7 @@ $(document).ready(function() {
         })
       });
     resultdiv.empty();
-    resultdiv.prepend('<p class="results__found">'+result.length+' {{ site.data.ui-text[site.locale].results_found | default: "Result(s) found" }}</p>');
+    resultdiv.prepend('<p class="results__found">'+result.length+' {{ ui-text[site.locale].results_found | default: "Result(s) found" }}</p>');
     for (var item in result) {
       var ref = result[item].ref;
       if(store[ref].teaser){
diff --git a/src/assets/js/lunr/lunr-gr.js b/src/assets/js/lunr/lunr-gr.js
index 10eb0e7..0268f20 100644
--- a/src/assets/js/lunr/lunr-gr.js
+++ b/src/assets/js/lunr/lunr-gr.js
@@ -492,7 +492,7 @@ $(document).ready(function() {
         })
       });
     resultdiv.empty();
-    resultdiv.prepend('<p class="results__found">'+result.length+' {{ site.data.ui-text[site.locale].results_found | default: "Result(s) found" }}</p>');
+    resultdiv.prepend('<p class="results__found">'+result.length+' {{ ui-text[site.locale].results_found | default: "Result(s) found" }}</p>');
     for (var item in result) {
       var ref = result[item].ref;
       if(store[ref].teaser){
diff --git a/src/feed.njk b/src/feed.njk
new file mode 100644
index 0000000..ecc3c0d
--- /dev/null
+++ b/src/feed.njk
@@ -0,0 +1,39 @@
+---json
+{
+  "permalink": "feed.xml",
+  "eleventyExcludeFromCollections": true,
+  "metadata": {
+    "title": "TDN: RMCG",
+    "subtitle": "👨‍💻 🚶‍♂️ 💭 🤯",
+    "language": "en",
+    "url": "https://tarasis.net/",
+    "author": {
+      "name": "Robert McGovern",
+      "email": "rob@tarasis.net"
+    }
+  }
+}
+---
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom" xml:base="{{ metadata.url }}">
+  <title>{{ metadata.title }}</title>
+  <subtitle>{{ metadata.subtitle }}</subtitle>
+  <link href="{{ permalink | absoluteUrl(metadata.url) }}" rel="self"/>
+  <link href="{{ metadata.url }}"/>
+  <updated>{{ collections.posts | getNewestCollectionItemDate | dateToRfc3339 }}</updated>
+  <id>{{ metadata.url }}</id>
+  <author>
+    <name>{{ metadata.author.name }}</name>
+    <email>{{ metadata.author.email }}</email>
+  </author>
+  {%- for post in collections.posts | reverse %}
+  {%- set absolutePostUrl = post.url | absoluteUrl(metadata.url) %}
+  <entry>
+    <title>{{ post.data.title }}</title>
+    <link href="{{ absolutePostUrl }}"/>
+    <updated>{{ post.date | dateToRfc3339 }}</updated>
+    <id>{{ absolutePostUrl }}</id>
+    <content xml:lang="{{ metadata.language }}" type="html">{{ post.templateContent | htmlToAbsoluteUrls(absolutePostUrl) }}</content>
+  </entry>
+  {%- endfor %}
+</feed>
\ No newline at end of file