diff --git a/layouts/_default/app.html b/layouts/_default/app.html
index 68738ba..48840b8 100644
--- a/layouts/_default/app.html
+++ b/layouts/_default/app.html
@@ -119,26 +119,27 @@
                             <div>
                                 <h3>{{ .Title }}</h3>
                                 {{ if hasPrefix .Title "Flatpak" }}
-                                    <a href="https://flathub.org/apps/details/{{ .Index }}">
+                                    <a rel="nofollow noreferrer" href="https://flathub.org/apps/details/{{ .Index }}">
                                     {{ partial "badge.html" (dict "Icon" "flathub" "Lang" $lang "Alt" "storeFlathub" ) }}
                                     </a>
                                     <br><br>{{ i18n "warnExternalWebsite" "flathub.org" }}
                                 {{ else if hasPrefix .Title "Snap" }}
                                     {{ $disclaimers.Set "snapcraft" true }}
-                                    <a href="https://snapcraft.io/{{ .Index }}">
+                                    <a rel="nofollow noreferrer" href="https://snapcraft.io/{{ .Index }}">
                                     {{ partial "badge.html" (dict "Icon" "snapcraft" "Lang" $lang "Alt" "storeSnapcraft" ) }}
                                     </a>
                                     <br><br>{{ i18n "warnExternalWebsite" "snapcraft.io" }}
                                 {{ else if hasPrefix .Title "Firefox" }}
                                     {{ $disclaimers.Set "firefox" true }}
-                                    <a href="https://addons.mozilla.org/en-US/firefox/addon/{{ .Index }}/">
+                                    <a rel="nofollow noreferrer" href="https://addons.mozilla.org/en-US/firefox/addon/{{ .Index }}/">
                                     {{ partial "badge.html" (dict "Icon" "amo" "Lang" $lang "Alt" "storeFirefoxAddons" ) }}
                                     </a>
                                     <br><br>{{ i18n "warnExternalWebsite" "addons.mozilla.org" }}
                                 {{ else }}
                                 {{ i18n "file" }} {{ replace .Name "<version>" $appdata.version }}<br><br>
                                 <div class="primary center fit-content" role="button">
-                                    <a href="https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/{{ $appindex }}/v{{ $appdata.version }}/{{ replace .File "<version>" $appdata.version }}">
+                                    {{ $filename := replace .File "<version>" $appdata.version }}
+                                    <a href="https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/{{ $appindex }}/v{{ $appdata.version }}/{{ $filename }}" download rel="nofollow noreferrer">
                                         <i class="icon-download icon-as-text" alt=""></i>{{ i18n "download" }}
                                     </a>
                                 </div>
diff --git a/layouts/main-index.html b/layouts/main-index.html
index dc2085c..e89cb85 100644
--- a/layouts/main-index.html
+++ b/layouts/main-index.html
@@ -11,11 +11,7 @@
             </div>
             
             <div class="social-list grid flex-center padding-container-point3">
-                {{ range .Site.Data.menu.social }}
-                    <a role="button" alt="{{ .name }}" title="{{ .name }}" href="{{ replace .URL "<lang>" $lang }}">
-                        <i class="icon-{{ .icon }}" alt="{{ .icon }} social icon"></i>
-                    </a>
-                {{ end }}
+                {{ partial "social-buttons" (dict "Buttons" .Site.Data.menu.social "Lang" $lang) }}
             </div>
             <br>
             <br>
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index e5f0645..0750699 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -4,11 +4,7 @@
     <br>
     <div class="columns-container">
         <div class="col3 social-list grid padding-container-point3">
-            {{ range .Site.Data.menu.social }}
-                <a role="button" alt="{{ .name }}" title="{{ .name }}" href="{{ replace .URL "<lang>" $lang }}">
-                    <i class="icon-{{ .icon }}" alt="{{ .icon }} social icon"></i>
-                </a>
-            {{ end }}
+            {{ partial "social-buttons" (dict "Buttons" .Site.Data.menu.social "Lang" $lang) }}
         </div>
         <div class="text-center col3">
             <br>
@@ -17,11 +13,11 @@
             
         </div>
         <div class="col3 text-right padding-container-1">
-            <p>{{ i18n "usingTheme" }} <a href="https://git.ad5001.eu/Ad5001/omegamma">Omegamma</a></p>
-            <p>{{ i18n "poweredBy" }} <a href="https://gohugo.io">Hugo</a></p>
-            <p><a href="{{ .Site.Params.websiteSource }}">{{ i18n "websiteSource" }}</a>
+            <p>{{ i18n "usingTheme" }} <a href="https://git.ad5001.eu/Ad5001/omegamma" rel="nofollow noreferrer">Omegamma</a></p>
+            <p>{{ i18n "poweredBy" }} <a href="https://gohugo.io" rel="nofollow noreferrer">Hugo</a></p>
+            <p><a href="{{ .Site.Params.websiteSource }}" rel="nofollow noreferrer">{{ i18n "websiteSource" }}</a>
             {{ if .GitInfo }}
-            - built from <a href="{{ .Site.Params.websiteSource }}/commit/{{ .GitInfo.Hash }}">{{ .GitInfo.AbbreviatedHash }}</a>
+            - built from <a href="{{ .Site.Params.websiteSource }}/commit/{{ .GitInfo.Hash }}" rel="nofollow noreferrer">{{ .GitInfo.AbbreviatedHash }}</a>
             {{ end }}
             </p>
         </div>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 57968f5..725f901 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -31,7 +31,7 @@
                     <ul class="sub-menu">
                         {{ range .Children }}
                         <li class="{{ if $currentPage.IsMenuCurrent "main" . }}active{{ end }} background">
-                            <a href="{{ .URL }}" role="button">
+                            <a href="{{ .URL }}" role="button" rel="nofollow noreferrer">
                                 {{ .Name }}
                             </a>
                         </li>
@@ -40,7 +40,7 @@
                 </li>
                 {{ else }}
                 <li class="{{ if $currentPage.IsMenuCurrent "main" . }}active{{ end }}">
-                    <a href="{{ .URL }}" role="button">
+                    <a href="{{ .URL }}" role="button" rel="nofollow noreferrer">
                         {{ .Pre }}
                         <span>{{ .Name }}</span>
                     </a>
diff --git a/layouts/partials/links.html b/layouts/partials/links.html
index 2dc2d40..c91d3e9 100644
--- a/layouts/partials/links.html
+++ b/layouts/partials/links.html
@@ -1,6 +1,6 @@
 {{ range . }}
 <div role="button" class="primary">
-    <a href="{{ .URL | safeURL }}" role="button" title="{{ .Title }}">
+    <a href="{{ .URL | safeURL }}" role="button" title="{{ .Title }}" rel="nofollow noreferrer" {{ if .NewTab }}target="_blank"{{ end }}>
         <i class="icon-{{ lower .Icon }} icon-as-text" alt="{{ .Icon }}"></i>{{ .Title }}
     </a>
 </div>
diff --git a/layouts/partials/social-buttons.html b/layouts/partials/social-buttons.html
new file mode 100644
index 0000000..d334866
--- /dev/null
+++ b/layouts/partials/social-buttons.html
@@ -0,0 +1,6 @@
+{{ $lang := .Lang }}
+{{ range .Buttons }}
+<a role="button" alt="{{ .name }}" title="{{ .name }}" href="{{ replace .URL "<lang>" $lang }}">
+    <i class="icon-{{ .icon }}" alt="{{ .icon }} social icon"></i>
+</a>
+{{ end }}