diff --git a/.themes/classic/source/_includes/article.html b/.themes/classic/source/_includes/article.html
index fee7a19cfd2..69bb500817d 100644
--- a/.themes/classic/source/_includes/article.html
+++ b/.themes/classic/source/_includes/article.html
@@ -5,7 +5,7 @@
     {% else %}
       <h1 class="entry-title">{{ page.title | titlecase }}</h1>
     {% endif %}
-    {% unless page.no_meta %}
+    {% unless page.meta == false %}
       <p class="meta">{% include post/date.html %}</p>
     {% endunless %}
   </header>
diff --git a/.themes/classic/source/_layouts/category_index.html b/.themes/classic/source/_layouts/category_index.html
index cce9777c27f..85a63072043 100644
--- a/.themes/classic/source/_layouts/category_index.html
+++ b/.themes/classic/source/_layouts/category_index.html
@@ -1,6 +1,6 @@
 ---
 layout: page
-no_footer: true
+footer: false
 ---
 
 <div id="blog-archives" class="category">
diff --git a/.themes/classic/source/_layouts/default.html b/.themes/classic/source/_layouts/default.html
index 15546bb59fb..fdb60ded78b 100644
--- a/.themes/classic/source/_layouts/default.html
+++ b/.themes/classic/source/_layouts/default.html
@@ -1,11 +1,11 @@
 {% include head.html %}
-<body {% if page.body_id %} id="{{ page.body_id }}" {% endif %} {% if page.sidebar == 'none' %} class="no-sidebar" {% endif %}>
+<body {% if page.body_id %} id="{{ page.body_id }}" {% endif %} {% if page.sidebar == false %} class="no-sidebar" {% endif %}>
   <header>{% include header.html %}</header>
   <nav>{% include navigation.html %}</nav>
   <div id="main">
     <div id="content">
       {{ content }}
-      {% unless page.sidebar == 'none' %}
+      {% unless page.sidebar == false %}
         <aside role=sidebar>{% include sidebar.html %}</aside>
       {% endunless %}
     </div>
diff --git a/.themes/classic/source/_layouts/page.html b/.themes/classic/source/_layouts/page.html
index fb51816f268..48dff5cb6a9 100644
--- a/.themes/classic/source/_layouts/page.html
+++ b/.themes/classic/source/_layouts/page.html
@@ -6,17 +6,17 @@ layout: default
 <article>
   <header>
     <h1 class="entry-title">{{ page.title | titlecase }}</h1>
-    {% unless page.no_meta or !index %}<p class="meta">{% include post/date.html %}</p>{% endunless %}
+    {% if page.meta == false or !page.date %}<p class="meta">{% include post/date.html %}</p>{% endif %}
   </header>
   {{ content | smart_quotes }}
-  {% unless page.no_footer %}
+  {% unless page.footer == false %}
     <footer>
       {% if page.date %}
       <p class="meta">
         {% include post/date.html %}
       </p>
       {% endif %}
-      {% unless page.no_sharing %}
+      {% unless page.sharing == false %}
         {% include post/sharing.html %}
       {% endunless %}
     </footer>
diff --git a/.themes/classic/source/_layouts/post.html b/.themes/classic/source/_layouts/post.html
index 2ec379c979f..414a368c914 100644
--- a/.themes/classic/source/_layouts/post.html
+++ b/.themes/classic/source/_layouts/post.html
@@ -12,12 +12,12 @@ single: true
       {% include post/date.html %}
       {% include post/categories.html %}
     </p>
-    {% unless page.no_sharing %}
-    {% include post/sharing.html %}
+    {% unless page.sharing == false %}
+      {% include post/sharing.html %}
     {% endunless %}
   </footer>
 </article>
-{% if site.disqus_short_name and page.no_comments != true %}
+{% if site.disqus_short_name and page.comments == true %}
   <section>
     <h1>Comments</h1>
     <div id="disqus_thread">{% include post/disqus_thread.html %}</div>
diff --git a/.themes/classic/source/blog/archives/index.html b/.themes/classic/source/blog/archives/index.html
index cdc5f17c2e9..f1d9cee324b 100644
--- a/.themes/classic/source/blog/archives/index.html
+++ b/.themes/classic/source/blog/archives/index.html
@@ -1,7 +1,7 @@
 ---
 layout: page
 title: Blog Archive
-no_footer: true
+footer: false
 ---
 
 <div id="blog-archives">
diff --git a/.themes/classic/source/index.html b/.themes/classic/source/index.html
index 0655c139446..f1d97f90dd3 100644
--- a/.themes/classic/source/index.html
+++ b/.themes/classic/source/index.html
@@ -1,6 +1,7 @@
 ---
 layout: default
-blog_index: true
+meta: false
+footer: false
 ---
 <div class="blog-index">
 {% assign index = true %}
