diff --git a/framework/core/less/admin/AdminHeader.less b/framework/core/less/admin/AdminHeader.less
index 298105c6e..5c41e75df 100644
--- a/framework/core/less/admin/AdminHeader.less
+++ b/framework/core/less/admin/AdminHeader.less
@@ -9,7 +9,7 @@
     color: @muted-color;
   }
 
-  .AdminHeader-description {
+  &-description {
     margin: 0;
     color: @control-color;
   }
diff --git a/framework/core/less/admin/ExtensionPage.less b/framework/core/less/admin/ExtensionPage.less
index 4dfbc4723..bed00c8a3 100644
--- a/framework/core/less/admin/ExtensionPage.less
+++ b/framework/core/less/admin/ExtensionPage.less
@@ -1,6 +1,6 @@
 .ExtensionPage {
 
-  .ExtensionPage-header {
+  &-header {
     .ExtensionTitle {
       display: flex;
       align-items: center;
@@ -17,10 +17,28 @@
       margin: 0;
       vertical-align: middle;
     }
+
+    &Items {
+      padding: 15px 0;
+      display: flex;
+      align-items: center;
+      flex-wrap: wrap;
+
+      .Checkbox {
+        margin: 5px 0 0 0;
+        display: inline-block;
+      }
+
+      .Checkbox.off {
+        .Checkbox-display {
+          background: @muted-more-color;
+        }
+      }
+    }
   }
 
-  .ExtensionPage-header,
-  .ExtensionPage-permissions-header {
+  &-header,
+  &-permissions-header {
     background: @control-bg;
 
     h2 {
@@ -60,40 +78,6 @@
       }
     }
 
-    .ExtensionPage-headerItems {
-      padding: 15px 0;
-      display: flex;
-      align-items: center;
-      flex-wrap: wrap;
-
-      .Checkbox {
-        margin: 5px 0 0 0;
-        display: inline-block;
-      }
-    }
-
-    .Checkbox.off {
-      .Checkbox-display {
-        background: @muted-more-color;
-      }
-    }
-
-    .ExtensionInfo {
-      margin-left: auto;
-
-      .item-authors {
-        a {
-          color: @muted-color;
-        }
-      }
-    }
-
-
-    .ExtensionName {
-      display: inline-block;
-      margin-left: 8px;
-    }
-
     .ExtensionIcon {
       width: 30px;
       height: 30px;
@@ -102,12 +86,12 @@
       vertical-align: middle;
     }
 
-    .ExtensionPage-headerTopItems {
+    &TopItems {
       margin-left: auto;
     }
 
     @media (max-width: @screen-phone-max) {
-      .ExtensionPage-headerTopItems {
+      &TopItems {
         float: right;
         position: relative;
       }
@@ -118,13 +102,13 @@
     }
   }
 
-  .ExtensionPage-settings, .ExtensionPage-permissions {
+  &-settings, &-permissions {
     .ExtensionPage-subHeader {
       margin: 5px 0px;
     }
   }
 
-  .ExtensionPage-settings {
+  &-settings {
     margin-top: 20px;
     padding: 10px 0;
 
@@ -133,13 +117,12 @@
     }
   }
 
-  .ExtensionPage-subHeader {
+  &-subHeader {
     color: @muted-color;
     font-weight: normal;
   }
 
-
-  .ExtensionPage-permissions {
+  &-permissions {
 
     .PermissionGrid-removeScope {
       display: none;
@@ -150,9 +133,24 @@
       padding-bottom: 25vh;
     }
 
-    .ExtensionPage-permissions-header {
+    &-header {
       margin: 20px 0 20px;
       padding: 5px 0;
     }
   }
 }
+
+.ExtensionInfo {
+  margin-left: auto;
+
+  .item-authors {
+    a {
+      color: @muted-color;
+    }
+  }
+}
+
+.ExtensionName {
+  display: inline-block;
+  margin-left: 8px;
+}