diff --git a/website/themes/beastie/layouts/events/list.html b/website/themes/beastie/layouts/events/list.html
index 8384a25a97..5d5972eaf0 100644
--- a/website/themes/beastie/layouts/events/list.html
+++ b/website/themes/beastie/layouts/events/list.html
@@ -1,255 +1,255 @@
 {{ define "main" }}
   <div id="content">
     <div id="sidewrap">
       <div id="sidenav">
         {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }}
       </div>
       <div id="feedlinks">
         <ul>
           <li>
             <a href="{{ absLangURL ($.Site.BaseURL) }}events/feed.xml" title={{ i18n "upcomingFreeBSDEvents" }}>RSS 2.0 Feed</a>
           </li>
         </ul>
       </div>
     </div>
     <div id="contentwrap">
       <h1>{{ .Title }}</h1>
       {{- .Content -}}
 
       {{ $eventsPath := (printf "data/%s/events/events%s.toml" $.Language.Lang (dateFormat "2006" now)) }}
 
       {{ $eventsData := "" }}
       {{ if (fileExists $eventsPath) -}}
         {{ $data := index .Site.Data $.Language.Lang }}
         {{ $eventsData = $data }}
       {{ else }}
         {{ $dataDefaultLanguage := index .Site.Data .Sites.First.Language.Lang }}
         {{ $eventsData = $dataDefaultLanguage }}
       {{ end }}
 
       <!-- Load events and number of times -->
       {{ $countriesCodes := slice }}
       {{ $countriesCodesTimes := newScratch }}
 
       {{ with $eventsData }}
         {{ range (sort .events "year" "desc") }}
           {{ range .events }}
             {{ if .countryCode }}
               {{ $countriesCodes = $countriesCodes | append .countryCode }}
 
               {{ if $countriesCodesTimes.Get .countryCode }}
                 {{ $countriesCodesTimes.Add .countryCode 1 }}
               {{ else }}
                 {{ $countriesCodesTimes.Set .countryCode 1 }}
               {{ end }}
             {{ end }}
           {{ end }}
         {{ end }}
       {{ end }}
 
       {{ $countriesCodes = $countriesCodes | uniq }}
 
       {{ $countriesTimes := slice }}
       {{ range $element := $countriesCodes }}
         {{ $countriesTimes = $countriesTimes | append ($countriesCodesTimes.Get .) }}
       {{ end }}
 
       {{ $eventsImageUrl := (printf "https://chart.googleapis.com/chart?cht=t&chs=400x200&chtm=world&chco=ffffff,ffbe38,600000&chf=bg,s,4D89F9&chd=t:%s&chld=%s" (delimit $countriesTimes ",") (delimit $countriesCodes "")) }}
 
       <img alt="events map" src={{ $eventsImageUrl }} />
 
       {{ $eventsCounter := 0 }}
 
       {{ if isset .Params "year" }}
         <!-- Nothing -->
       {{ else }}
 
         <!-- First load all current-upcoming year-month to the array -->
         {{ $yearsMonthsCP := slice }}
         {{ with $eventsData }}
           {{ range first 3 (sort .events "year" "desc") }}
             {{ range (sort .events "startDate" "asc") }}
               {{ if ge (dateFormat "20060102" .endDate) (dateFormat "20060102" now) }}
                 {{ $yearsMonthsCP = $yearsMonthsCP | append (dateFormat "2006-1" .endDate) }}
               {{ end }}
             {{ end }}
           {{ end }}
         {{ end }}
 
         <!-- Second load all past year-month to the array -->
         {{ $yearsMonthsPast := slice }}
         {{ with $eventsData }}
           {{ range first 3 (sort .events "year" "desc") }}
             {{ range (sort .events "startDate" "asc") }}
               {{ if lt (dateFormat "20060102" .endDate) (dateFormat "20060102" now) }}
                 {{ $yearsMonthsPast = $yearsMonthsPast | append (dateFormat "2006-1" .endDate) }}
               {{ end }}
             {{ end }}
           {{ end }}
         {{ end }}
 
         <!-- Remove duplicates -->
         {{ $yearsMonthsCP = $yearsMonthsCP | uniq }}
         {{ $yearsMonthsPast = $yearsMonthsPast | uniq }}
 
         <!-- Min year -->
         {{ $minYear := now.Year }}
         {{ $minYear = sub $minYear 2}}
 
         <h2 id="upcoming">{{ i18n "currentEvents" }}</h2>
         {{ range $year := seq now.Year $minYear }}
           {{ range $month := seq 1 12 }}
             {{ $yearMonth := (printf "%d-%d" $year $month) }}
             {{ if in $yearsMonthsCP $yearMonth }}
-              <h1>{{ i18n $month }} {{ $year }}</h1>
+              <h2>{{ i18n $month }} {{ $year }}</h2>
               {{ with $eventsData }}
                 <ul>
                   {{ range first 3 (sort .events "year" "desc") }}
                     {{ range (sort .events "startDate" "asc") }}
                       {{ if and (ge (dateFormat "20060102" .endDate) (dateFormat "20060102" now)) (eq (dateFormat "2006-1" .endDate) $yearMonth) }}
                         <li id="{{ .id }}">
                           <p>
                             <b><a href="{{ .url }}">{{ .name }}</a></b>, {{ .site }}, {{ .city }}, {{ .country }}
                             <br />
                             <em>{{ dateFormat "02" .startDate }} - {{ dateFormat "02 January, 2006" .endDate }}</em>
                             <br />
                             {{ .description | safeHTML }}
                           </p>
                         </li>
                         {{ $eventsCounter = add $eventsCounter 1 }}
                       {{ end }}
                     {{ end }}
                   {{ end }}
                 </ul>
               {{ end }}
             {{ end }}
           {{ end }}
         {{ end }}
 
         <h2 id="past">{{ i18n "pastEvents" }}</h2>
         {{ range $year := seq now.Year $minYear }}
           {{ range $month := seq 12 1 }}
             {{ $yearMonth := (printf "%d-%d" $year $month) }}
             {{ if in $yearsMonthsPast $yearMonth }}
-              <h1>{{ i18n $month }} {{ $year }}</h1>
+              <h2>{{ i18n $month }} {{ $year }}</h2>
               {{ with $eventsData }}
                 <ul>
                   {{ range first 3 (sort .events "year" "desc") }}
                     {{ range (sort .events "startDate" "desc") }}
                       {{ if and (lt (dateFormat "20060102" .endDate) (dateFormat "20060102" now)) (eq (dateFormat "2006-1" .endDate) $yearMonth) }}
                         <li id="{{ .id }}">
                           <p>
                             <b><a href="{{ .url }}">{{ .name }}</a></b>, {{ .site }}, {{ .city }}, {{ .country }}
                             <br />
                             <em>{{ dateFormat "02" .startDate }} - {{ dateFormat "02 January, 2006" .endDate }}</em>
                             <br />
                             {{ .description | safeHTML }}
                           </p>
                         </li>
                         {{ $eventsCounter = add $eventsCounter 1 }}
                       {{ end }}
                     {{ end }}
                   {{ end }}
                 </ul>
               {{ end }}
             {{ end }}
           {{ end }}
         {{ end }}
       {{ end }}
 
       {{ if isset .Params "year" }}
         {{ $year := .Params.year }}
         {{ $eventsYear := (printf "events%d" $year) }}
         {{ $eventsSelectedYear := index $eventsData.events $eventsYear }}
 
         <!-- First load all current-upcoming year-month to the array -->
         {{ $yearsMonthsSelected := slice }}
 
         {{ with $eventsSelectedYear }}
           {{ range (sort .events "startDate" "asc") }}
             {{ $yearsMonthsSelected = $yearsMonthsSelected | append (dateFormat "2006-1" .endDate) }}
           {{ end }}
         {{ end }}
 
         {{ $yearsMonthsSelected = $yearsMonthsSelected | uniq }}
 
         <h2 id="past">{{ i18n "pastEvents" }}</h2>
         {{ range $month := seq 12 1 }}
           {{ $yearMonth := (printf "%d-%d" $year $month) }}
           {{ if in $yearsMonthsSelected $yearMonth }}
-            <h1>{{ i18n $month }} {{ $year }}</h1>
+            <h2>{{ i18n $month }} {{ $year }}</h2>
             {{ with $eventsSelectedYear }}
               <ul>
                 {{ range (sort .events "startDate" "desc") }}
                   {{ if and (lt (dateFormat "20060102" .endDate) (dateFormat "20060102" now)) (eq (dateFormat "2006-1" .endDate) $yearMonth) }}
                     <li id="{{ .id }}">
                       <p>
                         <b><a href="{{ .url }}">{{ .name }}</a></b>, {{ .site }}, {{ .city }}, {{ .country }}
                         <br />
                         <em>{{ dateFormat "02" .startDate }} - {{ dateFormat "02 January, 2006" .endDate }}</em>
                         <br />
                         {{ .description | safeHTML }}
                       </p>
                     </li>
                     {{ $eventsCounter = add $eventsCounter 1 }}
                   {{ end }}
                 {{ end }}
               </ul>
             {{ end }}
           {{ end }}
         {{ end }}
       {{ end }}
       <p>Events from past years:</p>
       <ul id="events-past-years">
         <li>
           <a href="../2018">2018</a>
         </li>
         <li>
           <a href="../2017">2017</a>
         </li>
         <li>
           <a href="../2016">2016</a>
         </li>
         <li>
           <a href="../2015">2015</a>
         </li>
         <li>
           <a href="../2014">2014</a>
         </li>
         <li>
           <a href="../2013">2013</a>
         </li>
         <li>
           <a href="../2012">2012</a>
         </li>
         <li>
           <a href="../2011">2011</a>
         </li>
         <li>
           <a href="../2010">2010</a>
         </li>
         <li>
           <a href="../2009">2009</a>
         </li>
         <li>
           <a href="../2008">2008</a>
         </li>
         <li>
           <a href="../2007">2007</a>
         </li>
         <li>
           <a href="../2006">2006</a>
         </li>
         <li>
           <a href="../2005">2005</a>
         </li>
         <li>
           <a href="../2004">2004</a>
         </li>
         <li>
           <a href="../2003">2003</a>
         </li>
       </ul>
     </div>
   </div>
 {{ end }}
diff --git a/website/themes/beastie/layouts/events/single.html b/website/themes/beastie/layouts/events/single.html
index 8384a25a97..5d5972eaf0 100644
--- a/website/themes/beastie/layouts/events/single.html
+++ b/website/themes/beastie/layouts/events/single.html
@@ -1,255 +1,255 @@
 {{ define "main" }}
   <div id="content">
     <div id="sidewrap">
       <div id="sidenav">
         {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }}
       </div>
       <div id="feedlinks">
         <ul>
           <li>
             <a href="{{ absLangURL ($.Site.BaseURL) }}events/feed.xml" title={{ i18n "upcomingFreeBSDEvents" }}>RSS 2.0 Feed</a>
           </li>
         </ul>
       </div>
     </div>
     <div id="contentwrap">
       <h1>{{ .Title }}</h1>
       {{- .Content -}}
 
       {{ $eventsPath := (printf "data/%s/events/events%s.toml" $.Language.Lang (dateFormat "2006" now)) }}
 
       {{ $eventsData := "" }}
       {{ if (fileExists $eventsPath) -}}
         {{ $data := index .Site.Data $.Language.Lang }}
         {{ $eventsData = $data }}
       {{ else }}
         {{ $dataDefaultLanguage := index .Site.Data .Sites.First.Language.Lang }}
         {{ $eventsData = $dataDefaultLanguage }}
       {{ end }}
 
       <!-- Load events and number of times -->
       {{ $countriesCodes := slice }}
       {{ $countriesCodesTimes := newScratch }}
 
       {{ with $eventsData }}
         {{ range (sort .events "year" "desc") }}
           {{ range .events }}
             {{ if .countryCode }}
               {{ $countriesCodes = $countriesCodes | append .countryCode }}
 
               {{ if $countriesCodesTimes.Get .countryCode }}
                 {{ $countriesCodesTimes.Add .countryCode 1 }}
               {{ else }}
                 {{ $countriesCodesTimes.Set .countryCode 1 }}
               {{ end }}
             {{ end }}
           {{ end }}
         {{ end }}
       {{ end }}
 
       {{ $countriesCodes = $countriesCodes | uniq }}
 
       {{ $countriesTimes := slice }}
       {{ range $element := $countriesCodes }}
         {{ $countriesTimes = $countriesTimes | append ($countriesCodesTimes.Get .) }}
       {{ end }}
 
       {{ $eventsImageUrl := (printf "https://chart.googleapis.com/chart?cht=t&chs=400x200&chtm=world&chco=ffffff,ffbe38,600000&chf=bg,s,4D89F9&chd=t:%s&chld=%s" (delimit $countriesTimes ",") (delimit $countriesCodes "")) }}
 
       <img alt="events map" src={{ $eventsImageUrl }} />
 
       {{ $eventsCounter := 0 }}
 
       {{ if isset .Params "year" }}
         <!-- Nothing -->
       {{ else }}
 
         <!-- First load all current-upcoming year-month to the array -->
         {{ $yearsMonthsCP := slice }}
         {{ with $eventsData }}
           {{ range first 3 (sort .events "year" "desc") }}
             {{ range (sort .events "startDate" "asc") }}
               {{ if ge (dateFormat "20060102" .endDate) (dateFormat "20060102" now) }}
                 {{ $yearsMonthsCP = $yearsMonthsCP | append (dateFormat "2006-1" .endDate) }}
               {{ end }}
             {{ end }}
           {{ end }}
         {{ end }}
 
         <!-- Second load all past year-month to the array -->
         {{ $yearsMonthsPast := slice }}
         {{ with $eventsData }}
           {{ range first 3 (sort .events "year" "desc") }}
             {{ range (sort .events "startDate" "asc") }}
               {{ if lt (dateFormat "20060102" .endDate) (dateFormat "20060102" now) }}
                 {{ $yearsMonthsPast = $yearsMonthsPast | append (dateFormat "2006-1" .endDate) }}
               {{ end }}
             {{ end }}
           {{ end }}
         {{ end }}
 
         <!-- Remove duplicates -->
         {{ $yearsMonthsCP = $yearsMonthsCP | uniq }}
         {{ $yearsMonthsPast = $yearsMonthsPast | uniq }}
 
         <!-- Min year -->
         {{ $minYear := now.Year }}
         {{ $minYear = sub $minYear 2}}
 
         <h2 id="upcoming">{{ i18n "currentEvents" }}</h2>
         {{ range $year := seq now.Year $minYear }}
           {{ range $month := seq 1 12 }}
             {{ $yearMonth := (printf "%d-%d" $year $month) }}
             {{ if in $yearsMonthsCP $yearMonth }}
-              <h1>{{ i18n $month }} {{ $year }}</h1>
+              <h2>{{ i18n $month }} {{ $year }}</h2>
               {{ with $eventsData }}
                 <ul>
                   {{ range first 3 (sort .events "year" "desc") }}
                     {{ range (sort .events "startDate" "asc") }}
                       {{ if and (ge (dateFormat "20060102" .endDate) (dateFormat "20060102" now)) (eq (dateFormat "2006-1" .endDate) $yearMonth) }}
                         <li id="{{ .id }}">
                           <p>
                             <b><a href="{{ .url }}">{{ .name }}</a></b>, {{ .site }}, {{ .city }}, {{ .country }}
                             <br />
                             <em>{{ dateFormat "02" .startDate }} - {{ dateFormat "02 January, 2006" .endDate }}</em>
                             <br />
                             {{ .description | safeHTML }}
                           </p>
                         </li>
                         {{ $eventsCounter = add $eventsCounter 1 }}
                       {{ end }}
                     {{ end }}
                   {{ end }}
                 </ul>
               {{ end }}
             {{ end }}
           {{ end }}
         {{ end }}
 
         <h2 id="past">{{ i18n "pastEvents" }}</h2>
         {{ range $year := seq now.Year $minYear }}
           {{ range $month := seq 12 1 }}
             {{ $yearMonth := (printf "%d-%d" $year $month) }}
             {{ if in $yearsMonthsPast $yearMonth }}
-              <h1>{{ i18n $month }} {{ $year }}</h1>
+              <h2>{{ i18n $month }} {{ $year }}</h2>
               {{ with $eventsData }}
                 <ul>
                   {{ range first 3 (sort .events "year" "desc") }}
                     {{ range (sort .events "startDate" "desc") }}
                       {{ if and (lt (dateFormat "20060102" .endDate) (dateFormat "20060102" now)) (eq (dateFormat "2006-1" .endDate) $yearMonth) }}
                         <li id="{{ .id }}">
                           <p>
                             <b><a href="{{ .url }}">{{ .name }}</a></b>, {{ .site }}, {{ .city }}, {{ .country }}
                             <br />
                             <em>{{ dateFormat "02" .startDate }} - {{ dateFormat "02 January, 2006" .endDate }}</em>
                             <br />
                             {{ .description | safeHTML }}
                           </p>
                         </li>
                         {{ $eventsCounter = add $eventsCounter 1 }}
                       {{ end }}
                     {{ end }}
                   {{ end }}
                 </ul>
               {{ end }}
             {{ end }}
           {{ end }}
         {{ end }}
       {{ end }}
 
       {{ if isset .Params "year" }}
         {{ $year := .Params.year }}
         {{ $eventsYear := (printf "events%d" $year) }}
         {{ $eventsSelectedYear := index $eventsData.events $eventsYear }}
 
         <!-- First load all current-upcoming year-month to the array -->
         {{ $yearsMonthsSelected := slice }}
 
         {{ with $eventsSelectedYear }}
           {{ range (sort .events "startDate" "asc") }}
             {{ $yearsMonthsSelected = $yearsMonthsSelected | append (dateFormat "2006-1" .endDate) }}
           {{ end }}
         {{ end }}
 
         {{ $yearsMonthsSelected = $yearsMonthsSelected | uniq }}
 
         <h2 id="past">{{ i18n "pastEvents" }}</h2>
         {{ range $month := seq 12 1 }}
           {{ $yearMonth := (printf "%d-%d" $year $month) }}
           {{ if in $yearsMonthsSelected $yearMonth }}
-            <h1>{{ i18n $month }} {{ $year }}</h1>
+            <h2>{{ i18n $month }} {{ $year }}</h2>
             {{ with $eventsSelectedYear }}
               <ul>
                 {{ range (sort .events "startDate" "desc") }}
                   {{ if and (lt (dateFormat "20060102" .endDate) (dateFormat "20060102" now)) (eq (dateFormat "2006-1" .endDate) $yearMonth) }}
                     <li id="{{ .id }}">
                       <p>
                         <b><a href="{{ .url }}">{{ .name }}</a></b>, {{ .site }}, {{ .city }}, {{ .country }}
                         <br />
                         <em>{{ dateFormat "02" .startDate }} - {{ dateFormat "02 January, 2006" .endDate }}</em>
                         <br />
                         {{ .description | safeHTML }}
                       </p>
                     </li>
                     {{ $eventsCounter = add $eventsCounter 1 }}
                   {{ end }}
                 {{ end }}
               </ul>
             {{ end }}
           {{ end }}
         {{ end }}
       {{ end }}
       <p>Events from past years:</p>
       <ul id="events-past-years">
         <li>
           <a href="../2018">2018</a>
         </li>
         <li>
           <a href="../2017">2017</a>
         </li>
         <li>
           <a href="../2016">2016</a>
         </li>
         <li>
           <a href="../2015">2015</a>
         </li>
         <li>
           <a href="../2014">2014</a>
         </li>
         <li>
           <a href="../2013">2013</a>
         </li>
         <li>
           <a href="../2012">2012</a>
         </li>
         <li>
           <a href="../2011">2011</a>
         </li>
         <li>
           <a href="../2010">2010</a>
         </li>
         <li>
           <a href="../2009">2009</a>
         </li>
         <li>
           <a href="../2008">2008</a>
         </li>
         <li>
           <a href="../2007">2007</a>
         </li>
         <li>
           <a href="../2006">2006</a>
         </li>
         <li>
           <a href="../2005">2005</a>
         </li>
         <li>
           <a href="../2004">2004</a>
         </li>
         <li>
           <a href="../2003">2003</a>
         </li>
       </ul>
     </div>
   </div>
 {{ end }}
diff --git a/website/themes/beastie/layouts/news/list.html b/website/themes/beastie/layouts/news/list.html
index 26409dfdfe..d9e3ac3e42 100644
--- a/website/themes/beastie/layouts/news/list.html
+++ b/website/themes/beastie/layouts/news/list.html
@@ -1,79 +1,78 @@
 {{ define "main" }}
   <div id="content">
     <div id="sidewrap">
       <div id="sidenav">
         {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }}
       </div>
       <div id="feedlinks">
         <ul>
           <li>
             <a href="{{ absLangURL ($.Site.BaseURL) }}news/feed.xml" title="FreeBSD RSS 2.0 Feed">RSS 2.0 Feed</a>
           </li>
         </ul>
       </div>
     </div>
     <div id="contentwrap">
       <h1>{{ .Title }}</h1>
       {{- .Content -}}
 
       {{ if .Params.loadNews }}
 
         {{ $newsPath := (printf "data/%s/news/news.toml" $.Language.Lang) }}
 
         {{ $newsData := "" }}
         {{ if (fileExists $newsPath) -}}
           {{ $data := index .Site.Data $.Language.Lang }}
           {{ $newsData = $data.news }}
         {{ else }}
           {{ $dataDefaultLanguage := index .Site.Data .Sites.First.Language.Lang }}
           {{ $newsData = $dataDefaultLanguage.news }}
         {{ end }}
 
         <!-- First load all year-month to the array -->
         {{ $yearsMonths := slice }}
         {{ with $newsData.news }}
           {{ range (sort .news "date" "desc") }}
             {{ $yearsMonths = $yearsMonths | append (dateFormat "2006-1" .date) }}
           {{ end }}
         {{ end }}
 
         <!-- Remove duplicates -->
         {{ $yearsMonths = $yearsMonths | uniq }}
 
         {{ $newsDayCounter := 1 }}
         {{ $newsDayPrev := false }}
         {{ range $year := seq now.Year 2010 }}
           {{ range $month := seq 12 1 }}
             {{ $yearMonth := (printf "%d-%d" $year $month) }}
             {{ if in $yearsMonths $yearMonth }}
-              <h1>{{ i18n $month }} {{ $year }}</h1>
-
+              <h2>{{ i18n $month }} {{ $year }}</h2>
               <ul>
                 {{ with $newsData.news }}
                   {{ range (sort .news "date" "desc") }}
                     {{ if eq (dateFormat "2006-1" .date) $yearMonth }}
                       {{ $newsDayCur := dateFormat "2006-01-02" .date }}
                       {{ if eq $newsDayCur $newsDayPrev }}
                         {{ $newsDayCounter = add $newsDayCounter 1 }}
                       {{ else }}
                         {{ $newsDayCounter = 1 }}
                       {{ end }}
                       <li>
                         <p class="localized">
                           <a id="{{ dateFormat "2006-01-02" .date }}:{{ $newsDayCounter }}"></a>
                           <strong>{{ dateFormat "2" .date }} {{ i18n (dateFormat "1" .date) }}:</strong>
                           {{ .description | safeHTML }}
                         </p>
                       </li>
                       {{ $newsDayPrev = $newsDayCur }}
                     {{ end }}
                   {{ end }}
                 {{ end }}
               </ul>
             {{ end }}
           {{ end }}
         {{ end }}
       {{ end }}
     </div>
   </div>
 {{ end }}
diff --git a/website/themes/beastie/layouts/news/single.html b/website/themes/beastie/layouts/news/single.html
index 26409dfdfe..d9e3ac3e42 100644
--- a/website/themes/beastie/layouts/news/single.html
+++ b/website/themes/beastie/layouts/news/single.html
@@ -1,79 +1,78 @@
 {{ define "main" }}
   <div id="content">
     <div id="sidewrap">
       <div id="sidenav">
         {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }}
       </div>
       <div id="feedlinks">
         <ul>
           <li>
             <a href="{{ absLangURL ($.Site.BaseURL) }}news/feed.xml" title="FreeBSD RSS 2.0 Feed">RSS 2.0 Feed</a>
           </li>
         </ul>
       </div>
     </div>
     <div id="contentwrap">
       <h1>{{ .Title }}</h1>
       {{- .Content -}}
 
       {{ if .Params.loadNews }}
 
         {{ $newsPath := (printf "data/%s/news/news.toml" $.Language.Lang) }}
 
         {{ $newsData := "" }}
         {{ if (fileExists $newsPath) -}}
           {{ $data := index .Site.Data $.Language.Lang }}
           {{ $newsData = $data.news }}
         {{ else }}
           {{ $dataDefaultLanguage := index .Site.Data .Sites.First.Language.Lang }}
           {{ $newsData = $dataDefaultLanguage.news }}
         {{ end }}
 
         <!-- First load all year-month to the array -->
         {{ $yearsMonths := slice }}
         {{ with $newsData.news }}
           {{ range (sort .news "date" "desc") }}
             {{ $yearsMonths = $yearsMonths | append (dateFormat "2006-1" .date) }}
           {{ end }}
         {{ end }}
 
         <!-- Remove duplicates -->
         {{ $yearsMonths = $yearsMonths | uniq }}
 
         {{ $newsDayCounter := 1 }}
         {{ $newsDayPrev := false }}
         {{ range $year := seq now.Year 2010 }}
           {{ range $month := seq 12 1 }}
             {{ $yearMonth := (printf "%d-%d" $year $month) }}
             {{ if in $yearsMonths $yearMonth }}
-              <h1>{{ i18n $month }} {{ $year }}</h1>
-
+              <h2>{{ i18n $month }} {{ $year }}</h2>
               <ul>
                 {{ with $newsData.news }}
                   {{ range (sort .news "date" "desc") }}
                     {{ if eq (dateFormat "2006-1" .date) $yearMonth }}
                       {{ $newsDayCur := dateFormat "2006-01-02" .date }}
                       {{ if eq $newsDayCur $newsDayPrev }}
                         {{ $newsDayCounter = add $newsDayCounter 1 }}
                       {{ else }}
                         {{ $newsDayCounter = 1 }}
                       {{ end }}
                       <li>
                         <p class="localized">
                           <a id="{{ dateFormat "2006-01-02" .date }}:{{ $newsDayCounter }}"></a>
                           <strong>{{ dateFormat "2" .date }} {{ i18n (dateFormat "1" .date) }}:</strong>
                           {{ .description | safeHTML }}
                         </p>
                       </li>
                       {{ $newsDayPrev = $newsDayCur }}
                     {{ end }}
                   {{ end }}
                 {{ end }}
               </ul>
             {{ end }}
           {{ end }}
         {{ end }}
       {{ end }}
     </div>
   </div>
 {{ end }}
diff --git a/website/themes/beastie/layouts/press/list.html b/website/themes/beastie/layouts/press/list.html
index 332c4de940..88c591492a 100644
--- a/website/themes/beastie/layouts/press/list.html
+++ b/website/themes/beastie/layouts/press/list.html
@@ -1,83 +1,82 @@
 {{ define "main" }}
   <div id="content">
     <div id="sidewrap">
       <div id="sidenav">
         {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }}
       </div>
       <div id="feedlinks">
         <ul>
           <li>
             <a href="{{ absLangURL ($.Site.BaseURL) }}press/feed.xml" title="FreeBSD RSS 2.0 Feed">RSS 2.0 Feed</a>
           </li>
         </ul>
       </div>
     </div>
     <div id="contentwrap">
       <h1>{{ .Title }}</h1>
       {{- .Content -}}
 
       {{ if .Params.loadPress }}
         {{ $pressPath := (printf "data/%s/press/press.toml" $.Language.Lang) }}
 
         {{ $pressData := "" }}
         {{ if (fileExists $pressPath) -}}
           {{ $data := index .Site.Data $.Language.Lang }}
           {{ $pressData = $data.press }}
         {{ else }}
           {{ $dataDefaultLanguage := index .Site.Data .Sites.First.Language.Lang }}
           {{ $pressData = $dataDefaultLanguage.press }}
         {{ end }}
 
         <!-- First load all year-month to the array -->
         {{ $yearsMonths := slice }}
         {{ with $pressData.press }}
           {{ range (sort .press "date" "desc") }}
             {{ $yearsMonths = $yearsMonths | append (dateFormat "2006-1" .date) }}
           {{ end }}
         {{ end }}
 
         <!-- Remove duplicates -->
         {{ $yearsMonths = $yearsMonths | uniq }}
 
         {{ $pressMonthCounter := 1 }}
         {{ $pressMonthPrev := false }}
         {{ range $year := seq now.Year 2010 }}
           {{ range $month := seq 12 1 }}
             {{ $yearMonth := (printf "%d-%d" $year $month) }}
             {{ if in $yearsMonths $yearMonth }}
-              <h1>{{ i18n $month }} {{ $year }}</h1>
-
+              <h2>{{ i18n $month }} {{ $year }}</h2>
               <ul>
                 {{ with $pressData.press }}
                   {{ range (sort .press "date" "desc") }}
                     {{ if eq (dateFormat "2006-1" .date) $yearMonth }}
                       {{ $pressMonthCur := dateFormat "2006-01" .date }}
                       {{ if eq $pressMonthCur $pressMonthPrev }}
                         {{ $pressMonthCounter = add $pressMonthCounter 1 }}
                       {{ else }}
                         {{ $pressMonthCounter = 1 }}
                       {{ end }}
                       <li>
                         <p>
                           <a id="{{ dateFormat "2006-01" .date }}:{{ $pressMonthCounter }}"></a>
                           <a href="{{ .url }}">
                             <strong>{{ .name }}</strong>
                           </a>
                           <br />
                           <a href="{{ .siteUrl }}">{{ .siteName }}</a>, {{ .author }}
                           <br />
                           {{ .description | safeHTML}}
                         </p>
                       </li>
                       {{ $pressMonthPrev = $pressMonthCur }}
                     {{ end }}
                   {{ end }}
                 {{ end }}
               </ul>
             {{ end }}
           {{ end }}
         {{ end }}
       {{ end }}
     </div>
   </div>
 {{ end }}
diff --git a/website/themes/beastie/layouts/press/single.html b/website/themes/beastie/layouts/press/single.html
index 332c4de940..88c591492a 100644
--- a/website/themes/beastie/layouts/press/single.html
+++ b/website/themes/beastie/layouts/press/single.html
@@ -1,83 +1,82 @@
 {{ define "main" }}
   <div id="content">
     <div id="sidewrap">
       <div id="sidenav">
         {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }}
       </div>
       <div id="feedlinks">
         <ul>
           <li>
             <a href="{{ absLangURL ($.Site.BaseURL) }}press/feed.xml" title="FreeBSD RSS 2.0 Feed">RSS 2.0 Feed</a>
           </li>
         </ul>
       </div>
     </div>
     <div id="contentwrap">
       <h1>{{ .Title }}</h1>
       {{- .Content -}}
 
       {{ if .Params.loadPress }}
         {{ $pressPath := (printf "data/%s/press/press.toml" $.Language.Lang) }}
 
         {{ $pressData := "" }}
         {{ if (fileExists $pressPath) -}}
           {{ $data := index .Site.Data $.Language.Lang }}
           {{ $pressData = $data.press }}
         {{ else }}
           {{ $dataDefaultLanguage := index .Site.Data .Sites.First.Language.Lang }}
           {{ $pressData = $dataDefaultLanguage.press }}
         {{ end }}
 
         <!-- First load all year-month to the array -->
         {{ $yearsMonths := slice }}
         {{ with $pressData.press }}
           {{ range (sort .press "date" "desc") }}
             {{ $yearsMonths = $yearsMonths | append (dateFormat "2006-1" .date) }}
           {{ end }}
         {{ end }}
 
         <!-- Remove duplicates -->
         {{ $yearsMonths = $yearsMonths | uniq }}
 
         {{ $pressMonthCounter := 1 }}
         {{ $pressMonthPrev := false }}
         {{ range $year := seq now.Year 2010 }}
           {{ range $month := seq 12 1 }}
             {{ $yearMonth := (printf "%d-%d" $year $month) }}
             {{ if in $yearsMonths $yearMonth }}
-              <h1>{{ i18n $month }} {{ $year }}</h1>
-
+              <h2>{{ i18n $month }} {{ $year }}</h2>
               <ul>
                 {{ with $pressData.press }}
                   {{ range (sort .press "date" "desc") }}
                     {{ if eq (dateFormat "2006-1" .date) $yearMonth }}
                       {{ $pressMonthCur := dateFormat "2006-01" .date }}
                       {{ if eq $pressMonthCur $pressMonthPrev }}
                         {{ $pressMonthCounter = add $pressMonthCounter 1 }}
                       {{ else }}
                         {{ $pressMonthCounter = 1 }}
                       {{ end }}
                       <li>
                         <p>
                           <a id="{{ dateFormat "2006-01" .date }}:{{ $pressMonthCounter }}"></a>
                           <a href="{{ .url }}">
                             <strong>{{ .name }}</strong>
                           </a>
                           <br />
                           <a href="{{ .siteUrl }}">{{ .siteName }}</a>, {{ .author }}
                           <br />
                           {{ .description | safeHTML}}
                         </p>
                       </li>
                       {{ $pressMonthPrev = $pressMonthCur }}
                     {{ end }}
                   {{ end }}
                 {{ end }}
               </ul>
             {{ end }}
           {{ end }}
         {{ end }}
       {{ end }}
     </div>
   </div>
 {{ end }}