diff --git a/content/cfp.de.md b/content/cfp.de.md
index ec2fc8d..af955b9 100644
--- a/content/cfp.de.md
+++ b/content/cfp.de.md
@@ -24,8 +24,8 @@ Die CoSin findet dieses Jahr vom
 {{< cosin "date_day_name_start" >}}, den {{< cosin "date_day_start" >}}. bis
 {{< cosin "date_day_name_end" >}}, den {{< cosin "date_day_end" >}}.
 {{< cosin "date_month" >}} {{< cosin "date_year" >}}
-wieder in der [Villa Ritter](http://www.villa-ritter.ch/)
-in {{< cosin "city" >}} statt.
+wieder in der [{{< cosin "location_name" >}}]({{< cosin "location_url" >}})
+in {{< cosin "location_city" >}} statt.
 
 ## Wie kann ich mich beteiligen?
 
diff --git a/content/cfp.en.md b/content/cfp.en.md
index 2bc3730..8a3a80e 100644
--- a/content/cfp.en.md
+++ b/content/cfp.en.md
@@ -24,7 +24,7 @@ Die CoSin findet dieses Jahr vom
 {{< cosin "date_day_name_start" >}}, den {{< cosin "date_day_start" >}}. bis
 {{< cosin "date_day_name_end" >}}, den {{< cosin "date_day_end" >}}
 {{< cosin "date_month" >}} {{< cosin "date_year" >}}
-wieder in der [Villa Ritter](http://www.villa-ritter.ch/) in {{< cosin "city" >}} statt.
+wieder in der [{{< cosin "location" >}}]({{< cosin "location_url" >}}) in {{< cosin "location_city" >}} statt.
 
 ## Wie kann ich mich beteiligen?
 
diff --git a/content/cfp.fr.md b/content/cfp.fr.md
index 31cafa5..72dc20a 100644
--- a/content/cfp.fr.md
+++ b/content/cfp.fr.md
@@ -23,7 +23,7 @@ Cette année le CoSin aura lieu du
 {{< cosin "date_day_name_start" >}} {{< cosin "date_day_start" >}} au
 {{< cosin "date_day_name_end" >}} {{< cosin "date_day_end" >}}
 {{< cosin "date_month" >}} à
-la [Villa Ritter](http://www.villa-ritter.ch/) à {{< cosin "city" >}}.
+la [{{< cosin "location_name" >}}]({{< cosin "location_url" >}}) à {{< cosin "location_city" >}}.
 
 ## Comment est-ce que je participe ?
 
diff --git a/content/cfp.it.md b/content/cfp.it.md
index 205f7d7..4a6dd9f 100644
--- a/content/cfp.it.md
+++ b/content/cfp.it.md
@@ -23,7 +23,7 @@ Quest'anno la CoSin si svolge da
 {{< cosin "date_day_name_start" >}} {{< cosin "date_day_start" >}}. fino a
 {{< cosin "date_day_name_end" >}} {{< cosin "date_day_end" >}}.
 {{< cosin "date_month" >}} {{< cosin "date_year" >}},
-sempre nella [Villa Ritter](http://www.villa-ritter.ch/) a {{< cosin "city" >}}.
+sempre nella [{{< cosin "location_name" >}}]({{< cosin "location_url" >}}) a {{< cosin "location_city" >}}.
 
 ## Come posso contribuire?
 
diff --git a/content/infos.it.md b/content/infos.it.md
index 27a7b7d..6898478 100644
--- a/content/infos.it.md
+++ b/content/infos.it.md
@@ -13,7 +13,7 @@ Quest'anno la CoSin si svolge da
 {{< cosin "date_day_name_start" >}} {{< cosin "date_day_start" >}}. fino a
 {{< cosin "date_day_name_end" >}} {{< cosin "date_day_end" >}}. {{< cosin "date_month" >}}
 {{< cosin "date_year" >}},
-di nuovo nella [Villa Ritter](http://www.villa-ritter.ch/) a {{< cosin "city" >}}.
+di nuovo nella [{{< cosin "location_name" >}}]({{< cosin "location_url" >}}) a {{< cosin "location_city" >}}.
 
 ## Costi
 
diff --git a/content/ort.de.md b/content/ort.de.md
index 529004e..7c09c6c 100644
--- a/content/ort.de.md
+++ b/content/ort.de.md
@@ -9,7 +9,7 @@ menu:
 
 ## Ort
 
-Das CoSin findet in der [Villa Ritter][1] in {{< cosin "city" >}} statt.
+Das CoSin findet in der [{{< cosin "location_name" >}}][1] in {{< cosin "location_city" >}} statt.
 
 ## Photos
 
@@ -35,6 +35,6 @@ einfach Mätteli und Schlafsack mit.
 
 Eine andere Option ist der [Campingplatz][3], etwa 15 Minuten mit dem Velo.
 
-[1]: http://www.villa-ritter.ch
+[1]: {{< cosin "location_url" >}}
 [2]: https://www.openstreetmap.org/?mlat=47.14426%2C7.24994&mlon=7.24994&zoom=17#map=16/47.14420/7.2516
 [3]: http://www.camping-sutz.ch/en/
diff --git a/content/ort.en.md b/content/ort.en.md
index 99fe0ec..d41c0a1 100644
--- a/content/ort.en.md
+++ b/content/ort.en.md
@@ -9,7 +9,7 @@ menu:
 
 ## Location
 
-This year's CoSin takes place in the [Villa Ritter][1] in {{< cosin "city" >}}.
+This year's CoSin takes place in the [{{< cosin "location_name" >}}][1] in {{< cosin "location_city" >}}.
 
 ## Photos
 
@@ -35,6 +35,6 @@ mat and a sleeping bag.
 
 The [camping area][3] is another option, about 15 minutes by bike.
 
-[1]: http://www.villa-ritter.ch
+[1]: {{< cosin "location_url" >}}
 [2]: https://www.openstreetmap.org/?mlat=47.14426%2C7.24994&mlon=7.24994&zoom=17#map=16/47.14420/7.2516
 [3]: http://www.camping-sutz.ch/en/
diff --git a/content/ort.fr.md b/content/ort.fr.md
index 0b73de7..d119b49 100644
--- a/content/ort.fr.md
+++ b/content/ort.fr.md
@@ -9,7 +9,7 @@ menu:
 
 ## Lieu
 
-Le CoSin se déroule à la [Villa Ritter][1] à {{< cosin "city" >}}.
+Le CoSin se déroule à la [{{< cosin "location_name" >}}][1] à {{< cosin "location_city" >}}.
 
 ## Photos
 
@@ -34,6 +34,6 @@ Il est possible de dormir dans la Villa Ritter. Apporte tout simplement un sac d
 
 Eine andere Option ist der [Campingplatz][3], etwa 15 Minuten mit dem Velo.
 
-[1]: http://www.villa-ritter.ch
+[1]: {{< cosin "location_url" >}}
 [2]: https://www.openstreetmap.org/?mlat=47.14426%2C7.24994&mlon=7.24994&zoom=17#map=16/47.14420/7.2516
 [3]: http://www.camping-sutz.ch/en/
diff --git a/content/ort.it.md b/content/ort.it.md
index 81cf7a7..8493460 100644
--- a/content/ort.it.md
+++ b/content/ort.it.md
@@ -9,7 +9,7 @@ menu:
 
 ## Luogo
 
-La CoSin si svolge nella [Villa Ritter][1] a {{< cosin "city" >}}.
+La CoSin si svolge nella [{{< cosin "location_name" >}}][1] a {{< cosin "location_city" >}}.
 
 ## Foto
 
@@ -35,6 +35,6 @@ e un sacco letto.
 
 Eine andere Option ist der [Campingplatz][3], etwa 15 Minuten mit dem Velo.
 
-[1]: http://www.villa-ritter.ch
+[1]: {{< cosin "location_url" >}}
 [2]: https://www.openstreetmap.org/?mlat=47.14426%2C7.24994&mlon=7.24994&zoom=17#map=16/47.14420/7.2516
 [3]: http://www.camping-sutz.ch/en/
diff --git a/data/cosin.toml b/data/cosin.toml
index d373a71..b225962 100644
--- a/data/cosin.toml
+++ b/data/cosin.toml
@@ -15,9 +15,10 @@ date_day_name_start = "Freitag"
 date_day_name_end = "Sonntag"
 
 
-place_known = true
+location_known = true
 
-location = "Villa Ritter"
+location_name = "Villa Ritter"
+location_url = "http://www.villa-ritter.ch/"
 city = "Biel"
 
 
diff --git a/themes/cosin-theme/layouts/partials/site-sidebar.de.html b/themes/cosin-theme/layouts/partials/site-sidebar.de.html
index 56c12df..5f9a60d 100644
--- a/themes/cosin-theme/layouts/partials/site-sidebar.de.html
+++ b/themes/cosin-theme/layouts/partials/site-sidebar.de.html
@@ -13,8 +13,8 @@
   <strong>Datum:</strong> {{ .date_day_start }}.-{{ .date_day_end }}. {{ i18n .date_month }} {{ .date_year }}<br/>
   {{ end }}
 
-  {{ if .place_known }}
-  <strong>Ort:</strong> {{ .location }} in <strong>{{ i18n .city }}</strong><br/>
+  {{ if .location_known }}
+  <strong>Ort:</strong> {{ .location_name }} in <strong>{{ i18n .location_city }}</strong><br/>
   {{ end }}
 
   {{ if .registration_open }}
diff --git a/themes/cosin-theme/layouts/partials/site-sidebar.en.html b/themes/cosin-theme/layouts/partials/site-sidebar.en.html
index fc94470..2b91031 100644
--- a/themes/cosin-theme/layouts/partials/site-sidebar.en.html
+++ b/themes/cosin-theme/layouts/partials/site-sidebar.en.html
@@ -13,8 +13,8 @@
   <strong>Date:</strong> {{ i18n .date_month }} {{ .date_day_start }}th - {{ .date_day_end }}th {{ .date_year }}<br/>
   {{ end }}
 
-  {{ if .place_known }}
-  <strong>Location:</strong> {{ .location }} in <strong>{{ i18n .city }}</strong><br/>
+  {{ if .location_known }}
+  <strong>Location:</strong> {{ .location_name }} in <strong>{{ i18n .location_city }}</strong><br/>
   {{ end }}
 
   {{ if .registration_open }}
diff --git a/themes/cosin-theme/layouts/partials/site-sidebar.fr.html b/themes/cosin-theme/layouts/partials/site-sidebar.fr.html
index 3e2243e..8c2bcab 100644
--- a/themes/cosin-theme/layouts/partials/site-sidebar.fr.html
+++ b/themes/cosin-theme/layouts/partials/site-sidebar.fr.html
@@ -13,8 +13,8 @@
   <strong>Date:</strong> {{ .date_day_start }}.-{{ .date_day_end }}. {{ i18n .date_month }} {{ .date_year }}<br/>
   {{ end }}
 
-  {{ if .place_known }}
-  <strong>Lieu:</strong> {{ .location }} à <strong>{{ i18n .city }}</strong><br/>
+  {{ if .location_known }}
+  <strong>Lieu:</strong> {{ .location_name }} à <strong>{{ i18n .location_city }}</strong><br/>
   {{ end }}
 
   {{ if .registration_open }}
diff --git a/themes/cosin-theme/layouts/partials/site-sidebar.it.html b/themes/cosin-theme/layouts/partials/site-sidebar.it.html
index ea9a09f..fac12f5 100644
--- a/themes/cosin-theme/layouts/partials/site-sidebar.it.html
+++ b/themes/cosin-theme/layouts/partials/site-sidebar.it.html
@@ -13,8 +13,8 @@
   <strong>Data:</strong> {{ .date_day_start }}.-{{ .date_day_end }}. {{ i18n .date_month }} {{ .date_year }}<br/>
   {{ end }}
 
-  {{ if .place_known }}
-  <strong>Luogo:</strong> {{ .location }} a <strong>{{ i18n .city }}</strong><br/>
+  {{ if .location_known }}
+  <strong>Luogo:</strong> {{ .location_name }} a <strong>{{ i18n .location_city }}</strong><br/>
   {{ end }}
 
   {{ if .registration_open }}