diff --git a/css/style.css b/css/style.css
index 83ec1bf..46c0a25 100644
--- a/css/style.css
+++ b/css/style.css
@@ -142,6 +142,9 @@ h1, h2, h3, h4, h5, h6 { text-shadow: 0 1px 1px rgba(0, 0, 0, 0.15); }
 #nav-main ul li.current-menu-item > a,
 #nav-main ul li.current-menu-parent > a,
 #nav-main ul li.current-menu-ancestor > a,
+#nav-main ul li.current-page-item > a,
+#nav-main ul li.current-page-parent > a,
+#nav-main ul li.current-page-ancestor > a
 #nav-main ul li:hover > a {
   color: #73c8ff;
 }
@@ -171,6 +174,9 @@ h1, h2, h3, h4, h5, h6 { text-shadow: 0 1px 1px rgba(0, 0, 0, 0.15); }
 #nav-main ul ul li.current-menu-item > a,
 #nav-main ul ul li.current-menu-parent > a,
 #nav-main ul ul li.current-menu-ancestor > a,
+#nav-main ul ul li.current-page-item > a,
+#nav-main ul ul li.current-page-parent > a,
+#nav-main ul ul li.current-page-ancestor > a
 #nav-main ul ul li:hover > a {
   color: #06c;
 }
diff --git a/inc/roots-cleanup.php b/inc/roots-cleanup.php
index 0ba84f3..47d5f30 100644
--- a/inc/roots-cleanup.php
+++ b/inc/roots-cleanup.php
@@ -340,7 +340,7 @@ function roots_nav_menu_args($args = '') {
 add_filter('wp_nav_menu_args', 'roots_nav_menu_args');
 
 function roots_check_current($val) {
-  return preg_match('/current-menu/', $val);
+  return preg_match('/current-/', $val);
 }
 
 class Roots_Nav_Walker extends Walker_Nav_Menu {