diff --git a/customizations/Dotawo/layouts/_default/_markup/render-image.html b/customizations/Dotawo/layouts/_default/_markup/render-image.html
index fad8dcd..15d0d42 100644
--- a/customizations/Dotawo/layouts/_default/_markup/render-image.html
+++ b/customizations/Dotawo/layouts/_default/_markup/render-image.html
@@ -27,9 +27,9 @@
     {{ end }}
     {{ .Page.Scratch.Add "bibs" (slice (slice $bibhref $bibtitle)) }}
     {{- if not $text_link -}}
-      <span>{{- delimit $b.authors ", " " & " -}}{{- with $b.pubdate -}}, {{- substr . 0 4}}{{- end -}}.<a href="{{- $c_prefix | safeURL -}}BROWSE_LIBRARY.html#/book/{{- $destination -}}"{{- with $b.title}} title="{{- . -}}"{{- end -}} target="_blank"><span class="sup">bib⁄</span>‘{{- $b.title -}}’</a>. {{- with $b.publisher -}}{{- . -}}.{{- end -}}</span>
+      <span>{{- delimit $b.authors ", " " & " -}}{{- with $b.pubdate -}}, {{- substr . 0 4}}{{- end -}}.<a href="{{- $c_prefix | safeURL -}}BROWSE_LIBRARY.html#/book/{{- $destination -}}"{{- with $b.title}} title="{{- . -}}"{{- end -}}><span class="sup">bib⁄</span>‘{{- $b.title -}}’</a>. {{- with $b.publisher -}}{{- . -}}.{{- end -}}</span>
     {{- else -}}
-      <span class="sup">bib⁄</span><a href="{{- $c_prefix | safeURL -}}BROWSE_LIBRARY.html#/book/{{- $destination -}}"{{- with $b.title}} title="{{- . -}}"{{- end -}} target="_blank">{{- $text_link -}}</a>
+      <span class="sup">bib⁄</span><a href="{{- $c_prefix | safeURL -}}BROWSE_LIBRARY.html#/book/{{- $destination -}}"{{- with $b.title}} title="{{- . -}}"{{- end -}} >{{- $text_link -}}</a>
     {{- end -}}
   {{- else -}}
     <a href="{{- $c_prefix | safeURL -}}BROWSE_LIBRARY.html#/book/{{- $destination -}}"{{- with .Title}} title="{{- . -}}"{{- end -}}>{{- $text_link -}}⦚<span>bib:{{- $destination -}} not found</span></a>
diff --git a/customizations/Dotawo/layouts/_default/_markup/render-link.html b/customizations/Dotawo/layouts/_default/_markup/render-link.html
index b81c7a4..ea315fc 100644
--- a/customizations/Dotawo/layouts/_default/_markup/render-link.html
+++ b/customizations/Dotawo/layouts/_default/_markup/render-link.html
@@ -1 +1 @@
-{{- .Page.Scratch.Add "urls" (slice .Destination) -}}{{- $t := .Text -}}{{- $sup := "" -}}{{- if and (strings.HasPrefix .Destination "{") (.Destination | strings.Count "}") -}}{{-  range first 1 (split .Destination "}") -}}{{- range $frmt := (split (substr . 1) ",") -}}{{- if eq $frmt "sc" -}}<span class="smallcaps">{{- $t -}}</span>{{- end -}}{{- end -}}{{- end -}}{{- else }}{{- if strings.HasPrefix .Destination "http" -}}{{- $sup = "www" -}}{{- end -}}{{- if strings.HasPrefix .Destination "#" -}}{{- $sup = "§" -}}{{- end -}}<a href="{{ .Destination | safeURL }}"{{ with .Title}} title="{{ . }}"{{ end }}{{ if strings.HasPrefix .Destination "http" }} target="_blank" rel="noopener"{{ else if strings.HasPrefix .Destination "#"}}class="anchorz"{{ end }}><span class="sup" style="font-size:0.7em">{{- $sup -}}⁄</span>{{ .Text | safeHTML }}</a>{{- end -}}
+{{- .Page.Scratch.Add "urls" (slice .Destination) -}}{{- $t := .Text -}}{{- $sup := "" -}}{{- if and (strings.HasPrefix .Destination "{") (.Destination | strings.Count "}") -}}{{-  range first 1 (split .Destination "}") -}}{{- range $frmt := (split (substr . 1) ",") -}}{{- if eq $frmt "sc" -}}<span class="smallcaps">{{- $t -}}</span>{{- end -}}{{- end -}}{{- end -}}{{- else }}{{- if strings.HasPrefix .Destination "http" -}}{{- $sup = "www" -}}{{- end -}}{{- if strings.HasPrefix .Destination "#" -}}{{- $sup = "§" -}}{{- end -}}<a href="{{ .Destination | safeURL }}"{{ with .Title}} title="{{ . }}"{{ end }}{{ if strings.HasPrefix .Destination "http" }} rel="noopener"{{ else if strings.HasPrefix .Destination "#"}}class="anchorz"{{ end }}><span class="sup" style="font-size:0.7em">{{- $sup -}}⁄</span>{{ .Text | safeHTML }}</a>{{- end -}}
diff --git a/customizations/Dotawo/layouts/partials/header.html b/customizations/Dotawo/layouts/partials/header.html
index c88addd..4581621 100644
--- a/customizations/Dotawo/layouts/partials/header.html
+++ b/customizations/Dotawo/layouts/partials/header.html
@@ -49,7 +49,7 @@
 {{ end }}
 
 <div class="header">
-  <a title="{{ $.Site.Home.Title }}'s Bibliotheke" href="/library/BROWSE_LIBRARY.html" class="bibliotheke" target="_blank">
+  <a title="{{ $.Site.Home.Title }}'s Bibliotheke" href="/library/BROWSE_LIBRARY.html" class="bibliotheke" >
     <img src="/images/bibliotheke.svg" />
   </a>
   <div class="breadcrumbs">
diff --git a/layouts/_default/_markup/render-image.html b/layouts/_default/_markup/render-image.html
index 2955281..99b5476 100644
--- a/layouts/_default/_markup/render-image.html
+++ b/layouts/_default/_markup/render-image.html
@@ -27,9 +27,9 @@
     {{ end }}
     {{ .Page.Scratch.Add "bibs" (slice (slice $bibhref $bibtitle)) }}
     {{- if not $text_link -}}
-      <span>{{- delimit $b.authors ", " " & " -}}{{- with $b.pubdate -}},&nbsp;{{- substr . 0 4}}{{- end -}}.&nbsp;<a href="{{- $c_prefix | safeURL -}}BROWSE_LIBRARY.html#/book/{{- $destination -}}"{{- with $b.title}} title="{{- . -}}"{{- end -}} target="_blank"><span class="sup">bib⁄</span><i>{{- $b.title -}}</i></a>.&nbsp;{{- with $b.publisher -}}{{- . -}}.{{- end -}}</span>
+      <span>{{- delimit $b.authors ", " " & " -}}{{- with $b.pubdate -}},&nbsp;{{- substr . 0 4}}{{- end -}}.&nbsp;<a href="{{- $c_prefix | safeURL -}}BROWSE_LIBRARY.html#/book/{{- $destination -}}"{{- with $b.title}} title="{{- . -}}"{{- end -}}><span class="sup">bib⁄</span><i>{{- $b.title -}}</i></a>.&nbsp;{{- with $b.publisher -}}{{- . -}}.{{- end -}}</span>
       {{- else -}}
-      <span class="sup">bib⁄</span><a href="{{- $c_prefix | safeURL -}}BROWSE_LIBRARY.html#/book/{{- $destination -}}"{{- with $b.title}} title="{{- . -}}"{{- end -}} target="_blank">{{- $text_link -}}</a>
+      <span class="sup">bib⁄</span><a href="{{- $c_prefix | safeURL -}}BROWSE_LIBRARY.html#/book/{{- $destination -}}"{{- with $b.title}} title="{{- . -}}"{{- end -}}>{{- $text_link -}}</a>
     {{- end -}}
   {{- else -}}
     <a href="{{- $c_prefix | safeURL -}}BROWSE_LIBRARY.html#/book/{{- $destination -}}"{{- with .Title}} title="{{- . -}}"{{- end -}}>{{- $text_link -}}⦚<span>bib:{{- $destination -}} not found</span></a>
diff --git a/layouts/_default/_markup/render-link.html b/layouts/_default/_markup/render-link.html
index ed0b063..b1303f5 100644
--- a/layouts/_default/_markup/render-link.html
+++ b/layouts/_default/_markup/render-link.html
@@ -1 +1 @@
-{{- .Page.Scratch.Add "urls" (slice .Destination) -}}{{- $t := .Text -}}{{- $sup := "" -}}{{- if and (strings.HasPrefix .Destination "{") (.Destination | strings.Count "}") -}}{{-  range first 1 (split .Destination "}") -}}{{- range $frmt := (split (substr . 1) ",") -}}{{- if eq $frmt "sc" -}}<span class="smallcaps">{{- $t -}}</span>{{- end -}}{{- end -}}{{- end -}}{{- else }}{{- if strings.HasPrefix .Destination "http" -}}{{- $sup = "www" -}}{{- end -}}{{- if strings.HasPrefix .Destination "#" -}}{{- $sup = "§" -}}{{- end -}}<a href="{{ .Destination | safeURL }}"{{ with .Title}} title="{{ . }}"{{ end }}{{ if strings.HasPrefix .Destination "http" }} target="_blank" rel="noopener"{{ else if strings.HasPrefix .Destination "#"}}class="anchorz"{{ end }}><span class="sup" style="font-size:0.7em">{{- $sup -}}⁄</span><i>{{ .Text | safeHTML }}</i></a>{{- end -}}
\ No newline at end of file
+{{- .Page.Scratch.Add "urls" (slice .Destination) -}}{{- $t := .Text -}}{{- $sup := "" -}}{{- if and (strings.HasPrefix .Destination "{") (.Destination | strings.Count "}") -}}{{-  range first 1 (split .Destination "}") -}}{{- range $frmt := (split (substr . 1) ",") -}}{{- if eq $frmt "sc" -}}<span class="smallcaps">{{- $t -}}</span>{{- end -}}{{- end -}}{{- end -}}{{- else }}{{- if strings.HasPrefix .Destination "http" -}}{{- $sup = "www" -}}{{- end -}}{{- if strings.HasPrefix .Destination "#" -}}{{- $sup = "§" -}}{{- end -}}<a href="{{ .Destination | safeURL }}"{{ with .Title}} title="{{ . }}"{{ end }}{{ if strings.HasPrefix .Destination "http" }} rel="noopener"{{ else if strings.HasPrefix .Destination "#"}}class="anchorz"{{ end }}><span class="sup" style="font-size:0.7em">{{- $sup -}}⁄</span><i>{{ .Text | safeHTML }}</i></a>{{- end -}}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index f21592a..9d5fae7 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -49,7 +49,7 @@
 {{ end }}
 
 <div class="header">
-  <a title="{{ $.Site.Home.Title }}'s Bibliotheke" href="/library/BROWSE_LIBRARY.html" class="bibliotheke" target="_blank">
+  <a title="{{ $.Site.Home.Title }}'s Bibliotheke" href="/library/BROWSE_LIBRARY.html" class="bibliotheke">
     <img src="/images/bibliotheke.svg" />
   </a>
   <div class="breadcrumbs">
diff --git a/layouts/urls/list.html b/layouts/urls/list.html
index 2764d59..d1d009c 100644
--- a/layouts/urls/list.html
+++ b/layouts/urls/list.html
@@ -53,7 +53,7 @@
           {{ if eq $i 0 }}
             <details><summary>Outgoing links to other pages on Internet ({{ len $http_links }}):</summary><ul>
           {{ end }}
-          <li><span class="sup">www⁄</span><a href="{{ $_ }}" target="_blank">{{ $_ }}</a></li>
+          <li><span class="sup">www⁄</span><a href="{{ $_ }}">{{ $_ }}</a></li>
         {{ end }}
             </ul></details>
       {{ end }}
@@ -63,7 +63,7 @@
           {{ if eq $i 0 }}
             <details><summary>Links to Sandpoint's library ({{ len $library_links }}):</summary><ul>
           {{ end }}
-          <li><span class="sup">lib⁄</span><a href="{{ $_ }}" target="_blank">{{ $_ }}</a></li>
+          <li><span class="sup">lib⁄</span><a href="{{ $_ }}">{{ $_ }}</a></li>
         {{ end }}
             </ul></details>
       {{ end }}
@@ -73,7 +73,7 @@
           {{ if eq $i 0 }}
             <details><summary>Bibliographic references ({{ len ($p.Scratch.Get "bibs") }}):</summary><ul>
           {{ end }}
-          <li><span class="sup">bib⁄</span><a href="{{ index $_ 0 }}" target="_blank">{{ index $_ 1 }}</a></li>
+          <li><span class="sup">bib⁄</span><a href="{{ index $_ 0 }}">{{ index $_ 1 }}</a></li>
         {{ end }}
             </ul></details>
       {{ end }}
@@ -90,7 +90,7 @@
           {{ else if strings.HasPrefix $_ "{"}}
             {{ $formattingN = add $formattingN 1 }}
           {{ else }}
-            <li><span class="sup">other⁄</span><a href="{{ $_ }}" target="_blank">{{ $_ }}</a></li>
+            <li><span class="sup">other⁄</span><a href="{{ $_ }}">{{ $_ }}</a></li>
           {{ end }}
         {{ end }}
         {{ with $formattingN }}<li>{{ $formattingN }} formatting links.</a></li>{{ end }}