diff --git a/site/data/organisations/organisations.json b/site/data/organisations/organisations.json
index 4177a9b..ba28181 100644
--- a/site/data/organisations/organisations.json
+++ b/site/data/organisations/organisations.json
@@ -2,581 +2,697 @@
   {
     "name": "ADULLACT",
     "img": "adullact.png",
+    "priority": "0",
     "url": "http://adullact.org/"
   },
   {
     "name": "Ajuntament de Barcelona",
     "img": "bcn.png",
+    "priority": "1",
     "url": "http://www.bcn.cat/"
   },
   {
     "name": "apertus° Association",
     "img": "apertus.png",
+    "priority": "0",
     "url": "https://www.apertus.org/"
   },
   {
     "name": "Aptivate",
     "img": "aptivate.png",
+    "priority": "0",
     "url": "www.aptivate.org/"
   },
-   {
+  {
     "name": "ASL.Org - Associação Software Livre ",
     "img": "asl-org.png",
+    "priority": "0",
     "url": "http://asl.org.br"
   },
   {
     "name": "Digitale Allmend",
     "img": "digitaleallmend.png",
+    "priority": "0",
     "url": "https://allmend.ch/"
   },
   {
     "name": "Aquilenet",
     "img": "aquilenet.png",
+    "priority": "0",
     "url": "https://www.aquilenet.fr/"
   },
   {
     "name": "Asociația pentru Tehnologie și Internet",
     "img": "apti.png",
+    "priority": "0",
     "url": "https://www.apti.ro/"
   },
   {
     "name": "Association Francophone des Utilisateurs de Logiciels Libres",
     "img": "aful.png",
+    "priority": "0",
     "url": "https://aful.org/"
   },
   {
     "name": "Associação Ensino Livre",
     "img": "ael.png",
+    "priority": "0",
     "url": "https://ensinolivre.pt"
   },
-   {
+  {
     "name": "Associação Nacional para o Software Livre",
     "img": "ansol.png",
+    "priority": "1",
     "url": "https://ansol.org/"
   },
   {
     "name": "CCC Switzerland",
     "img": "ccc-ch.png",
+    "priority": "0",
     "url": "https://ccc-ch.ch/"
   },
   {
     "name": "CMS Garden",
     "img": "CMSGarden.png",
+    "priority": "0",
     "url": "http://www.cms-garden.org/en"
   },
   {
     "name": "Colectic",
     "img": "colectic.png",
+    "priority": "0",
     "url": "http://colectic.coop/"
   },
   {
     "name": "Commons Institut",
     "img": "CommonsInstitut.png",
+    "priority": "0",
     "url": "https://commons-institut.org/"
   },
   {
     "name": "P2P Foundation",
     "img": "P2PFoundation.png",
+    "priority": "0",
     "url": "https://p2pfoundation.net/"
   },
   {
     "name": "Digitale Gesellschaft",
     "img": "digitalegesellschaft.png",
+    "priority": "1",
     "url": "https://digitalegesellschaft.de/"
   },
   {
     "name": "Do-FOSS",
     "img": "do-foss.png",
+    "priority": "0",
     "url": "http://blog.do-foss.de/"
   },
-   {
+  {
     "name": "Center for the Cultivation of Technology",
     "img": "CCT.png",
+    "priority": "0",
     "url": "https://techcultivation.org/"
   },
   {
     "name": "Courage Foundation",
-  	"img": "couragefound.png",
+    "img": "couragefound.png",
+    "priority": "0",
     "url": "https://couragefound.org/"
   },
   {
     "name": "Chaos Computer Club",
     "img": "CCC.png",
+    "priority": "1",
     "url": "https://www.ccc.de"
   },
   {
     "name": "Creative Commons",
     "img": "creativecommons.png",
+    "priority": "1",
     "url": "https://creativecommons.org/"
   },
   {
     "name": "Debian",
     "img": "debian.png",
+    "priority": "1",
     "url": "https://debian.org"
   },
   {
     "name": "Digitale Gesellschaft Schweiz",
     "img": "dgs.png",
+    "priority": "0",
     "url": "https://www.digitale-gesellschaft.ch/"
   },
-{
+  {
     "name": "DFRI",
     "img": "dfri.png",
+    "priority": "0",
     "url": "https://www.dfri.se/?lang=en"
   },
   {
     "name": "Democracy OS France",
     "img": "democracyosFR.png",
+    "priority": "0",
     "url": "http://democracyos.eu/"
   },
   {
     "name": "Drupal",
     "img": "drupal.png",
+    "priority": "0",
     "url": "https://drupal.org"
   },
   {
     "name": "ExposeFacts",
     "img": "exposefacts.png",
+    "priority": "0",
     "url": "https://exposefacts.org/"
   },
-    {
+  {
     "name": "ELLAK Cyprus",
     "img": "ELLAKCyprus.png",
+    "priority": "0",
     "url": "https://ellak.org.cy/"
   },
   {
     "name": "FAImaison",
     "img": "FAImaison.png",
+    "priority": "0",
     "url": "https://www.faimaison.net/"
   },
   {
     "name": "Linux User Group Of Slovenia",
     "img": "lugos.png",
+    "priority": "0",
     "url": "http://www.lugos.si"
   },
   {
     "name": "digitalcourage",
     "img": "digitalcourage.png",
+    "priority": "1",
     "url": "https://digitalcourage.de/"
   },
   {
     "name": "D3-Defesa dos Direitos Digitais",
     "img": "DefensaDosDireitosDigitais.png",
+    "priority": "0",
     "url": "https://direitosdigitais.pt/"
   },
   {
     "name": "April",
     "img": "april.png",
+    "priority": "1",
     "url": "https://www.april.org/en"
   },
   {
     "name": "Doteveryone",
     "img": "doteveryone.png",
+    "priority": "0",
     "url": "https://doteveryone.org.uk/"
   },
   {
     "name": "Dyne.org Foundation",
     "img": "dyne.png",
+    "priority": "0",
     "url": "https://dyne.org"
   },
   {
     "name": "European Digital Rights",
     "img": "edri.png",
+    "priority": "1",
     "url": "https://edri.org"
   },
   {
     "name": "ePaństwo Foundation",
     "img": "epanstwo.png",
+    "priority": "0",
     "url": "https://epf.org.pl"
   },
   {
     "name": "Epicenter.works",
     "img": "epicenterworks.png",
+    "priority": "0",
     "url": "https://epicenter.works"
   },
   {
     "name": "FACIL",
     "img": "facil.png",
+    "priority": "0",
     "url": "https://facil.qc.ca/"
   },
   {
     "name": "Fedora Project",
     "img": "fedora.png",
+    "priority": "1",
     "url": "https://fedoraproject.org/"
   },
   {
-    "name":"FIfF",
+    "name": "FIfF",
     "img": "FIfF.png",
+    "priority": "0",
     "url": "https://www.fiff.de/"
   },
   {
     "name": "FFKP (Society for Free Culture and Software)",
     "img": "ffkp.png",
+    "priority": "0",
     "url": "http://ffkp.se/"
   },
   {
     "name": "FOSSASIA",
     "img": "fossasia.png",
+    "priority": "0",
     "url": "https://fossasia.org/"
   },
- {
+  {
     "name": "Framasoft",
     "img": "framasoft.png",
+    "priority": "0",
     "url": "https://framasoft.org/"
   },
   {
     "name": "Free Knowledge Institute",
     "img": "freeknowledgeinstitute.png",
+    "priority": "0",
     "url": "http://freeknowledge.eu/"
   },
   {
     "name": "Free Libre Open Source Software Kosova",
     "img": "flossk.png",
+    "priority": "0",
     "url": "http://flossk.org/"
   },
   {
     "name": "Free Software Foundation Europe",
     "img": "fsfe.png",
+    "priority": "1",
     "url": "https://fsfe.org"
   },
   {
     "name": "Freifunk.net",
     "img": "freifunk.png",
+    "priority": "0",
     "url": "https://freifunk.net/"
   },
   {
     "name": "Gentoo",
     "img": "gentoo.png",
+    "priority": "0",
     "url": "https://gentoo.org/"
   },
   {
     "name": "LILA",
     "img": "lila.png",
+    "priority": "0",
     "url": "http://libreart.info/"
   },
   {
     "name": "GFOSS",
     "img": "GFOSS.png",
+    "priority": "1",
     "url": "https://gfoss.eu/"
   },
   {
     "name": "GNOME",
     "img": "GNOME.png",
+    "priority": "1",
     "url": "https://www.gnome.org"
   },
   {
     "name": "GNU Image Manipulation Program (GIMP)",
     "img": "gimp.png",
+    "priority": "0",
     "url": "https://www.gimp.org/"
   },
   {
     "name": "GNU Solidario",
     "img": "gnusolidario.png",
+    "priority": "0",
     "url": "http://www.gnusolidario.org/"
   },
   {
     "name": "GreekLUG",
     "img": "greeklug.png",
+    "priority": "0",
     "url": "https://www.greeklug.gr/el/"
   },
   {
     "name": "Grupo de Amigos de Linux de Pontevedra",
     "img": "galpon.png",
+    "priority": "0",
     "url": "https://www.galpon.org/"
   },
   {
     "name": "gvSIG Association",
     "img": "gvsig.png",
+    "priority": "0",
     "url": "http://www.gvsig.com/"
   },
   {
     "name": "Hacking Lliure",
     "img": "lliure.png",
+    "priority": "0",
     "url": "https://hackinglliure.org/"
   },
   {
     "name": "HackYourPhD",
     "img": "HackYourPhD.png",
+    "priority": "0",
     "url": "https://hackyourphd.org/"
   },
   {
     "name": "Hermes Center for Transparency and Digital Human Rights",
     "img": "hermes.png",
+    "priority": "1",
     "url": "https://www.hermescenter.org/"
   },
   {
     "name": "Associazione Industria Italiana del Software Libero",
     "img": "iisl.png",
+    "priority": "0",
     "url": "http://www.industriasoftwarelibero.it/"
   },
   {
     "name": "Italian Linux Society",
     "img": "ils.png",
+    "priority": "0",
     "url": "https://www.ils.org/"
   },
   {
     "name": "Joomla",
     "img": "joomla.png",
+    "priority": "0",
     "url": "https://www.joomla.org/"
   },
   {
     "name": "Kersnikova",
     "img": "kersnikova.png",
+    "priority": "0",
     "url": "http://kersnikova.org/"
   },
   {
     "name": "KDE e.V.",
     "img": "kde.png",
+    "priority": "1",
     "url": "https://ev.kde.org"
   },
   {
     "name": "La Quadrature du Net",
     "img": "laquadrature.png",
+    "priority": "1",
     "url": "https://www.laquadrature.net"
   },
   {
     "name": "LibreITALIA",
     "img": "libreitalia.png",
+    "priority": "1",
     "url": "http://www.libreitalia.it/"
   },
   {
     "name": "linuxmuster.net e.V",
     "img": "linuxmuster.png",
+    "priority": "0",
     "url": "https://www.linuxmuster.net/"
   },
   {
     "name": "Linuxwochen",
     "img": "linuxwoche.png",
+    "priority": "0",
     "url": "https://www.linuxwochen.at/"
   },
   {
     "name": "Mageia",
     "img": "mageia.png",
+    "priority": "0",
     "url": "https://www.mageia.org/en/"
   },
   {
     "name": "Modern Poland Foundation",
     "img": "nowoczesnapolska.png",
+    "priority": "0",
     "url": "https://nowoczesnapolska.org.pl"
   },
   {
     "name": "Offene Kommunen.NRW",
     "img": "oknrw.png",
+    "priority": "0",
     "url": "http://oknrw.de"
   },
   {
     "name": "Openbit",
     "img": "openbit.png",
+    "priority": "0",
     "url": "https://openbit.eu/"
   },
   {
     "name": "Open Fabrication Network",
     "img": "ofn.png",
+    "priority": "0",
     "url": "https://openfabnet.com/"
   },
   {
     "name": "Open Knowledge Belgium",
     "img": "okbe.png",
+    "priority": "0",
     "url": "https://www.openknowledge.be/"
   },
   {
     "name": "Open Knowledge Foundation Deutschland",
     "img": "okf.png",
+    "priority": "0",
     "url": "https://okfn.de"
   },
   {
     "name": "Open Knowledge International",
     "img": "okint.png",
+    "priority": "1",
     "url": "https://okfn.org/"
   },
   {
     "name": "Open Labs",
     "img": "OpenLabs.png",
+    "priority": "0",
     "url": "https://openlabs.cc/en/"
   },
   {
     "name": "OpenMedia",
     "img": "openmedia.png",
+    "priority": "0",
     "url": "https://openmedia.org/"
   },
-   {
+  {
     "name": "Open Rights Group",
     "img": "openrightsgroup.png",
+    "priority": "0",
     "url": "https://www.openrightsgroup.org/"
   },
   {
     "name": "OpenStreetMap France",
-    "img": "openstreetmap-france.png", 
+    "img": "openstreetmap-france.png",
+    "priority": "0",
     "url": "https://www.openstreetmap.fr/"
   },
   {
     "name": "Open Source Business Alliance",
     "img": "osba.png",
+    "priority": "1",
     "url": "http://osb-alliance.de"
   },
   {
     "name": "Open State Foundation",
     "img": "openstatefoundation.png",
+    "priority": "0",
     "url": "https://openstate.eu"
   },
   {
     "name": "openSUSE",
     "img": "OpenSUSE.png",
+    "priority": "1",
     "url": "https://www.opensuse.org/"
   },
   {
     "name": "Open Source Initiative",
     "img": "OpenSourceInitiative.png",
+    "priority": "0",
     "url": "https://opensource.org/"
   },
   {
     "name": "Otevřená města",
     "img": "otevrenamesta.png",
+    "priority": "0",
     "url": "http://www.otevrenamesta.cz/"
   },
   {
     "name": "OW2 Consortium",
     "img": "ow2.png",
+    "priority": "1",
     "url": "https://www.ow2.org/"
   },
   {
     "name": "p≡p foundation",
     "img": "pep.png",
+    "priority": "1",
     "url": "https://pep.foundation"
   },
   {
     "name": "Plone Foundation",
     "img": "plone.png",
+    "priority": "0",
     "url": "https://plone.org/"
   },
   {
     "name": "Public Software CIC",
     "img": "public-software-cic.png",
+    "priority": "0",
     "url": "https://publicsoftware.eu/"
   },
   {
     "name": "quintessenz - Verein zur Wiederherstellung der Bürgerrechte im Informationszeitalter",
     "img": "quintessenz.png",
-    "url": "http://quintessenz.at" 
+    "priority": "0",
+    "url": "http://quintessenz.at"
   },
   {
     "name": "Rampa",
     "img": "rampa.png",
+    "priority": "0",
     "url": "http://www.rampalab.org/"
   },
   {
     "name": "Samtgemeinde Elbmarsch",
     "img": "samtgemeinde.png",
+    "priority": "1",
     "url": "http://www.samtgemeinde-elbmarsch.de/"
   },
   {
     "name": "Saregune",
     "img": "saregune.png",
-    "url": "http://www.saregune.net/es/" 
+    "priority": "0",
+    "url": "http://www.saregune.net/es/"
   },
   {
     "name": "Sentilo",
     "img": "sentilo.png",
-    "url": "http://www.sentilo.io/" 
+    "priority": "0",
+    "url": "http://www.sentilo.io/"
   },
   {
     "name": "Slovensko.Digital",
     "img": "slovenskodigital.png",
-    "url": "https://slovensko.digital/" 
+    "priority": "0",
+    "url": "https://slovensko.digital/"
   },
-   {
+  {
     "name": "Softcatalà",
     "img": "softcatala.png",
+    "priority": "0",
     "url": "https://www.softcatala.org/"
   },
-   {
+  {
     "name": "Software Heritage",
     "img": "softwareheritage.png",
+    "priority": "1",
     "url": "https://www.softwareheritage.org/"
   },
-   {
+  {
     "name": "Software Liberty Association Taiwan",
     "img": "slat.png",
+    "priority": "1",
     "url": "https://slat.org/"
   },
-   {
+  {
     "name": "Spoločnosť pre otvorené informačné technológie",
     "img": "soit.png",
+    "priority": "0",
     "url": "http://www.soit.sk/"
   },
   {
     "name": "SwissLinux",
     "img": "swisslinux.png",
+    "priority": "0",
     "url": "https://swisslinux.org/"
   },
-   {
+  {
     "name": "Technologiestiftung Berlin",
     "img": "tsb.png",
+    "priority": "0",
     "url": "https://www.technologiestiftung-berlin.de"
   },
   {
     "name": "The Document Foundation",
     "img": "tdf.png",
+    "priority": "1",
     "url": "https://www.documentfoundation.org"
   },
-   {
+  {
     "name": "The Tor Project",
     "img": "torproject.png",
+    "priority": "1",
     "url": "https://www.torproject.org/"
   },
   {
     "name": "TYPO3 Association",
     "img": "typo3.png",
+    "priority": "0",
     "url": "https://typo3.org/association/"
   },
   {
     "name": "VideoLAN",
     "img": "videolan.png",
+    "priority": "1",
     "url": "https://www.videolan.org"
   },
   {
     "name": "Waag Society",
     "img": "waag.png",
+    "priority": "0",
     "url": "https://waag.org"
   },
   {
     "name": "Wikimedia Deutschland",
     "img": "wikimedia-de.png",
+    "priority": "1",
     "url": "https://wikimedia.de"
   },
-{
+  {
     "name": "Wikimedia France",
     "img": "wikimediafrance.png",
+    "priority": "1",
     "url": "https://wikimedia.fr"
   },
   {
     "name": "Wikimedia Italia",
     "img": "wmit.png",
+    "priority": "1",
     "url": "https://wiki.wikimedia.it/wiki/Main_page"
   },
   {
     "name": "Wilhelm Tux - Kampagne für Freie Software",
     "img": "wilhelmtux.png",
+    "priority": "0",
     "url": "https://wilhelmtux.ch/"
   },
   {
     "name": "World Privacy and Identity Association",
     "img": "wpia.png",
+    "priority": "0",
     "url": "https://wpia.club/"
   },
   {
     "name": "Xnet",
     "img": "xnet.png",
+    "priority": "0",
     "url": "https://xnet-x.net/"
   },
   {
     "name": "FOSSGIS e.V.",
     "img": "fossgis.png",
+    "priority": "0",
     "url": "https://www.fossgis.de/"
   },
   {
     "name": "Software in the Public Interest",
     "img": "spi-inc.png",
+    "priority": "0",
     "url": "http://spi-inc.org/"
   }
 ]
diff --git a/site/layouts/partials/organisations.html b/site/layouts/partials/organisations.html
index 1866d49..74bad8c 100644
--- a/site/layouts/partials/organisations.html
+++ b/site/layouts/partials/organisations.html
@@ -11,21 +11,15 @@
         </div>
         <div class="orgs">
           <ul>
+            <!-- Get all organizations and split them in two sets according
+                 to their priorities -->
             {{ $orgs := getJSON "data/organisations/organisations.json" }}
-            {{ $lower := sort $orgs "name" }}
-            {{ $.Scratch.Set "lower_names" (slice) }}
-            {{ range $lower }}
-              {{ $.Scratch.Add "lower_names" (lower .name) }}
+            {{ range $int := shuffle (where $orgs "priority" "1") }}
+              <li><a href="{{ .url }}" class="hiddenlink" title="{{ .name }}" style="background-image: url(/img/organisations/{{ .img }})" target="_blank"></a></li>
             {{ end }}
-            
-            {{ range shuffle ($.Scratch.Get "lower_names") }}
 
-              {{ $lower_int := . }}
-              {{ range $int := $orgs }}
-                {{ if eq $lower_int (lower $int.name) }}
-                  <li><a href="{{ .url }}" class="hiddenlink" title="{{ .name }}" style="background-image: url(/img/organisations/{{ .img }})" target="_blank"></a></li>
-                {{ end }}
-              {{ end }}
+            {{ range $int := shuffle (where $orgs "priority" "0") }}
+              <li><a href="{{ .url }}" class="hiddenlink" title="{{ .name }}" style="background-image: url(/img/organisations/{{ .img }})" target="_blank"></a></li>
             {{ end }}
           </ul>
         </div>