diff --git a/src/ui/public/styles/base.less b/src/ui/public/styles/base.less
index c91f4742e93fa..490e4dde19126 100644
--- a/src/ui/public/styles/base.less
+++ b/src/ui/public/styles/base.less
@@ -67,13 +67,13 @@ ul.navbar-inline li {
   font-size: 8pt;
   font-weight: normal;
   opacity: 90%;
+}
 
-  &-inner {
+  .tooltip-inner {
     word-break: normal;
     word-wrap: break-word;
     white-space: normal;
   }
-}
 
 .content {
   .real-flex-parent(@flow: row nowrap);
@@ -158,14 +158,16 @@ a {
         border-radius: 0;
       }
     }
+
     .kibana-nav-info {
       line-height: 30px;
       padding: 0 10px;
-      &-title {
+    }
+
+      .kibana-nav-info-title {
         font-weight: bold;
         margin-right: 10px;
       }
-    }
   }
 
   > config {
@@ -221,10 +223,6 @@ a {
     padding-right: 7px !important;
   }
 
-  &-time-desc > .fa-clock-o {
-    padding-right: 5px;
-  }
-
   .fa {
     font-size: 16px;
     vertical-align: middle;
@@ -236,6 +234,10 @@ a {
   }
 }
 
+  .navbar-timepicker-time-desc > .fa-clock-o {
+    padding-right: 5px;
+  }
+
 kbn-info i {
   cursor: help;
 }
@@ -431,15 +433,15 @@ paginated-selectable-list {
     }
   }
 
-  div.finder-form {
+  .finder-form {
     position: relative;
+  }
 
-    &-options {
+    .finder-form-options {
       .flex-parent();
       flex-direction: row;
       justify-content: flex-end;
     }
-  }
 
   .finder-options {
     max-height: 300px;
@@ -560,11 +562,13 @@ style-compile {
 
 .cell-hover {
   background-color: @table-cell-hover-bg;
-  &-show {
+}
+
+  .cell-hover-show {
     // so that the cell doesn't change size on hover
     visibility: hidden;
   }
-}
+
 .cell-hover:hover {
   background-color: @table-cell-hover-hover-bg;
   cursor: cell;
diff --git a/src/ui/public/styles/dark-theme.less b/src/ui/public/styles/dark-theme.less
index 38be556f7f0a6..b4e773d778503 100644
--- a/src/ui/public/styles/dark-theme.less
+++ b/src/ui/public/styles/dark-theme.less
@@ -513,16 +513,14 @@
 // /src/ui/public/styles/pagination.less
   paginate {
     paginate-controls {
-      .pagination-other-pages {
-        &-list {
-          > li {
-            a {
-              background-color: @dark-button-bg;
-              color: @white;
-            }
-            &.active a {
-              color: @paginate-page-link-active-color;
-            }
+      .pagination-other-pages-list {
+        > li {
+          a {
+            background-color: @dark-button-bg;
+            color: @white;
+          }
+          &.active a {
+            color: @paginate-page-link-active-color;
           }
         }
       }
diff --git a/src/ui/public/styles/hintbox.less b/src/ui/public/styles/hintbox.less
index a04adef6dee2c..cedaff991a3d1 100644
--- a/src/ui/public/styles/hintbox.less
+++ b/src/ui/public/styles/hintbox.less
@@ -18,11 +18,6 @@
     background-color: @hintbox-pre-bg;
   }
 
-  &-label,
-  &-label[ng-click] {
-    cursor: help;
-  }
-
   ul, ol {
     padding-left: 25px;
   }
@@ -58,3 +53,8 @@
     }
   }
 }
+
+  .hintbox-label,
+  .hintbox-label[ng-click] {
+    cursor: help;
+  }
diff --git a/src/ui/public/styles/pagination.less b/src/ui/public/styles/pagination.less
index d8fa68704e628..7b380a625d635 100644
--- a/src/ui/public/styles/pagination.less
+++ b/src/ui/public/styles/pagination.less
@@ -14,8 +14,9 @@ paginate {
       flex: 1 0 auto;
       display: flex;
       justify-content: center;
+    }
 
-      &-list {
+      .pagination-other-pages-list {
         flex: 0 0 auto;
         display: flex;
         justify-content: center;
@@ -46,7 +47,6 @@ paginate {
           }
         }
       }
-    }
 
     .pagination-size {
       flex: 0 0 auto;
diff --git a/src/ui/public/styles/sidebar.less b/src/ui/public/styles/sidebar.less
index f6671b25ace87..1e54e9fc5a23b 100644
--- a/src/ui/public/styles/sidebar.less
+++ b/src/ui/public/styles/sidebar.less
@@ -31,19 +31,12 @@
         padding-right: 10px;
       }
     }
+
     ul {
       list-style: none;
       margin-bottom: 0px;
     }
 
-    &-header {
-      padding-left: 10px;
-      padding-right: 10px;
-      color: @sidebar-header-color;
-      border: 1px solid;
-      border-color: @sidebar-header-border;
-    }
-
     .sidebar-item {
       border-top-color: @sidebar-border;
       font-size: @sidebar-item-font-size;
@@ -57,9 +50,21 @@
         }
       }
 
-      &-title,
-      &-text,
-      &-button {
+      .active {
+        background-color: @sidebar-active-bg !important;
+        color: @sidebar-active-color;
+
+        &:hover,
+        &:hover .text-muted {
+          color: @sidebar-active-hover-color;
+          background-color: @sidebar-active-hover-bg;
+        }
+      }
+    }
+
+      .sidebar-item-title,
+      .sidebar-item-text,
+      .sidebar-item-button {
         margin: 0;
         padding: 5px 10px;
         text-align: center;
@@ -68,7 +73,7 @@
         border-radius: 0;
       }
 
-      &-title {
+      .sidebar-item-title {
         text-align: left;
         white-space: nowrap;
         .ellipsis();
@@ -78,11 +83,11 @@
         }
       }
 
-      &-text {
+      .sidebar-item-text {
         background: @sidebar-item-text-bg;
       }
 
-      &-button {
+      .sidebar-item-button {
         font-size: inherit;
         display: block;
 
@@ -120,19 +125,15 @@
           .button-variant(@btn-default-color; @btn-default-bg; @btn-default-border);
         }
       }
+  }
 
-      .active {
-        background-color: @sidebar-active-bg !important;
-        color: @sidebar-active-color;
-
-        &:hover,
-        &:hover .text-muted {
-          color: @sidebar-active-hover-color;
-          background-color: @sidebar-active-hover-bg;
-        }
-      }
+    .sidebar-list-header {
+      padding-left: 10px;
+      padding-right: 10px;
+      color: @sidebar-header-color;
+      border: 1px solid;
+      border-color: @sidebar-header-border;
     }
-  }
 
   .index-pattern {
     font-weight: bold;
diff --git a/src/ui/public/styles/theme.less b/src/ui/public/styles/theme.less
index fe616afd08ca6..9d1e06beac8fa 100644
--- a/src/ui/public/styles/theme.less
+++ b/src/ui/public/styles/theme.less
@@ -15,8 +15,9 @@
 
 .navbar {
   border-width: 0;
+}
 
-  &-static-top {
+  .navbar-static-top {
     background-color: @kibanaGray5;
     color: @kibanaGray2;
     .navbar-brand:hover,
@@ -54,7 +55,8 @@
       }
     }
   }
-  &-btn-link {
+
+  .navbar-btn-link {
     margin: 0;
     border-radius: 0;
 
@@ -64,14 +66,14 @@
     }
   }
 
-  &-default {
+  .navbar-default {
     .badge {
       background-color: @navbar-default-badge-bg;
       color: @navbar-default-badge-color;
     }
   }
 
-  &-inverse {
+  .navbar-inverse {
     .logo {
       height: @navbar-height;
       width: 252px;
@@ -90,25 +92,24 @@
     }
   }
 
-  .navbar-nav > .active > a {
-    border-bottom-color: @kibanaGray2;
-    background-color: transparent;
-  }
-
-  &-brand {
+  .navbar-brand {
     cursor: default;
     font-size: 1.8em;
     user-select: none;
   }
 
-  &-nav {
+  .navbar-nav {
     font-size: @font-size-small;
+
+    & > .active > a {
+      border-bottom-color: @kibanaGray2;
+      background-color: transparent;
+    }
   }
 
-  &-toggle {
+  .navbar-toggle {
     margin-top: 4px;
   }
-}
 
 // Buttons ====================================================================
 
@@ -174,25 +175,16 @@ table,
       color: @table-special-color;
     }
   }
+}
 
-  // > thead > tr > th,
-  // > tbody > tr > th,
-  // > tfoot > tr > th,
-  // > thead > tr > td,
-  // > tbody > tr > td,
-  // > tfoot > tr > td {
-  //   border: none;
-  // }
-
-  &-bordered > thead > tr > th,
-  &-bordered > tbody > tr > th,
-  &-bordered > tfoot > tr > th,
-  &-bordered > thead > tr > td,
-  &-bordered > tbody > tr > td,
-  &-bordered > tfoot > tr > td {
+  .table-bordered > thead > tr > th,
+  .table-bordered > tbody > tr > th,
+  .table-bordered > tfoot > tr > th,
+  .table-bordered > thead > tr > td,
+  .table-bordered > tbody > tr > td,
+  .table-bordered > tfoot > tr > td {
     border: 1px solid @table-border-color;
   }
-}
 
 // Forms ======================================================================