diff --git a/layouts/_default/full.html b/layouts/_default/full.html
index c302f1c..281f945 100644
--- a/layouts/_default/full.html
+++ b/layouts/_default/full.html
@@ -1,4 +1,4 @@
-<article class="{{ with .Section }}section-{{ . | urlize }} {{ end }}full-view">
+<article class="full-view{{ with .Section }} full-view--{{ . | urlize }}{{ end }}">
 <header>
 <h1 class="title {{ if $.Param "submitted" | default false }}title-submitted{{ end }}"><a href="{{ .RelPermalink }}">{{ .Title }}</a></h1>
 {{ if $.Param "submitted" | default false }}{{ partial "submitted.html" . }}{{ end -}}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index eba2ad9..9e9ce09 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,6 +1,6 @@
 {{ define "main" -}}
 <main class="main layout__main">
-<article class="{{ with .Section }}section-{{ . | urlize }} {{ end }}single-view">
+<article class="single-view{{ with .Section }} single-view--{{ . | urlize }}{{ end }}">
 <header>
 <h1 class="title {{ if $.Param "submitted" | default false }}title-submitted{{ end }}">{{ .Title }}</h1>
 {{ if $.Param "submitted" | default false }}{{ partial "submitted.html" . }}{{ end -}}
diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html
index 6d58dff..c3a1e33 100644
--- a/layouts/_default/summary.html
+++ b/layouts/_default/summary.html
@@ -1,4 +1,4 @@
-<article class="{{ with .Section }}section-{{ . | urlize }} {{ end }}list-view">
+<article class="list-view{{ with .Section }} list-view--{{ . | urlize }}{{ end }}">
 <header>
 <h2 class="title {{ if $.Param "submitted" | default false }}title-submitted{{ end }}"><a href="{{ .RelPermalink }}">{{ .Title }}</a></h2>
 {{ if $.Param "submitted" | default false }}{{ partial "submitted.html" . -}}{{ end }}
diff --git a/layouts/index.html b/layouts/index.html
index 92241b7..8e20bf4 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -2,7 +2,7 @@
 
 {{ define "main" -}}
 <main class="main layout__main">
-<article class="{{ with .Section }}section-{{ . | urlize }} {{ end }}single-view">
+<article class="single-view{{ with .Section }} single-view--{{ . | urlize }}{{ end }}">
 <div class="content">
 {{ .Content }}
 </div>
diff --git a/layouts/micro/single.html b/layouts/micro/single.html
index c8731e0..b133d78 100644
--- a/layouts/micro/single.html
+++ b/layouts/micro/single.html
@@ -1,6 +1,6 @@
 {{ define "main" -}}
 <main class="main layout__main">
-<article class="{{ with .Section }}section-{{ . | urlize }} {{ end }}single-view">
+<article class="single-view{{ with .Section }} single-view--{{ . | urlize }}{{ end }}">
 <header>
 <h1 class="hidden">{{ .Title }}</h1>
 <p>
diff --git a/layouts/micro/summary.html b/layouts/micro/summary.html
index 28aa9d5..6020b8e 100644
--- a/layouts/micro/summary.html
+++ b/layouts/micro/summary.html
@@ -1,4 +1,4 @@
-<article class="{{ with .Section }}section-{{ . | urlize }} {{ end }}list-view">
+<article class="list-view{{ with .Section }} list-view--{{ . | urlize }}{{ end }}">
 <header>
 <h2 class="hidden">{{ .Title }}</h2>
 <p><a href="{{ .RelPermalink }}">
diff --git a/layouts/podcast/full.html b/layouts/podcast/full.html
index a83a346..c4cecd8 100644
--- a/layouts/podcast/full.html
+++ b/layouts/podcast/full.html
@@ -1,4 +1,4 @@
-<article class="{{ with .Section }}section-{{ . | urlize }} {{ end }}full-view">
+<article class="full-view{{ with .Section }} full-view--{{ . | urlize }}{{ end }}">
 <header>
 <h1 class="title {{ if $.Param "submitted" | default false }}title-submitted{{ end }}"><a href="{{ .RelPermalink }}">{{ .Title }}</a></h1>
 {{ if $.Param "submitted" | default false }}{{ partial "submitted.html" . }}{{ end -}}
diff --git a/layouts/podcast/single.html b/layouts/podcast/single.html
index 7f4db97..99e3920 100644
--- a/layouts/podcast/single.html
+++ b/layouts/podcast/single.html
@@ -1,6 +1,6 @@
 {{ define "main" -}}
 <main class="main layout__main">
-<article class="{{ with .Section }}section-{{ . | urlize }} {{ end }}single-view">
+<article class="single-view{{ with .Section }} single-view--{{ . | urlize }}{{ end }}">
 <header>
 <h1 class="title {{ if $.Param "submitted" | default false }}title-submitted{{ end }}">{{ .Title }}</h1>
 {{ if $.Param "submitted" | default false }}{{ partial "submitted.html" . }}{{ end -}}