diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index f28e12ba..6036e194 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -5,8 +5,14 @@
     {{- partial "head.html" . }}
 </head>
 
-<body class="{{ if (and (eq .Kind `page` ) (ne .Layout `archives`)) }}single{{ else }}list
-        {{- if .IsHome }} home{{ end }}{{ end }}{{- if eq $.Site.Params.defaultTheme `dark` }} dark{{ end }}" id="top">
+<body class="
+{{- if (or (ne .Kind `page` ) (eq .Layout `archives`)) -}}
+{{- print "list" -}}
+{{- end -}}
+{{- if eq $.Site.Params.defaultTheme `dark` -}}
+{{- print " dark" }}
+{{- end -}}
+" id="top">
     {{- partialCached "header.html" . .Page}}
     <main class="main">
         {{- block "main" . }}
