diff --git a/themes/nipponalba/layouts/_default/single.html b/themes/nipponalba/layouts/_default/single.html
index 75a0740c..3da8e4ca 100644
--- a/themes/nipponalba/layouts/_default/single.html
+++ b/themes/nipponalba/layouts/_default/single.html
@@ -27,7 +27,7 @@
 <section class="info">
 {{ if not (eq .Type "article") }}<span class="categories_span">{{ with .Page.Params.category }}Categories: {{ partial "taxonomy/categories.html" . }}{{ end }}</span>{{ end }}
 {{ $pathJSON := (print .Permalink "bridgy.json") }}
-{{ $relpathJSON := (print .Permalink "bridgy.json") }}
+{{ $relpathJSON := (print .RelPermalink "bridgy.json") }}
 {{ if fileExists $relpathJSON }}
 <span class="syndication">
   {{ $mJSON := getJSON $pathJSON  }}
diff --git a/themes/nipponalba/layouts/partials/likes.html b/themes/nipponalba/layouts/partials/likes.html
index 7220ac59..6fc4b63a 100644
--- a/themes/nipponalba/layouts/partials/likes.html
+++ b/themes/nipponalba/layouts/partials/likes.html
@@ -1,7 +1,5 @@
 {{ range . }}
-{{ $_wm_property := "wm-property" }}
-{{ .Params.wm_property }}
-{{ if eq "wm-property" "life-of"}}
+{{ if eq (index . "wm-property") "in-reply-to" }}
 <a href="{{ .author.url }}"><img class="remote_profile" src="{{ .author.photo }}" title="{{ .author.name }}" alt="{{ .author.name }}" /></a>
 {{ end }}
 {{ end }}
diff --git a/themes/nipponalba/layouts/partials/shares.html b/themes/nipponalba/layouts/partials/shares.html
index 1ce58325..8c98013d 100644
--- a/themes/nipponalba/layouts/partials/shares.html
+++ b/themes/nipponalba/layouts/partials/shares.html
@@ -1,5 +1,5 @@
 {{ range . }}
-{{ if eq .mention_type "repost" }}
-<a href="{{ .author.url }}"><img class="remote_profile" src="{{ .author.photo_url }}" title="{{ .author.name }}" alt="{{ .author.name }}" /></a>
+{{ if eq (index . "wm-property") "repost-of" }}
+<a href="{{ .author.url }}"><img class="remote_profile" src="{{ .author.photo }}" title="{{ .author.name }}" alt="{{ .author.name }}" /></a>
 {{ end }}
 {{ end }}