diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index e4e9f87..29c4603 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -52,7 +52,7 @@ <h5 class="text-left add-bottom">
       <li><a class="footer-link" href="{{ .Site.Params.mastodon }}" target="_blank">Mastodon</a></li>
       <li><a class="footer-link" href="/community/">Forum</a></li>
       <li><a class="footer-link" href="/community/">Chat</li>
-      <li><a class="footer-link" href="{{ .Site.Params.onionv3 }}{{ .URL | relLangURL }}">Onion Website</a></li>
+      <li><a class="footer-link" href="{{ .Site.Params.onionv3 }}{{ .RelPermalink | relLangURL }}">Onion Website</a></li>
     </ul>
   </div>
 </div>
diff --git a/themes/hugo-bootstrap/layouts/_default/baseof.html b/themes/hugo-bootstrap/layouts/_default/baseof.html
index 55eaf8f..dc79352 100644
--- a/themes/hugo-bootstrap/layouts/_default/baseof.html
+++ b/themes/hugo-bootstrap/layouts/_default/baseof.html
@@ -17,8 +17,10 @@
 
     <link href="{{ .Site.BaseURL }}css/style.css" rel="stylesheet">
 
-    {{ if .RSSLink }}
-    <link href="{{ .RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />
+    {{ $site_title := .Site.Title }}
+    {{ with .OutputFormats.Get "RSS" }}
+      <link href="{{ .RelPermalink }}" rel="alternate" type="application/rss+xml" title="{{ $site_title }}" />
+      <link href="{{ .RelPermalink }}" rel="feed" type="application/rss+xml" title="{{ $site_title }}" />
     {{ end }}
 
     {{ partial "head-custom.html" . }}
diff --git a/themes/hugo-bootstrap/layouts/partials/announcements.html b/themes/hugo-bootstrap/layouts/partials/announcements.html
index 0c71214..b844148 100644
--- a/themes/hugo-bootstrap/layouts/partials/announcements.html
+++ b/themes/hugo-bootstrap/layouts/partials/announcements.html
@@ -1,12 +1,12 @@
 <!--- jumbotron Showing the next event --->
 
 <!-- Find the next event -->
-{{ $events :=  where .Pages "Section" "events" }}
+{{ $events :=  where .Site.RegularPages "Section" "events" }}
 {{ $future_events := $events | intersect (where $events "Date" ">=" now) }}
-{{ $next_event := first 1 $future_events.ByDate }}
+{{ $next_event := $future_events | first 1 }}
 
 <!-- Find the last post -->
-{{ $posts := where .Pages "Section" "post" }}
+{{ $posts := where .Site.RegularPages "Section" "post" }}
 {{ $last_post := last 1 $posts.ByDate }}
 
 <!-- Show event if there is one and if not show the last
diff --git a/themes/hugo-bootstrap/layouts/partials/footer.html b/themes/hugo-bootstrap/layouts/partials/footer.html
index 1ba7b6f..2be90dc 100644
--- a/themes/hugo-bootstrap/layouts/partials/footer.html
+++ b/themes/hugo-bootstrap/layouts/partials/footer.html
@@ -7,8 +7,8 @@ <h5>{{ i18n "footer-text" }}</h5>
           <p>
           <a class="footer-link" href="{{ .Site.Params.ghrepo }}" target="_blank" >Website Source Code</a> |
           <a class="footer-link" href="{{ .Site.Params.bugtracker }}" target="_blank">Report bug / Suggestion</a> |
-          <a class="footer-link" href="{{ .Site.Params.onionv2 }}{{ .URL | relLangURL }}">Tor Onion Service v2</a> |
-          <a class="footer-link" href="{{ .Site.Params.onionv3 }}{{ .URL | relLangURL }}">Tor Onion Service v3</a> |
+          <a class="footer-link" href="{{ .Site.Params.onionv2 }}{{ .RelPermalink | relLangURL }}">Tor Onion Service v2</a> |
+          <a class="footer-link" href="{{ .Site.Params.onionv3 }}{{ .RelPermalink | relLangURL }}">Tor Onion Service v3</a> |
           <a class="footer-link" href="{{ .Site.Params.mastodon }}" target="_blank">Follow us on Mastodon</a> |
           <a class="footer-link" href="{{ .Site.Params.report }}" target="_blank">Relatório Financeiro 2019</a>
           </p>
diff --git a/themes/hugo-bootstrap/layouts/partials/head-meta.html b/themes/hugo-bootstrap/layouts/partials/head-meta.html
index a5c7b55..b966032 100644
--- a/themes/hugo-bootstrap/layouts/partials/head-meta.html
+++ b/themes/hugo-bootstrap/layouts/partials/head-meta.html
@@ -2,7 +2,7 @@
 <meta http-equiv="x-ua-compatible" content="ie=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 {{if isset .Site.Params "onionv3"}}
-<meta http-equiv="onion-location" content="{{ .Site.Params.onionv3 }}{{ .URL }}">
+<meta http-equiv="onion-location" content="{{ .Site.Params.onionv3 }}{{ .RelPermalink }}">
 {{ end }}
 
 {{ template "_internal/opengraph.html" . }}
diff --git a/themes/hugo-bootstrap/layouts/partials/header.html b/themes/hugo-bootstrap/layouts/partials/header.html
index 4cffeda..59040f3 100644
--- a/themes/hugo-bootstrap/layouts/partials/header.html
+++ b/themes/hugo-bootstrap/layouts/partials/header.html
@@ -13,6 +13,7 @@
               {{ range .Site.Menus.main }}
                 {{ if eq (.URL ) "/community/become-a-member" }} <!-- Make blog be a button -->
                 <h5> </h5>
+
                 <a class="btn btn-info " href="{{ .URL | relLangURL }}">{{ .Name }}</a>
                 {{ else }}
                 <li class="nav-item {{ if eq $url (.URL | relLangURL) }}active{{end}}">
@@ -35,7 +36,7 @@ <h5> </h5>
       </a>
         <div class="collapse navbar-collapse justify-content-between" id="navbarNav">
             <ul class="navbar-nav">
-              {{ $url := .URL | relLangURL }}
+              {{ $url := .RelPermalink | relLangURL }}
               {{ range .Site.Menus.main }}
                 <li class="nav-item {{ if eq $url (.URL | relLangURL) }}active{{end}}">
                     {{ if eq (hasPrefix .URL "mailto:") true }}