diff --git a/layouts/index.json b/layouts/index.json
index a0141367..ebe17381 100644
--- a/layouts/index.json
+++ b/layouts/index.json
@@ -19,11 +19,11 @@
       "image": "{{ $image.RelPermalink }}",
       {{ end }}
       {{ if .Params.categories }}
-      "categories": ["{{ delimit .Params.categories "," }}"],
+      "tags": ["{{ delimit .Params.categories "," }}"],
       {{ end }}
       "content_html": {{ .Content | jsonify }},
       "url": "{{ .Permalink }}",
-      "date_published": "{{ .Date }}"
+      "date_published": "{{ .Date.Format "2006-01-02T15:04:05-07:00" }}"
     }
   {{ end }}
   ]
diff --git a/layouts/section/blog.json b/layouts/section/blog.json
index 1c4f9c29..f8c51a28 100644
--- a/layouts/section/blog.json
+++ b/layouts/section/blog.json
@@ -10,11 +10,12 @@
     {
       "id": "{{ .Permalink }}",
       "title": "{{ .Title }}",
+      {{ if .Params.categories }}
+      "tags": ["{{ delimit .Params.categories "\", \"" }}"],
+      {{ end }}
       "content_html": {{ .Content | jsonify }},
       "url": "{{ .Permalink }}",
-      "date_published": "{{ .Date }}"{{ if .Params.categories }},
-      "categories": ["{{ delimit .Params.categories "\", \"" }}"]
-      {{ end }}
+      "date_published": "{{ .Date.Format "2006-01-02T15:04:05-07:00" }}"
     }
   {{ end }}
   ]
diff --git a/layouts/section/photos.json b/layouts/section/photos.json
index a7323893..84887ca0 100644
--- a/layouts/section/photos.json
+++ b/layouts/section/photos.json
@@ -19,11 +19,11 @@
       "image": "{{ $image.RelPermalink }}",
       {{ end }}
       {{ if .Params.categories }}
-      "categories": ["{{ delimit .Params.categories "," }}"],
+      "tags": ["{{ delimit .Params.categories "," }}"],
       {{ end }}
       "content_html": {{ .Content | jsonify }},
       "url": "{{ .Permalink }}",
-      "date_published": "{{ .Date }}"
+      "date_published": "{{ .Date.Format "2006-01-02T15:04:05-07:00" }}"
     }
   {{ end }}
   ]