diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr/strings.xml
similarity index 100%
rename from app/src/main/res/values-fr-rFR/strings.xml
rename to app/src/main/res/values-fr/strings.xml
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index f357be8..0955f66 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -34,8 +34,8 @@
     <string name="menu_knmi_daily_snow">Sneeuwdek vandaag</string>
     <string name="menu_knmi_daily_sun">Zonneschijn gisteren</string>
     <string name="menu_knmi_europe_synoptic_now">Weerkaart nu</string>
-    <string name="menu_knmi_europe_synoptic_next_12h">Weerkaart volgende 12h</string>
-    <string name="menu_knmi_europe_synoptic_next_24h">Weerkaart volgende 24h</string>
+    <string name="menu_knmi_europe_synoptic_next_12h">Weerkaart volgende 12u</string>
+    <string name="menu_knmi_europe_synoptic_next_24h">Weerkaart volgende 24u</string>
     <string name="menu_knmi_satellite">Satelliet</string>
     <string name="menu_knmi_chill_temperature">Gevoelstemperatuur</string>
     <string name="menu_knmi_rain_m1_no_temp">Regen afgelopen uur</string>
@@ -107,7 +107,7 @@
 
     <string name="share_subject">NLWeer kaart</string>
     <string name="share_choose">Deel deze kaart via</string>
-    <string name="share_disabled_alert_title">Niet geimplementeerd</string>
+    <string name="share_disabled_alert_title">Niet geïmplementeerd</string>
     <string name="share_disabled_alert_message">Deze pagina kan niet gedeeld worden, alleen kaarten worden ondersteund</string>
 
     <string name="about_text_header_1">Over NLWeer</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 45cf72b..fc18edd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
 <resources>
     <string name="app_name">NLWeer</string>
     <string name="nav_header_title">NLWeer</string>
-    <string name="nav_header_subtitle">Free, open-source, and privacy-friendly Dutch weather app</string>
+    <string name="nav_header_subtitle">Free, open source, and privacy-friendly Dutch weather app</string>
     <string name="nav_header_desc">Navigation header icon</string>
 
     <string name="action_refresh">Refresh</string>
diff --git a/metadata/en-US/images/phoneScreenshots/rain_radar.png b/metadata/en-US/images/phoneScreenshots/rain_radar.png
old mode 100755
new mode 100644
diff --git a/metadata/fr-FR/changelogs/1.txt b/metadata/fr/changelogs/1.txt
similarity index 100%
rename from metadata/fr-FR/changelogs/1.txt
rename to metadata/fr/changelogs/1.txt
diff --git a/metadata/fr-FR/changelogs/10.txt b/metadata/fr/changelogs/10.txt
similarity index 100%
rename from metadata/fr-FR/changelogs/10.txt
rename to metadata/fr/changelogs/10.txt
diff --git a/metadata/fr-FR/changelogs/11.txt b/metadata/fr/changelogs/11.txt
similarity index 100%
rename from metadata/fr-FR/changelogs/11.txt
rename to metadata/fr/changelogs/11.txt
diff --git a/metadata/fr-FR/changelogs/2.txt b/metadata/fr/changelogs/2.txt
similarity index 100%
rename from metadata/fr-FR/changelogs/2.txt
rename to metadata/fr/changelogs/2.txt
diff --git a/metadata/fr-FR/changelogs/3.txt b/metadata/fr/changelogs/3.txt
similarity index 100%
rename from metadata/fr-FR/changelogs/3.txt
rename to metadata/fr/changelogs/3.txt
diff --git a/metadata/fr-FR/changelogs/4.txt b/metadata/fr/changelogs/4.txt
similarity index 100%
rename from metadata/fr-FR/changelogs/4.txt
rename to metadata/fr/changelogs/4.txt
diff --git a/metadata/fr-FR/changelogs/5.txt b/metadata/fr/changelogs/5.txt
similarity index 100%
rename from metadata/fr-FR/changelogs/5.txt
rename to metadata/fr/changelogs/5.txt
diff --git a/metadata/fr-FR/changelogs/6.txt b/metadata/fr/changelogs/6.txt
similarity index 100%
rename from metadata/fr-FR/changelogs/6.txt
rename to metadata/fr/changelogs/6.txt
diff --git a/metadata/fr-FR/changelogs/7.txt b/metadata/fr/changelogs/7.txt
similarity index 100%
rename from metadata/fr-FR/changelogs/7.txt
rename to metadata/fr/changelogs/7.txt
diff --git a/metadata/fr-FR/changelogs/8.txt b/metadata/fr/changelogs/8.txt
similarity index 100%
rename from metadata/fr-FR/changelogs/8.txt
rename to metadata/fr/changelogs/8.txt
diff --git a/metadata/fr-FR/changelogs/9.txt b/metadata/fr/changelogs/9.txt
similarity index 100%
rename from metadata/fr-FR/changelogs/9.txt
rename to metadata/fr/changelogs/9.txt
diff --git a/metadata/fr-FR/full_description.txt b/metadata/fr/full_description.txt
similarity index 100%
rename from metadata/fr-FR/full_description.txt
rename to metadata/fr/full_description.txt
diff --git a/metadata/fr-FR/images/featureGraphic.png b/metadata/fr/images/featureGraphic.png
similarity index 100%
rename from metadata/fr-FR/images/featureGraphic.png
rename to metadata/fr/images/featureGraphic.png
diff --git a/metadata/fr-FR/images/phoneScreenshots/forecast.png b/metadata/fr/images/phoneScreenshots/forecast.png
similarity index 100%
rename from metadata/fr-FR/images/phoneScreenshots/forecast.png
rename to metadata/fr/images/phoneScreenshots/forecast.png
diff --git a/metadata/fr-FR/images/phoneScreenshots/navigation_menu.png b/metadata/fr/images/phoneScreenshots/navigation_menu.png
similarity index 100%
rename from metadata/fr-FR/images/phoneScreenshots/navigation_menu.png
rename to metadata/fr/images/phoneScreenshots/navigation_menu.png
diff --git a/metadata/fr-FR/images/phoneScreenshots/navigation_menu_bottom.png b/metadata/fr/images/phoneScreenshots/navigation_menu_bottom.png
similarity index 100%
rename from metadata/fr-FR/images/phoneScreenshots/navigation_menu_bottom.png
rename to metadata/fr/images/phoneScreenshots/navigation_menu_bottom.png
diff --git a/metadata/fr-FR/images/phoneScreenshots/rain_radar.png b/metadata/fr/images/phoneScreenshots/rain_radar.png
similarity index 100%
rename from metadata/fr-FR/images/phoneScreenshots/rain_radar.png
rename to metadata/fr/images/phoneScreenshots/rain_radar.png
diff --git a/metadata/fr-FR/images/phoneScreenshots/settings.png b/metadata/fr/images/phoneScreenshots/settings.png
similarity index 100%
rename from metadata/fr-FR/images/phoneScreenshots/settings.png
rename to metadata/fr/images/phoneScreenshots/settings.png
diff --git a/metadata/fr-FR/images/phoneScreenshots/weater_report.png b/metadata/fr/images/phoneScreenshots/weater_report.png
similarity index 100%
rename from metadata/fr-FR/images/phoneScreenshots/weater_report.png
rename to metadata/fr/images/phoneScreenshots/weater_report.png
diff --git a/metadata/fr-FR/short_description.txt b/metadata/fr/short_description.txt
similarity index 100%
rename from metadata/fr-FR/short_description.txt
rename to metadata/fr/short_description.txt
diff --git a/metadata/fr-FR/title.txt b/metadata/fr/title.txt
similarity index 100%
rename from metadata/fr-FR/title.txt
rename to metadata/fr/title.txt
diff --git a/metadata/nl-NL/changelogs/1.txt b/metadata/nl/changelogs/1.txt
similarity index 100%
rename from metadata/nl-NL/changelogs/1.txt
rename to metadata/nl/changelogs/1.txt
diff --git a/metadata/nl-NL/changelogs/10.txt b/metadata/nl/changelogs/10.txt
similarity index 100%
rename from metadata/nl-NL/changelogs/10.txt
rename to metadata/nl/changelogs/10.txt
diff --git a/metadata/nl-NL/changelogs/11.txt b/metadata/nl/changelogs/11.txt
similarity index 100%
rename from metadata/nl-NL/changelogs/11.txt
rename to metadata/nl/changelogs/11.txt
diff --git a/metadata/nl-NL/changelogs/2.txt b/metadata/nl/changelogs/2.txt
similarity index 100%
rename from metadata/nl-NL/changelogs/2.txt
rename to metadata/nl/changelogs/2.txt
diff --git a/metadata/nl-NL/changelogs/3.txt b/metadata/nl/changelogs/3.txt
similarity index 100%
rename from metadata/nl-NL/changelogs/3.txt
rename to metadata/nl/changelogs/3.txt
diff --git a/metadata/nl-NL/changelogs/4.txt b/metadata/nl/changelogs/4.txt
similarity index 100%
rename from metadata/nl-NL/changelogs/4.txt
rename to metadata/nl/changelogs/4.txt
diff --git a/metadata/nl-NL/changelogs/5.txt b/metadata/nl/changelogs/5.txt
similarity index 100%
rename from metadata/nl-NL/changelogs/5.txt
rename to metadata/nl/changelogs/5.txt
diff --git a/metadata/nl-NL/changelogs/6.txt b/metadata/nl/changelogs/6.txt
similarity index 100%
rename from metadata/nl-NL/changelogs/6.txt
rename to metadata/nl/changelogs/6.txt
diff --git a/metadata/nl-NL/changelogs/7.txt b/metadata/nl/changelogs/7.txt
similarity index 100%
rename from metadata/nl-NL/changelogs/7.txt
rename to metadata/nl/changelogs/7.txt
diff --git a/metadata/nl-NL/changelogs/8.txt b/metadata/nl/changelogs/8.txt
similarity index 100%
rename from metadata/nl-NL/changelogs/8.txt
rename to metadata/nl/changelogs/8.txt
diff --git a/metadata/nl-NL/changelogs/9.txt b/metadata/nl/changelogs/9.txt
similarity index 100%
rename from metadata/nl-NL/changelogs/9.txt
rename to metadata/nl/changelogs/9.txt
diff --git a/metadata/nl-NL/full_description.txt b/metadata/nl/full_description.txt
similarity index 90%
rename from metadata/nl-NL/full_description.txt
rename to metadata/nl/full_description.txt
index 35ec274..6f5af6a 100644
--- a/metadata/nl-NL/full_description.txt
+++ b/metadata/nl/full_description.txt
@@ -12,5 +12,5 @@ Eigenschappen van NLWeer:
 
 * Laat weerkaarten en een geschreven weerbericht zien
 * Laat weerinformatie zien vanuit verschillende bronnen
-* Drie opties voor locatiebepaling: handmatige coordinaten, via het telefoonnetwerk, of via GPS
+* Drie opties voor locatiebepaling: handmatige coördinaten, via het telefoonnetwerk, of via GPS
 * Laat een voorspellingsgrafiek van regen zien op jouw locatie
diff --git a/metadata/nl-NL/images/featureGraphic.png b/metadata/nl/images/featureGraphic.png
similarity index 100%
rename from metadata/nl-NL/images/featureGraphic.png
rename to metadata/nl/images/featureGraphic.png
diff --git a/metadata/nl-NL/images/phoneScreenshots/instellingen.png b/metadata/nl/images/phoneScreenshots/instellingen.png
similarity index 100%
rename from metadata/nl-NL/images/phoneScreenshots/instellingen.png
rename to metadata/nl/images/phoneScreenshots/instellingen.png
diff --git a/metadata/nl-NL/images/phoneScreenshots/navigatie_menu.png b/metadata/nl/images/phoneScreenshots/navigatie_menu.png
similarity index 100%
rename from metadata/nl-NL/images/phoneScreenshots/navigatie_menu.png
rename to metadata/nl/images/phoneScreenshots/navigatie_menu.png
diff --git a/metadata/nl-NL/images/phoneScreenshots/navigatie_menu_onder.png b/metadata/nl/images/phoneScreenshots/navigatie_menu_onder.png
similarity index 100%
rename from metadata/nl-NL/images/phoneScreenshots/navigatie_menu_onder.png
rename to metadata/nl/images/phoneScreenshots/navigatie_menu_onder.png
diff --git a/metadata/nl-NL/images/phoneScreenshots/regen_radar.png b/metadata/nl/images/phoneScreenshots/regen_radar.png
similarity index 100%
rename from metadata/nl-NL/images/phoneScreenshots/regen_radar.png
rename to metadata/nl/images/phoneScreenshots/regen_radar.png
diff --git a/metadata/nl-NL/images/phoneScreenshots/regen_verwachting.png b/metadata/nl/images/phoneScreenshots/regen_verwachting.png
similarity index 100%
rename from metadata/nl-NL/images/phoneScreenshots/regen_verwachting.png
rename to metadata/nl/images/phoneScreenshots/regen_verwachting.png
diff --git a/metadata/nl-NL/images/phoneScreenshots/voorspelling.png b/metadata/nl/images/phoneScreenshots/voorspelling.png
similarity index 100%
rename from metadata/nl-NL/images/phoneScreenshots/voorspelling.png
rename to metadata/nl/images/phoneScreenshots/voorspelling.png
diff --git a/metadata/nl-NL/images/phoneScreenshots/weerbericht.png b/metadata/nl/images/phoneScreenshots/weerbericht.png
similarity index 100%
rename from metadata/nl-NL/images/phoneScreenshots/weerbericht.png
rename to metadata/nl/images/phoneScreenshots/weerbericht.png
diff --git a/metadata/nl-NL/short_description.txt b/metadata/nl/short_description.txt
similarity index 100%
rename from metadata/nl-NL/short_description.txt
rename to metadata/nl/short_description.txt
diff --git a/metadata/nl-NL/title.txt b/metadata/nl/title.txt
similarity index 100%
rename from metadata/nl-NL/title.txt
rename to metadata/nl/title.txt