diff --git a/CHANGELOG.md b/CHANGELOG.md
index e56c290..f6c1142 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ Released: -
 * [Changed] Moving `LICENSE` to `LICENSE.md`
 * [Changed] Throw `LogicException` instead of `RuntimeException` when calling
             `Pico::setConfig()` after processing has started
+* [Changed] Default theme now highlights the current page and only lists pages
+            with a title in the navigation
 ```
 
 ### Version 1.0.0-beta.2
diff --git a/themes/default/index.twig b/themes/default/index.twig
index 32650fb..37f8f16 100644
--- a/themes/default/index.twig
+++ b/themes/default/index.twig
@@ -23,8 +23,10 @@
             <nav>
                 <a href="#" class="menu-icon"></a>
                 <ul>
-                    {% for page in pages %}
-                        <li><a href="{{ page.url }}">{{ page.title }}</a></li>
+                    {% for page in pages if page.title %}
+                        <li{% if page.id == current_page.id %} class="active"{% endif %}>
+                            <a href="{{ page.url }}">{{ page.title }}</a>
+                        </li>
                     {% endfor %}
                 </ul>
             </nav>
diff --git a/themes/default/style.css b/themes/default/style.css
index d26f65a..a8c0030 100644
--- a/themes/default/style.css
+++ b/themes/default/style.css
@@ -222,9 +222,14 @@ blockquote {
     margin-bottom: 80px;
     color: #afe1da;
 }
-#header a { color: #afe1da; }
+#header a {
+    color: #afe1da;
+}
 #header h1 a,
-#header a:hover { color: #fff; }
+#header a:hover,
+#header .active a {
+    color: #fff;
+}
 #header h1 {
     font-weight: bold;
     margin: 0;