core/themes/bartik/css/colors.css |  6 +--
 core/themes/bartik/css/style.css  | 91 ++++++++++++++-------------------------
 2 files changed, 36 insertions(+), 61 deletions(-)

diff --git a/core/themes/bartik/css/colors.css b/core/themes/bartik/css/colors.css
index a3c6994..6721678 100644
--- a/core/themes/bartik/css/colors.css
+++ b/core/themes/bartik/css/colors.css
@@ -8,8 +8,8 @@ body {
 }
 #page,
 #main-wrapper,
-.region-primary-menu .block-menu a.active,
-.region-primary-menu .block-menu .active-trail a {
+.region-primary-menu .menu li a.active,
+.region-primary-menu .menu li .active-trail a {
   background: #ffffff;
 }
 .tabs ul.primary li a.active {
@@ -53,6 +53,6 @@ a:active,
 .site-branding-block,
 #name-and-slogan a,
 .site-branding-block a,
-.region-secondary-menu .block-menu li a {
+.region-secondary-menu .menu li a {
   color: #fffeff;
 }
diff --git a/core/themes/bartik/css/style.css b/core/themes/bartik/css/style.css
index 721d10f..43adb61 100644
--- a/core/themes/bartik/css/style.css
+++ b/core/themes/bartik/css/style.css
@@ -441,7 +441,6 @@ h1.site-name {
 .region-header .form-required:after {
   background-image: url(../images/required.svg);
 }
-
 /* Region header block menus. */
 .region-header .block-menu {
   border: 1px solid;
@@ -466,7 +465,6 @@ h1.site-name {
 .region-header .block-menu li:last-child a {
   border-bottom: 0;
 }
-
 /* User Login block in the header region */
 .region-header #block-user-login {
   width: auto;
@@ -552,19 +550,16 @@ h1.site-name {
 .region-primary-menu {
   clear: both;
 }
-.region-primary-menu .block-menu {
+.region-primary-menu .menu {
   font-size: 0.929em;
   margin: 0 5px;
   padding: 0;
   text-align: left; /* LTR */
 }
-[dir="rtl"] .region-primary-menu .block-menu{
+[dir="rtl"] .region-primary-menu .menu {
   text-align: right;
 }
-.region-primary-menu .block-menu ul.menu {
-  padding: 0;
-}
-.region-primary-menu .block-menu li {
+.region-primary-menu .menu li {
   float: none;
   list-style: none;
   margin: 0;
@@ -572,7 +567,7 @@ h1.site-name {
   height: auto;
   width: 100%;
 }
-.region-primary-menu .block-menu a {
+.region-primary-menu .menu a {
   color: #333;
   background: #ccc;
   background: rgba(255, 255, 255, 0.7);
@@ -584,19 +579,19 @@ h1.site-name {
   margin: 4px 0;
   padding: 0.9em 0 0.9em 10px; /* LTR */
 }
-[dir="rtl"] .region-primary-menu .block-menu a {
+[dir="rtl"] .region-primary-menu .menu a {
   padding: 0.9em 10px 0.9em 0;
 }
-.region-primary-menu .block-menu a:hover,
-.region-primary-menu .block-menu a:focus {
+.region-primary-menu .menu a:hover,
+.region-primary-menu .menu a:focus {
   background: #f6f6f2;
   background: rgba(255, 255, 255, 0.95);
 }
-.region-primary-menu .block-menu a:active {
+.region-primary-menu .menu a:active {
   background: #b3b3b3;
   background: rgba(255, 255, 255, 1);
 }
-.region-primary-menu .block-menu li a.active {
+.region-primary-menu .menu li a.active {
   border-bottom: none;
 }
 
@@ -637,10 +632,6 @@ body:not(:target) .region-primary-menu .menu-toggle:after {
   position: absolute;
   right: 10px; /* LTR */
 }
-[dir="rtl"] body:not(:target) .region-primary-menu .menu-toggle:after {
-  right: auto;
-  left: 10px;
-}
 body:not(:target) .region-primary-menu .menu-toggle-target-show:target ~ .menu-toggle,
 body:not(:target) .region-primary-menu .menu-toggle--hide {
   display: none;
@@ -649,23 +640,7 @@ body:not(:target) .region-primary-menu .menu-toggle-target-show:target ~ .menu-t
   display: block;
 }
 
-.region-primary-menu .block-menu .menu-hide a {
-  display: none;
-}
-body:not(:target) .region-primary-menu .menu-toggle-target-show:target ~ .menu .menu-hide a {
-  background-color: transparent;
-  border: none;
-  display: block;
-  width: 100%;
-  height: auto;
-  position: absolute;
-  left: 0;
-  right: 0;
-  overflow: hidden;
-  text-indent: -999em;
-  z-index: 1001;
-}
-body:not(:target) .region-primary-menu .block-menu li {
+body:not(:target) .region-primary-menu .menu li {
   height: 0;
   overflow: hidden;
 }
@@ -676,26 +651,26 @@ body:not(:target) .region-primary-menu .menu-toggle-target-show:target ~ .menu l
 
 /* --------------- Secondary Menu ------------ */
 
-.region-secondary-menu .block-menu .menu {
+.region-secondary-menu .menu {
   float: right; /* LTR */
   font-size: 0.929em;
   margin: 0 10px;
   padding: 0;
 }
-[dir="rtl"] .region-secondary-menu .block-menu .menu {
+[dir="rtl"] .region-secondary-menu .menu {
   float: left;
 }
-
-.region-secondary-menu .block-menu li{
+.region-secondary-menu .menu li {
+  margin: 0;
   padding: 0;
   display: inline;
 }
-.region-secondary-menu .block-menu li a {
+.region-secondary-menu .menu a {
   display: inline-block;
   padding:  0.8em;
 }
-.region-secondary-menu .block-menu li a:hover,
-.region-secondary-menu .block-menu li a:focus {
+.region-secondary-menu .menu  a:hover,
+.region-secondary-menu .menu a:focus {
   text-decoration: underline;
 }
 
@@ -1904,13 +1879,13 @@ div.admin-panel .description {
   .site-branding-text {
     padding: 10px 10px 8px;
   }
-  .region-primary-menu .block-menu {
+  .region-primary-menu .menu {
     margin: 0 5px;
     padding: 0;
     text-align: center;
   }
-  .region-primary-menu .block-menu li,
-  body:not(:target) .region-primary-menu .block-menu li {
+  .region-primary-menu .menu li,
+  body:not(:target) .region-primary-menu .menu li {
     float: left; /* LTR */
     margin-right: 5px; /* LTR */
     padding: 0;
@@ -1919,19 +1894,19 @@ div.admin-panel .description {
     height: auto;
     overflow: visible;
   }
-  [dir="rtl"] .region-primary-menu .block-menu li {
+  [dir="rtl"] .region-primary-menu .menu li {
     float: right;
     margin-left: 5px;
     margin-right: 0;
   }
-  .region-primary-menu .block-menu li:nth-child(3n) {
+  .region-primary-menu .menu li:nth-child(3n) {
     margin-right: -5px; /* LTR */
   }
-  [dir="rtl"] .region-primary-menu .block-menu li:nth-child(3n) {
+  [dir="rtl"] .region-primary-menu .menu li:nth-child(3n) {
     margin-left: -5px;
     margin-right: 0;
   }
-  .region-primary-menu .block-menu a {
+  .region-primary-menu .menu a {
     float: none;
     display: block;
     border-radius: 8px;
@@ -1969,13 +1944,13 @@ div.admin-panel .description {
   .site-name {
     font-size: 1.821em;
   }
-  .region-primary-menu .block-menu {
+  .region-primary-menu .block-menu .menu {
     font-size: 0.929em;
     margin: 0;
     padding: 0 15px;
   }
-  .region-primary-menu .block-menus li,
-  body:not(:target) .region-primary-menu .block-menu li {
+  .region-primary-menu .menu li,
+  body:not(:target) .region-primary-menu .menu li {
     float: left; /* LTR */
     list-style: none;
     padding: 0 1px;
@@ -1984,23 +1959,23 @@ div.admin-panel .description {
     height: auto;
     overflow: visible;
   }
-  [dir="rtl"] .region-primary-menu .block-menu li,
-  [dir="rtl"]  body:not(:target)  .region-primary-menu .block-menu li {
+  [dir="rtl"] .region-primary-menu .menu li,
+  [dir="rtl"]  body:not(:target)  .region-primary-menu .menu li {
     float: right;
   }
-  .region-primary-menu .block-menu a {
+  .region-primary-menu .menu a {
     float: left; /* LTR */
     padding: 0.7em 0.8em;
     margin-bottom: 0;
     border-bottom-left-radius: 0;
     border-bottom-right-radius: 0;
   }
-  [dir="rtl"] .region-primary-menu .block-menu a {
+  [dir="rtl"] .region-primary-menu .menu a {
     float: right;
     padding: 0.7em 0.8em;
   }
-  .featured .region-primary-menu .block-menu li a:active,
-  .featured .region-primary-menu .block-menu li a.active {
+  .featured .region-primary-menu .menu li a:active,
+  .featured .region-primary-menu .menu li a.active {
     background: #f0f0f0;
     background: rgba(240, 240, 240, 1.0);
   }