diff --git a/website/content/en/events/2003.adoc b/website/content/en/events/2003.adoc
index 8be785d4da..28fd480492 100644
--- a/website/content/en/events/2003.adoc
+++ b/website/content/en/events/2003.adoc
@@ -1,11 +1,9 @@
 ---
 title: "FreeBSD Past Events"
 sidenav: community
 year: 2003
 ---
 
 = FreeBSD Past Events
 
 Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org.
-
-Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events.
diff --git a/website/content/en/events/2004.adoc b/website/content/en/events/2004.adoc
index 6b169ef8b3..f39fd313d5 100644
--- a/website/content/en/events/2004.adoc
+++ b/website/content/en/events/2004.adoc
@@ -1,11 +1,9 @@
 ---
 title: "FreeBSD Past Events"
 sidenav: community
 year: 2004
 ---
 
 = FreeBSD Past Events
 
 Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org.
-
-Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events.
diff --git a/website/content/en/events/2005.adoc b/website/content/en/events/2005.adoc
index d14fa7909a..5b319696f7 100644
--- a/website/content/en/events/2005.adoc
+++ b/website/content/en/events/2005.adoc
@@ -1,11 +1,9 @@
 ---
 title: "FreeBSD Past Events"
 sidenav: community
 year: 2005
 ---
 
 = FreeBSD Past Events
 
 Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org.
-
-Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events.
diff --git a/website/content/en/events/2006.adoc b/website/content/en/events/2006.adoc
index f6284e3391..9afd2e2f0a 100644
--- a/website/content/en/events/2006.adoc
+++ b/website/content/en/events/2006.adoc
@@ -1,11 +1,9 @@
 ---
 title: "FreeBSD Past Events"
 sidenav: community
 year: 2006
 ---
 
 = FreeBSD Past Events
 
 Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org.
-
-Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events.
diff --git a/website/content/en/events/2007.adoc b/website/content/en/events/2007.adoc
index 60837d412b..e838343f48 100644
--- a/website/content/en/events/2007.adoc
+++ b/website/content/en/events/2007.adoc
@@ -1,11 +1,9 @@
 ---
 title: "FreeBSD Past Events"
 sidenav: community
 year: 2007
 ---
 
 = FreeBSD Past Events
 
 Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org.
-
-Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events.
diff --git a/website/content/en/events/2008.adoc b/website/content/en/events/2008.adoc
index 4bd3c336ee..02e4de5c0c 100644
--- a/website/content/en/events/2008.adoc
+++ b/website/content/en/events/2008.adoc
@@ -1,11 +1,9 @@
 ---
 title: "FreeBSD Past Events"
 sidenav: community
 year: 2008
 ---
 
 = FreeBSD Past Events
 
 Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org.
-
-Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events.
diff --git a/website/content/en/events/2009.adoc b/website/content/en/events/2009.adoc
index d3a2ef7c99..ac88d5aeb4 100644
--- a/website/content/en/events/2009.adoc
+++ b/website/content/en/events/2009.adoc
@@ -1,11 +1,9 @@
 ---
 title: "FreeBSD Past Events"
 sidenav: community
 year: 2009
 ---
 
 = FreeBSD Past Events
 
 Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org.
-
-Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events.
diff --git a/website/content/en/events/2010.adoc b/website/content/en/events/2010.adoc
index b6ea650cd6..83b07176c2 100644
--- a/website/content/en/events/2010.adoc
+++ b/website/content/en/events/2010.adoc
@@ -1,11 +1,9 @@
 ---
 title: "FreeBSD Past Events"
 sidenav: community
 year: 2010
 ---
 
 = FreeBSD Past Events
 
 Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org.
-
-Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events.
diff --git a/website/content/en/events/2011.adoc b/website/content/en/events/2011.adoc
index eae4fc9679..bd368f023d 100644
--- a/website/content/en/events/2011.adoc
+++ b/website/content/en/events/2011.adoc
@@ -1,11 +1,9 @@
 ---
 title: "FreeBSD Past Events"
 sidenav: community
 year: 2011
 ---
 
 = FreeBSD Past Events
 
 Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org.
-
-Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events.
diff --git a/website/content/en/events/2012.adoc b/website/content/en/events/2012.adoc
index 10c3d5eb77..7fba506c0e 100644
--- a/website/content/en/events/2012.adoc
+++ b/website/content/en/events/2012.adoc
@@ -1,11 +1,9 @@
 ---
 title: "FreeBSD Past Events"
 sidenav: community
 year: 2012
 ---
 
 = FreeBSD Past Events
 
 Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org.
-
-Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events.
diff --git a/website/content/en/events/2013.adoc b/website/content/en/events/2013.adoc
index 5fd0d45c64..ad0d1cb238 100644
--- a/website/content/en/events/2013.adoc
+++ b/website/content/en/events/2013.adoc
@@ -1,11 +1,9 @@
 ---
 title: "FreeBSD Past Events"
 sidenav: community
 year: 2013
 ---
 
 = FreeBSD Past Events
 
 Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org.
-
-Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events.
diff --git a/website/content/en/events/2014.adoc b/website/content/en/events/2014.adoc
index e635ab1379..548b59d71f 100644
--- a/website/content/en/events/2014.adoc
+++ b/website/content/en/events/2014.adoc
@@ -1,11 +1,9 @@
 ---
 title: "FreeBSD Past Events"
 sidenav: community
 year: 2014
 ---
 
 = FreeBSD Past Events
 
 Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org.
-
-Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events.
diff --git a/website/content/en/events/2015.adoc b/website/content/en/events/2015.adoc
index 684e7e6e86..e32c1c1411 100644
--- a/website/content/en/events/2015.adoc
+++ b/website/content/en/events/2015.adoc
@@ -1,11 +1,9 @@
 ---
 title: "FreeBSD Past Events"
 sidenav: community
 year: 2015
 ---
 
 = FreeBSD Past Events
 
 Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org.
-
-Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events.
diff --git a/website/content/en/events/2016.adoc b/website/content/en/events/2016.adoc
index 83c4e0c5f1..cef6741818 100644
--- a/website/content/en/events/2016.adoc
+++ b/website/content/en/events/2016.adoc
@@ -1,11 +1,9 @@
 ---
 title: "FreeBSD Past Events"
 sidenav: community
 year: 2016
 ---
 
 = FreeBSD Past Events
 
 Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org.
-
-Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events.
diff --git a/website/content/en/events/2017.adoc b/website/content/en/events/2017.adoc
index 4723378198..4b8038ffc2 100644
--- a/website/content/en/events/2017.adoc
+++ b/website/content/en/events/2017.adoc
@@ -1,11 +1,9 @@
 ---
 title: "FreeBSD Past Events"
 sidenav: community
 year: 2017
 ---
 
 = FreeBSD Past Events
 
 Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org.
-
-Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events.
diff --git a/website/content/en/events/2018.adoc b/website/content/en/events/2018.adoc
index f8e8d1418c..4687c72371 100644
--- a/website/content/en/events/2018.adoc
+++ b/website/content/en/events/2018.adoc
@@ -1,11 +1,9 @@
 ---
 title: "FreeBSD Past Events"
 sidenav: community
 year: 2018
 ---
 
 = FreeBSD Past Events
 
 Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org.
-
-Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events.
diff --git a/website/content/en/events/2019.adoc b/website/content/en/events/2019.adoc
index 6c7f31a224..51d439cc76 100644
--- a/website/content/en/events/2019.adoc
+++ b/website/content/en/events/2019.adoc
@@ -1,11 +1,9 @@
 ---
 title: "FreeBSD Past Events"
 sidenav: community
 year: 2019
 ---
 
 = FreeBSD Past Events
 
 Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org.
-
-Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events.
diff --git a/website/content/en/events/2020.adoc b/website/content/en/events/2020.adoc
index 4a7766fd22..a078b71fe8 100644
--- a/website/content/en/events/2020.adoc
+++ b/website/content/en/events/2020.adoc
@@ -1,11 +1,9 @@
 ---
 title: "FreeBSD Past Events"
 sidenav: community
 year: 2020
 ---
 
 = FreeBSD Past Events
 
 Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org.
-
-Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events.
diff --git a/website/content/en/events/2021.adoc b/website/content/en/events/2021.adoc
index 22af582d92..9d6ff930bf 100644
--- a/website/content/en/events/2021.adoc
+++ b/website/content/en/events/2021.adoc
@@ -1,11 +1,9 @@
 ---
 title: "FreeBSD Past Events"
 sidenav: community
 year: 2021
 ---
 
 = FreeBSD Past Events
 
 Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org.
-
-Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events.
diff --git a/website/content/en/events/2022.adoc b/website/content/en/events/2022.adoc
index 00ed6feee7..01572c2137 100644
--- a/website/content/en/events/2022.adoc
+++ b/website/content/en/events/2022.adoc
@@ -1,11 +1,9 @@
 ---
 title: "FreeBSD Past Events"
 sidenav: community
 year: 2022
 ---
 
 = FreeBSD Past Events
 
 Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org.
-
-Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events.
diff --git a/website/content/en/events/_index.adoc b/website/content/en/events/_index.adoc
index 41ac0fc4f8..b013917568 100644
--- a/website/content/en/events/_index.adoc
+++ b/website/content/en/events/_index.adoc
@@ -1,10 +1,8 @@
 ---
 title: "FreeBSD Events"
 sidenav: community
 ---
 
 = FreeBSD Events
 
 Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org.
-
-Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events.
diff --git a/website/themes/beastie/layouts/events/list.html b/website/themes/beastie/layouts/events/list.html
index 97faff7303..0d00620073 100644
--- a/website/themes/beastie/layouts/events/list.html
+++ b/website/themes/beastie/layouts/events/list.html
@@ -1,269 +1,238 @@
 {{ 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.Default.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/Max year -->
         {{ $maxYear := now.Year }}
         {{ $maxYear = add $maxYear 1}}
         {{ $minYear := now.Year }}
         {{ $minYear = sub $minYear 2}}
 
         <h2 id="upcoming">{{ i18n "currentEvents" }}</h2>
         {{ range $year := seq $minYear $maxYear }}
           {{ range $month := seq 1 12 }}
             {{ $yearMonth := (printf "%d-%d" $year $month) }}
             {{ if in $yearsMonthsCP $yearMonth }}
               <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 January, 2006" .startDate }} - {{ dateFormat "02 January, 2006" .endDate }}</em>
+                            <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 }}
               <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 January, 2006" .startDate }} - {{ dateFormat "02 January, 2006" .endDate }}</em>
+                            <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 }}
             <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 January, 2006" .startDate }} - {{ dateFormat "02 January, 2006" .endDate }}</em>
+                        <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="/events/2020/">2020</a>
         </li>
         <li>
           <a href="/events/2019/">2019</a>
         </li>
         <li>
           <a href="/events/2018/">2018</a>
         </li>
         <li>
           <a href="/events/2017/">2017</a>
         </li>
         <li>
           <a href="/events/2016/">2016</a>
         </li>
         <li>
           <a href="/events/2015/">2015</a>
         </li>
         <li>
           <a href="/events/2014/">2014</a>
         </li>
         <li>
           <a href="/events/2013/">2013</a>
         </li>
         <li>
           <a href="/events/2012/">2012</a>
         </li>
         <li>
           <a href="/events/2011/">2011</a>
         </li>
         <li>
           <a href="/events/2010/">2010</a>
         </li>
         <li>
           <a href="/events/2009/">2009</a>
         </li>
         <li>
           <a href="/events/2008/">2008</a>
         </li>
         <li>
           <a href="/events/2007/">2007</a>
         </li>
         <li>
           <a href="/events/2006/">2006</a>
         </li>
         <li>
           <a href="/events/2005/">2005</a>
         </li>
         <li>
           <a href="/events/2004/">2004</a>
         </li>
         <li>
           <a href="/events/2003/">2003</a>
         </li>
       </ul>
       {{ if .GitInfo }}
       <hr />
       <div class="last-modified">
         <p><strong>{{ i18n "last-modified" }}</strong>: {{ .GitInfo.AuthorDate | time.Format ":date_long" }} {{ i18n "by" }} <a href="https://cgit.freebsd.org/doc/commit/?id={{ .GitInfo.AbbreviatedHash }}" target="_blank">{{ .GitInfo.AuthorName }}</a></p>
       </div>
       {{ end }}
     </div>
   </div>
 {{ end }}
diff --git a/website/themes/beastie/layouts/events/single.html b/website/themes/beastie/layouts/events/single.html
index 542de502f2..0d00620073 100644
--- a/website/themes/beastie/layouts/events/single.html
+++ b/website/themes/beastie/layouts/events/single.html
@@ -1,269 +1,238 @@
 {{ 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.Default.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/Max year -->
         {{ $maxYear := now.Year }}
         {{ $maxYear = add $maxYear 1}}
         {{ $minYear := now.Year }}
         {{ $minYear = sub $minYear 2}}
 
         <h2 id="upcoming">{{ i18n "currentEvents" }}</h2>
         {{ range $year := seq $minYear $maxYear }}
           {{ range $month := seq 1 12 }}
             {{ $yearMonth := (printf "%d-%d" $year $month) }}
             {{ if in $yearsMonthsCP $yearMonth }}
               <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 }}
               <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 }}
             <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="/events/2020/">2020</a>
         </li>
         <li>
           <a href="/events/2019/">2019</a>
         </li>
         <li>
           <a href="/events/2018/">2018</a>
         </li>
         <li>
           <a href="/events/2017/">2017</a>
         </li>
         <li>
           <a href="/events/2016/">2016</a>
         </li>
         <li>
           <a href="/events/2015/">2015</a>
         </li>
         <li>
           <a href="/events/2014/">2014</a>
         </li>
         <li>
           <a href="/events/2013/">2013</a>
         </li>
         <li>
           <a href="/events/2012/">2012</a>
         </li>
         <li>
           <a href="/events/2011/">2011</a>
         </li>
         <li>
           <a href="/events/2010/">2010</a>
         </li>
         <li>
           <a href="/events/2009/">2009</a>
         </li>
         <li>
           <a href="/events/2008/">2008</a>
         </li>
         <li>
           <a href="/events/2007/">2007</a>
         </li>
         <li>
           <a href="/events/2006/">2006</a>
         </li>
         <li>
           <a href="/events/2005/">2005</a>
         </li>
         <li>
           <a href="/events/2004/">2004</a>
         </li>
         <li>
           <a href="/events/2003/">2003</a>
         </li>
       </ul>
       {{ if .GitInfo }}
       <hr />
       <div class="last-modified">
         <p><strong>{{ i18n "last-modified" }}</strong>: {{ .GitInfo.AuthorDate | time.Format ":date_long" }} {{ i18n "by" }} <a href="https://cgit.freebsd.org/doc/commit/?id={{ .GitInfo.AbbreviatedHash }}" target="_blank">{{ .GitInfo.AuthorName }}</a></p>
       </div>
       {{ end }}
     </div>
   </div>
 {{ end }}