diff --git a/_includes/components/post-navigation.njk b/_includes/components/post-navigation.njk
index 4cd93c4..42d35eb 100644
--- a/_includes/components/post-navigation.njk
+++ b/_includes/components/post-navigation.njk
@@ -12,22 +12,28 @@
{% set _bookmarkedUrl = _prevPost.data.bookmarkOf or _prevPost.data.bookmark_of %}
{% set _repostedUrl = _prevPost.data.repostOf or _prevPost.data.repost_of %}
{% set _replyToUrl = _prevPost.data.inReplyTo or _prevPost.data.in_reply_to %}
-
- {% if _likedUrl %}
-
- Liked {{ _likedUrl | replace("https://", "") | truncate(35) }}
- {% elif _bookmarkedUrl %}
-
- {{ _prevPost.data.title or ("Bookmarked " + (_bookmarkedUrl | replace("https://", "") | truncate(30))) }}
- {% elif _repostedUrl %}
-
- Reposted {{ _repostedUrl | replace("https://", "") | truncate(35) }}
- {% elif _replyToUrl %}
-
- Reply to {{ _replyToUrl | replace("https://", "") | truncate(35) }}
- {% else %}
- {{ _prevPost.data.title or _prevPost.data.name or (_prevPost.templateContent | striptags | truncate(50)) or "Note" }}
+ {% set _prevHasOg = _prevPost.fileSlug | hasOgImage %}
+
+ {% if _prevHasOg %}
+
{% endif %}
+
+ {% if _likedUrl %}
+
+ Liked {{ _likedUrl | replace("https://", "") | truncate(35) }}
+ {% elif _bookmarkedUrl %}
+
+ {{ _prevPost.data.title or ("Bookmarked " + (_bookmarkedUrl | replace("https://", "") | truncate(30))) }}
+ {% elif _repostedUrl %}
+
+ Reposted {{ _repostedUrl | replace("https://", "") | truncate(35) }}
+ {% elif _replyToUrl %}
+
+ Reply to {{ _replyToUrl | replace("https://", "") | truncate(35) }}
+ {% else %}
+ {{ _prevPost.data.title or _prevPost.data.name or (_prevPost.templateContent | striptags | truncate(50)) or "Note" }}
+ {% endif %}
+
{% else %}
@@ -40,21 +46,27 @@
{% set _bookmarkedUrl = _nextPost.data.bookmarkOf or _nextPost.data.bookmark_of %}
{% set _repostedUrl = _nextPost.data.repostOf or _nextPost.data.repost_of %}
{% set _replyToUrl = _nextPost.data.inReplyTo or _nextPost.data.in_reply_to %}
-
- {% if _likedUrl %}
-
- Liked {{ _likedUrl | replace("https://", "") | truncate(35) }}
- {% elif _bookmarkedUrl %}
-
- {{ _nextPost.data.title or ("Bookmarked " + (_bookmarkedUrl | replace("https://", "") | truncate(30))) }}
- {% elif _repostedUrl %}
-
- Reposted {{ _repostedUrl | replace("https://", "") | truncate(35) }}
- {% elif _replyToUrl %}
-
- Reply to {{ _replyToUrl | replace("https://", "") | truncate(35) }}
- {% else %}
- {{ _nextPost.data.title or _nextPost.data.name or (_nextPost.templateContent | striptags | truncate(50)) or "Note" }}
+ {% set _nextHasOg = _nextPost.fileSlug | hasOgImage %}
+
+
+ {% if _likedUrl %}
+
+ Liked {{ _likedUrl | replace("https://", "") | truncate(35) }}
+ {% elif _bookmarkedUrl %}
+
+ {{ _nextPost.data.title or ("Bookmarked " + (_bookmarkedUrl | replace("https://", "") | truncate(30))) }}
+ {% elif _repostedUrl %}
+
+ Reposted {{ _repostedUrl | replace("https://", "") | truncate(35) }}
+ {% elif _replyToUrl %}
+
+ Reply to {{ _replyToUrl | replace("https://", "") | truncate(35) }}
+ {% else %}
+ {{ _nextPost.data.title or _nextPost.data.name or (_nextPost.templateContent | striptags | truncate(50)) or "Note" }}
+ {% endif %}
+
+ {% if _nextHasOg %}
+
{% endif %}
diff --git a/_includes/components/webmentions.njk b/_includes/components/webmentions.njk
index f203321..e012c5d 100644
--- a/_includes/components/webmentions.njk
+++ b/_includes/components/webmentions.njk
@@ -27,22 +27,24 @@