diff --git a/.gitignore b/.gitignore
index 200e408..8286ac5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@ _site
vendor
.obsidian
tiddlywiki/output/*
-.DS_Store
\ No newline at end of file
+.DS_Store
+_archive
\ No newline at end of file
diff --git a/.tool-versions b/.tool-versions
deleted file mode 100644
index 9eb38ed..0000000
--- a/.tool-versions
+++ /dev/null
@@ -1 +0,0 @@
-ruby 2.7.2
diff --git a/.well-known/webfinger b/.well-known/webfinger
index 356f3c5..216509a 100644
--- a/.well-known/webfinger
+++ b/.well-known/webfinger
@@ -17,7 +17,7 @@
},
{
"rel": "http://webfinger.net/rel/profile-page",
- "href": "https://bmannconsulting.com"
+ "href": "https://bmann.ca"
}
]
}
\ No newline at end of file
diff --git a/404.html b/404.html
index 46da318..6343fd7 100644
--- a/404.html
+++ b/404.html
@@ -1,40 +1,11 @@
---
-permalink: /404.html
-layout: post
-content-type: eg
+permalink: 404.html
+layout: default
+title: "404"
+id: "not-found"
---
-
-
-
The requested page could not be found.
-
-
- {%- assign content_array = content | split:'[[' -%}
- {%- assign external_link_delimiter = '::' -%}
-
- {%- assign link_joiner_delimiter = '$@' -%}
- {%- for item in content_array -%}
- {%- if forloop.index > 1 -%}
- {%- assign itemparts = item | split:']]' -%}
- {%- assign internal_link = itemparts[0] -%}
- {%- assign external_link = itemparts[0] | split:external_link_delimiter -%}
- {%- assign sidenote = itemparts[0] | split:sidenote_delimiter -%}
-
- {%- if external_link[1] == nil -%}
- {%- assign result_notes = site.notes | where: 'title',itemparts[0] -%}
- {%- assign result_posts = site.posts | where: 'title',itemparts[0] -%}
- {%- assign result_pages = site.pages | where: 'title',itemparts[0] -%}
- {%- assign internal_links = internal_links | append: link_joiner_delimiter | append: internal_link -%}
- {%- assign internal_urls = internal_urls | append: link_joiner_delimiter | append: result_notes[0].url | append: result_posts[0].url | append: result_pages[0].url -%}
- {%- else -%}
- {%- assign external_links = external_links | append: link_joiner_delimiter | append: external_link[0] -%}
- {%- assign external_urls = external_urls | append: link_joiner_delimiter | append: external_link[1] -%}
- {%- endif -%}
- {%- endif -%}
- {%- endfor -%}
-
- {%- assign internal_url_array = internal_urls | split:link_joiner_delimiter -%}
- {%- assign internal_link_array = internal_links | split:link_joiner_delimiter -%}
-
- {%- assign external_url_array = external_urls | split:link_joiner_delimiter -%}
- {%- assign external_link_array = external_links | split:link_joiner_delimiter -%}
-
-
- {%- assign replaced_content = content -%}
- {%- for title in internal_link_array -%}
- {%- assign url = internal_url_array[forloop.index0] -%}
- {%- if url == nil -%}
- {%- assign link_text = '
' | append: title | append: '' -%}
- {%- elsif url == empty -%}
- {%- assign link_text = '
' | append: title | append: '' -%}
- {%- else -%}
- {%- assign post = site.notes | where: 'title',title -%}
- {%- if post[0].title == nil -%}
- {%- assign post = site.posts | where: 'title',title -%}
- {%- endif -%}
- {%- assign excerpt = post[0].content | markdownify | strip_html | truncate: 500 | newline_to_br -%}
- {%- assign link_text = '
' | append: title | append: '' | append: title | append: '
' | append: excerpt | append: '' -%}
- {%- endif -%}
- {%- assign bracket_link = '[[' | append: title | append: ']]' -%}
- {%- assign replaced_content = replaced_content | replace: bracket_link,link_text -%}
- {%- endfor -%}
-
- {%- assign sideNoteCounter = 0 -%}
- {%- assign srsCounter = 0 -%}
- {%- for title in external_link_array -%}
- {%- assign url = external_url_array[forloop.index0] -%}
- {%- if url contains "wikipedia.org" -%}
- {%- assign link_text = '
' | append: title | append: '
- ' -%}
- {% comment %}
- {%- elsif url contains "archive.org" -%}
- {%- assign link_text = '
' | append: title | append: 'Wayback' -%}
- {%- elsif url contains "gutenberg.org" -%}
- {%- assign link_text = '
' | append: title | append: 'Guten' -%}
- {%- elsif url contains "youtube.com" or url contains "youtu.be" -%}
- {%- assign link_text = '
' | append: title | append: '' -%}
- {%- elsif url contains "twitter.com" -%}
- {%- assign link_text = '
' | append: title | append: '' -%}
- {%- elsif url contains "github.com" or url contains "github.io" -%}
- {%- assign link_text = '
' | append: title | append: '' -%}
- {%- elsif url == "highlight" -%}
- {%- assign link_text = '
' | append: title | append: '' -%}
- {%- elsif url == "wrap" -%}
- {%- assign link_text = '
' | append: title | append: '
' -%}
- {%- elsif url == "img" -%}
- {%- assign link_text = '

' -%}
- {% endcomment %}
- {%- elsif url == "lsn" or url == "rsn" or url == "lsn-transclude" or url == "rsn-transclude" or url == "lmn" or url == "rmn" or url == "lmn-transclude" or url == "rmn-transclude" -%}
- {%- assign toggleLabel = "" -%}
- {%- assign sideNoteNum = "" -%}
- {%- if url contains "lsn" -%}
- {%- assign noteType = "sn-left" -%}
- {%- assign sideNoteNum = "sidenote-number" -%}
- {%- elsif url contains "rsn" -%}
- {%- assign noteType = "sn-right" -%}
- {%- assign sideNoteNum = "sidenote-number" -%}
- {%- elsif url contains "lmn" -%}
- {%- assign noteType = "mn-left" -%}
- {%- assign toggleLabel = "⊕" -%}
- {%- elsif url contains "rmn" -%}
- {%- assign noteType = "mn-right" -%}
- {%- assign toggleLabel = "⊕" -%}
- {%- endif -%}
-
-
- {%- if url contains "transclude" -%}
- {%- assign post = site.notes | where: 'title',title -%}
- {%- if post[0].title == nil -%}
- {%- assign post = site.posts | where: 'title',title -%}
- {%- endif -%}
- {%- assign excerpt = post[0].content | strip_html | truncate: 280 -%}
- {%- assign link_text = '
Transclusion
' | append: title | append: '
' | append: excerpt | append: '' -%}
- {%- else -%}
- {%- assign link_text = '
' | append: title | append: '' -%}
- {%- endif -%}
-
- {%- assign sideNoteCounter = sideNoteCounter | plus:1 -%}
- {%- elsif url == "srs" -%}
- {%- assign link_text = '
Flashcard
' | append: title | append: '' -%}
- {%- assign srsCounter = srsCounter | plus:1 -%}
- {%- elsif url == "todo" -%}
- {%- assign todo_list = title | split:';' -%}
- {%- assign link_text = "
::TODO::
" -%}
- {%- for list_items in todo_list -%}
- {%- assign link_text = link_text | append: '- ' | append: list_items | append: '
' -%}
- {%- endfor -%}
- {%- assign link_text = link_text | append: '
' -%}
- {%- else -%}
- {%- assign link_text = '
' | append: title | append: '' -%}
- {%- endif -%}
- {%- assign bracket_link = '[[' | append: title | append: external_link_delimiter | append: url | append: ']]' -%}
- {%- assign replaced_content = replaced_content | replace: bracket_link,link_text -%}
- {%- endfor -%}
-
- {{ replaced_content }}
-
\ No newline at end of file
diff --git a/_includes/contextfeed.html b/_includes/contextfeed.html
deleted file mode 100644
index e5e996b..0000000
--- a/_includes/contextfeed.html
+++ /dev/null
@@ -1,13 +0,0 @@
-
-{% for blog in recentblogs %}
-{% if blog.section == 'blog' and blogcount < include.bloglimit %}
-
-
{{ blog.title }}
-
-{% assign blogcount = blogcount | plus: 1 %}
-{% elsif blogcount >= include.bloglimit %}
-{% break %}
-{% endif %}
-{% endfor %}
-
\ No newline at end of file
diff --git a/_includes/recentjournals.html b/_includes/recentjournals.html
deleted file mode 100644
index d895168..0000000
--- a/_includes/recentjournals.html
+++ /dev/null
@@ -1,6 +0,0 @@
-{% assign journalposts = site.posts | where_exp: "post", "post.section == 'journal'" | sort: 'date' | reverse %}
-{% for item in journalposts limit: include.journallimit %}
-