diff --git a/_includes/credits.html b/_includes/credits.html
index 4ea55c1ab1..5264195f48 100644
--- a/_includes/credits.html
+++ b/_includes/credits.html
@@ -1,5 +1,5 @@
-{% if site.data.locales.credits[page.lang] %}
-  <p>{{ site.data.locales.credits[page.lang] }}</p>
+{% if site.data.locales[page.lang].credits %}
+  <p>{{ site.data.locales[page.lang].credits }}</p>
 {% else %}
-  <p>{{ site.data.locales.credits['en'] }}</p>
+  <p>{{ site.data.locales['en'].credits }}</p>
 {% endif %}
diff --git a/_includes/languages.html b/_includes/languages.html
index 6787bd98fd..51c0fcf00e 100644
--- a/_includes/languages.html
+++ b/_includes/languages.html
@@ -1,8 +1,8 @@
 <p>
-{% if site.data.locales.languages_heading[page.lang] %}
-  {{ site.data.locales.languages_heading[page.lang] }}
+{% if site.data.locales[page.lang].languages_heading %}
+  {{ site.data.locales[page.lang].languages_heading }}
 {% else %}
-  {{ site.data.locales.languages_heading['en'] }}
+  {{ site.data.locales['en'].languages_heading }}
 {% endif %}
 <a href="/bg/">Български</a>,
 <a href="/de/">Deutsch</a>,
diff --git a/_includes/rss_discovery.html b/_includes/rss_discovery.html
index 9616b41cad..31f2093352 100644
--- a/_includes/rss_discovery.html
+++ b/_includes/rss_discovery.html
@@ -1,6 +1,6 @@
-{% if site.data.locales.sidebar[page.lang] %}
-  {% assign syndicate = site.data.locales.sidebar[page.lang].syndicate %}
+{% if site.data.locales[page.lang].sidebar %}
+  {% assign syndicate = site.data.locales[page.lang].sidebar.syndicate %}
 {% else %}
-  {% assign syndicate = site.data.locales.sidebar['en'].syndicate %}
+  {% assign syndicate = site.data.locales['en'].sidebar.syndicate %}
 {% endif %}
     <link href="{{ syndicate.recent_news.url }}" rel="alternate" title="{{ syndicate.recent_news.text }}" type="application/rss+xml">
diff --git a/_includes/search.html b/_includes/search.html
index e938ca4a53..41158dd8e0 100644
--- a/_includes/search.html
+++ b/_includes/search.html
@@ -1,8 +1,8 @@
-{% if site.data.locales.search[page.lang] %}
-  {% assign cx_id = site.data.locales.search[page.lang].cx_id %}
-  {% assign text = site.data.locales.search[page.lang].text %}
+{% if site.data.locales[page.lang].search %}
+  {% assign cx_id = site.data.locales[page.lang].search.cx_id %}
+  {% assign text = site.data.locales[page.lang].search.text %}
 {% else %}
-  {% assign text = site.data.locales.search['en'].text %}
+  {% assign text = site.data.locales['en'].search.text %}
 {% endif%}
 <form id="search-form" action="https://www.google.com/cse">
   <table class="fieldset">
diff --git a/_includes/sidebar.html b/_includes/sidebar.html
index a95d35ff19..9961c63435 100644
--- a/_includes/sidebar.html
+++ b/_includes/sidebar.html
@@ -1,7 +1,7 @@
-{% if site.data.locales.sidebar[page.lang] %}
-  {% assign sidebar = site.data.locales.sidebar[page.lang] %}
+{% if site.data.locales[page.lang].sidebar %}
+  {% assign sidebar = site.data.locales[page.lang].sidebar %}
 {% else %}
-  {% assign sidebar = site.data.locales.sidebar['en'] %}
+  {% assign sidebar = site.data.locales['en'].sidebar %}
 {% endif %}
 
 {% if page.sidebar != null %}
diff --git a/_includes/sitelinks.html b/_includes/sitelinks.html
index 44eb044c98..49c0b7f89f 100644
--- a/_includes/sitelinks.html
+++ b/_includes/sitelinks.html
@@ -1,7 +1,7 @@
-{% if site.data.locales.sitelinks[page.lang] %}
-  {% assign sitelinks = site.data.locales.sitelinks[page.lang] %}
+{% if site.data.locales[page.lang].sitelinks %}
+  {% assign sitelinks = site.data.locales[page.lang].sitelinks %}
 {% else %}
-  {% assign sitelinks = site.data.locales.sitelinks['en'] %}
+  {% assign sitelinks = site.data.locales['en'].sitelinks %}
 {% endif %}
 {% for link in sitelinks %}
   <a href="{{ link.url }}/">{{ link.text }}</a>
diff --git a/_includes/subscription-form.html b/_includes/subscription-form.html
index 73c035b890..306f4ad5bd 100644
--- a/_includes/subscription-form.html
+++ b/_includes/subscription-form.html
@@ -1,4 +1,4 @@
-{% assign locales = site.data.locales.subscription_form[page.lang] %}
+{% assign locales = site.data.locales[page.lang].subscription_form %}
 
 <form action="https://ruby-lang-mls.herokuapp.com/submit" id="subscriptions-form" method="post" markdown="1">
 
diff --git a/_includes/syndicate.html b/_includes/syndicate.html
index 66d53d14c9..8821abbbfe 100644
--- a/_includes/syndicate.html
+++ b/_includes/syndicate.html
@@ -1,7 +1,7 @@
-{% if site.data.locales.sidebar[page.lang] %}
-  {% assign syndicate = site.data.locales.sidebar[page.lang].syndicate %}
+{% if site.data.locales[page.lang].sidebar %}
+  {% assign syndicate = site.data.locales[page.lang].sidebar.syndicate %}
 {% else %}
-  {% assign syndicate = site.data.locales.sidebar['en'].syndicate %}
+  {% assign syndicate = site.data.locales['en'].sidebar.syndicate %}
 {% endif %}
 
     <h3>{{ syndicate.text }}</h3>
diff --git a/_layouts/default.html b/_layouts/default.html
index 8edd56ffad..93d4dbffa6 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -38,8 +38,8 @@
     <div id="header">
       <div id="header_content" class="container">
         <a href="/{{ page.lang }}/">
-          <h1>{{ site.data.locales.ruby[page.lang] }}</h1>
-          <h2>{{ site.data.locales.slogan[page.lang] }}</h2>
+          <h1>{{ site.data.locales[page.lang].ruby }}</h1>
+          <h2>{{ site.data.locales[page.lang].slogan }}</h2>
         </a>
 
         <div class="site-links">
diff --git a/_layouts/homepage.html b/_layouts/homepage.html
index e3b084341e..11c401daee 100644
--- a/_layouts/homepage.html
+++ b/_layouts/homepage.html
@@ -11,10 +11,10 @@
 {% assign number_of_excerpts = 4 %}
 {% assign number_of_other    = 6 %}
 
-{% if site.data.locales.news[page.lang] %}
-  {% assign news = site.data.locales.news[page.lang] %}
+{% if site.data.locales[page.lang].news %}
+  {% assign news = site.data.locales[page.lang].news %}
 {% else %}
-  {% assign news = site.data.locales.news['en'] %}
+  {% assign news = site.data.locales['en'].news %}
 {% endif %}
 
 {% for post in site.categories[page.lang] limit:number_of_excerpts %}
diff --git a/_layouts/news.html b/_layouts/news.html
index 1d438451aa..8c74344102 100644
--- a/_layouts/news.html
+++ b/_layouts/news.html
@@ -2,10 +2,10 @@
 layout: default
 ---
 
-{% if site.data.locales.news[page.lang] %}
-  {% assign locales = site.data.locales.news[page.lang] %}
+{% if site.data.locales[page.lang].news %}
+  {% assign locales = site.data.locales[page.lang].news %}
 {% else %}
-  {% assign locales = site.data.locales.news['en'] %}
+  {% assign locales = site.data.locales['en'].news %}
 {% endif %}
 
 <div id="content-wrapper">
diff --git a/_layouts/news_archive_month.html b/_layouts/news_archive_month.html
index 5d2a6fcb08..d41768b1fc 100644
--- a/_layouts/news_archive_month.html
+++ b/_layouts/news_archive_month.html
@@ -2,10 +2,10 @@
 layout: default
 ---
 
-{% if site.data.locales.news[page.lang] %}
-  {% assign locales = site.data.locales.news[page.lang] %}
+{% if site.data.locales[page.lang].news %}
+  {% assign locales = site.data.locales[page.lang].news %}
 {% else %}
-  {% assign locales = site.data.locales.news['en'] %}
+  {% assign locales = site.data.locales['en'].news %}
 {% endif %}
 
 <div id="content-wrapper">
diff --git a/_layouts/news_archive_year.html b/_layouts/news_archive_year.html
index 2fc142da20..496224c68e 100644
--- a/_layouts/news_archive_year.html
+++ b/_layouts/news_archive_year.html
@@ -2,10 +2,10 @@
 layout: default
 ---
 
-{% if site.data.locales.news[page.lang] %}
-  {% assign locales = site.data.locales.news[page.lang] %}
+{% if site.data.locales[page.lang].news %}
+  {% assign locales = site.data.locales[page.lang].news %}
 {% else %}
-  {% assign locales = site.data.locales.news['en'] %}
+  {% assign locales = site.data.locales['en'].news %}
 {% endif %}
 
 <div id="content-wrapper">
diff --git a/_layouts/news_feed.rss b/_layouts/news_feed.rss
index 455baf3322..c08973840a 100644
--- a/_layouts/news_feed.rss
+++ b/_layouts/news_feed.rss
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-{% assign locales = site.data.locales.feed[page.lang] %}
-{% if site.data.locales.translated_by[page.lang] %}
-{% assign translated_by = site.data.locales.translated_by[page.lang] %}
+{% assign locales = site.data.locales[page.lang].feed %}
+{% if site.data.locales[page.lang].translated_by %}
+{% assign translated_by = site.data.locales[page.lang].translated_by %}
 {% else %}
-{% assign translated_by = site.data.locales.translated_by['en'] %}
+{% assign translated_by = site.data.locales['en'].translated_by %}
 {% endif %}
 <rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/">
   <channel>
diff --git a/_layouts/news_post.html b/_layouts/news_post.html
index 114904a877..e20463591e 100644
--- a/_layouts/news_post.html
+++ b/_layouts/news_post.html
@@ -2,10 +2,10 @@
 layout: default
 ---
 
-{% if site.data.locales.translated_by[page.lang] %}
-  {% assign translated_by = site.data.locales.translated_by[page.lang] %}
+{% if site.data.locales[page.lang].translated_by %}
+  {% assign translated_by = site.data.locales[page.lang].translated_by %}
 {% else %}
-  {% assign translated_by = site.data.locales.translated_by['en'] %}
+  {% assign translated_by = site.data.locales['en'].translated_by %}
 {% endif %}
 
 <div id="content-wrapper">
@@ -23,10 +23,10 @@
 <div id="sidebar-wrapper">
   <div id="sidebar">
     <div class="navigation">
-      {% if site.data.locales.news[page.lang] %}
-        {% assign news = site.data.locales.news[page.lang] %}
+      {% if site.data.locales[page.lang].news %}
+        {% assign news = site.data.locales[page.lang].news %}
       {% else %}
-        {% assign news = site.data.locales.news['en'] %}
+        {% assign news = site.data.locales['en'].news %}
       {% endif %}
 
       <h3><strong>{{ news.recent_news }}</strong></h3>
@@ -38,10 +38,10 @@ <h3><strong>{{ news.recent_news }}</strong></h3>
       </ul>
     </div>
 
-    {% if site.data.locales.sidebar[page.lang] %}
-      {% assign sidebar = site.data.locales.sidebar[page.lang] %}
+    {% if site.data.locales[page.lang].sidebar %}
+      {% assign sidebar = site.data.locales[page.lang].sidebar %}
     {% else %}
-      {% assign sidebar = site.data.locales.sidebar['en'] %}
+      {% assign sidebar = site.data.locales['en'].sidebar %}
     {% endif %}
 
     <h3>{{ sidebar.syndicate.text }}</h3>
diff --git a/_plugins/news.rb b/_plugins/news.rb
index 5b87fa30cf..1c10cfd8a3 100644
--- a/_plugins/news.rb
+++ b/_plugins/news.rb
@@ -12,11 +12,11 @@ def initialize(site,base,layout,lang,posts)
         @dir     = File.join(@lang,news_dir)
         @name    = 'index.html'
 
-        @locales = @site.data['locales']['news'][@lang] ||
-                   @site.data['locales']['news']['en']
+        @locales = @site.data['locales'][@lang]['news'] ||
+                   @site.data['locales']['en']['news']
 
-        @month_names = @site.data['locales']['month_names'][@lang] ||
-                       @site.data['locales']['month_names']['en']
+        @month_names = @site.data['locales'][@lang]['month_names'] ||
+                       @site.data['locales']['en']['month_names']
         @month_names = ['None'] + @month_names
 
         process(@name)
diff --git a/_plugins/posted_by.rb b/_plugins/posted_by.rb
index 7d53271015..99fd754546 100644
--- a/_plugins/posted_by.rb
+++ b/_plugins/posted_by.rb
@@ -2,7 +2,7 @@ module Jekyll
 
   # Generates a localized "Posted by ... on ..." text from a date,
   # using the page +lang+ variable and a +strftime+ format string
-  # read from the site data (+locales+: +posted_by+: +lang+).
+  # read from the site data (+locales+: +lang+: +posted_by+).
   # Example format string: <tt>"Posted by AUTHOR on %-d %b %Y"</tt>
   # (literal +AUTHOR+ is replaced by the specified author).
   #
@@ -17,9 +17,8 @@ def posted_by(date, author = nil)
       date = date.is_a?(String) ? Time.parse(date) : date
 
       lang = @context.environments.first['page']['lang'] || 'en'
-
-      locales = @context.registers[:site].data['locales']['posted_by']
-      posted_by = locales[lang] || locales['en']
+      posted_by = @context.registers[:site].data['locales'][lang]['posted_by'] ||
+                  @context.registers[:site].data['locales']['en']['posted_by']
 
       if author.nil? || author.empty? || author == 'Unknown Author'
         posted_by = "%Y-%m-%d"