diff --git a/package.json b/package.json
index 59be2409f..919b666f3 100644
--- a/package.json
+++ b/package.json
@@ -39,9 +39,9 @@
     "temp": "0.5.0",
     "underscore": "1.4.4",
 
-    "atom-light-ui": "0.1.1",
+    "atom-light-ui": "0.2.0",
     "atom-light-syntax": "0.2.0",
-    "atom-dark-ui": "0.1.1",
+    "atom-dark-ui": "0.2.0",
     "atom-dark-syntax": "0.2.0",
     "base16-tomorrow-dark-theme": "0.1.0",
     "solarized-dark-syntax": "0.1.0",
@@ -55,7 +55,7 @@
     "command-logger": "0.3.0",
     "command-palette": "0.3.0",
     "editor-stats": "0.2.0",
-    "find-and-replace": "0.5.0",
+    "find-and-replace": "0.6.0",
     "fuzzy-finder": "0.5.0",
     "gfm": "0.4.0",
     "git-diff": "0.3.0",
@@ -78,8 +78,8 @@
     "timecop": "0.2.0",
     "to-the-hubs": "0.3.0",
     "toml": "0.2.0",
-    "tree-view": "0.5.0",
-    "ui-demo": "0.6.0",
+    "tree-view": "0.6.0",
+    "ui-demo": "0.7.0",
     "whitespace": "0.4.0",
     "wrap-guide": "0.2.0",
 
diff --git a/spec/fixtures/packages/theme-with-multiple-imported-files/stylesheets/ui-variables.less b/spec/fixtures/packages/theme-with-multiple-imported-files/stylesheets/ui-variables.less
index 54a75946c..9cefd6823 100644
--- a/spec/fixtures/packages/theme-with-multiple-imported-files/stylesheets/ui-variables.less
+++ b/spec/fixtures/packages/theme-with-multiple-imported-files/stylesheets/ui-variables.less
@@ -71,3 +71,5 @@
 @component-border-radius: 2px;
 
 @tab-height: 30px;
+
+@font-family: Arial;
diff --git a/spec/fixtures/packages/theme-with-ui-variables/stylesheets/ui-variables.less b/spec/fixtures/packages/theme-with-ui-variables/stylesheets/ui-variables.less
index 54a75946c..9cefd6823 100644
--- a/spec/fixtures/packages/theme-with-ui-variables/stylesheets/ui-variables.less
+++ b/spec/fixtures/packages/theme-with-ui-variables/stylesheets/ui-variables.less
@@ -71,3 +71,5 @@
 @component-border-radius: 2px;
 
 @tab-height: 30px;
+
+@font-family: Arial;
diff --git a/static/panels.less b/static/panels.less
index 89cd59bce..deb76e871 100644
--- a/static/panels.less
+++ b/static/panels.less
@@ -7,7 +7,40 @@
   background-color: transparent;
   box-shadow: none;
 
-  .panel-heading {
-    border-radius: 0;
+  &.bordered {
+    .panel-heading {
+      border-radius: @component-border-radius @component-border-radius 0 0;
+    }
+  }
+}
+
+.inset-panel {
+  .panel-heading {
+    border-radius: @component-border-radius @component-border-radius 0 0;
+  }
+}
+
+.focusable-panel {
+  opacity: 0.8;
+  &:focus {
+    opacity: 1;
+  }
+}
+
+.panel-heading {
+  margin: 0;
+
+  border-radius: 0;
+
+  font-size: @font-size;
+  line-height: 1;
+
+  .btn {
+    @btn-height: @component-line-height - 5px;
+    height: @btn-height;
+    line-height: @btn-height;
+    font-size: @font-size - 2px;
+    position: relative;
+    top: -5px;
   }
 }
diff --git a/static/root-view.less b/static/root-view.less
index f145292fb..5e8fbe2ed 100644
--- a/static/root-view.less
+++ b/static/root-view.less
@@ -8,6 +8,16 @@ body {
   width: 100%;
   height: 100%;
   overflow: hidden;
+  font-family: @font-family;
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  font-family: @font-family;
 }
 
 #root-view {
@@ -15,6 +25,7 @@ body {
   overflow: hidden;
   position: relative;
   background-color: @app-background-color;
+  font-family: @font-family;
 
   #horizontal {
     display: -webkit-flex;
diff --git a/static/utilities.less b/static/utilities.less
index e4c176576..74b0bc030 100644
--- a/static/utilities.less
+++ b/static/utilities.less
@@ -16,9 +16,11 @@
 // Blocks
 
 // Must be div.block so as not to affect syntax highlighting.
+ul.block,
 div.block {
   margin-bottom: @component-padding;
 }
+div > ul.block:last-child,
 div > div.block:last-child {
   margin-bottom: 0;
 }
diff --git a/static/variables/ui-variables.less b/static/variables/ui-variables.less
index 2eade0921..34304de8c 100644
--- a/static/variables/ui-variables.less
+++ b/static/variables/ui-variables.less
@@ -77,3 +77,8 @@
 @component-border-radius: 2px;
 
 @tab-height: 30px;
+
+
+// Other
+
+@font-family: 'Lucida Grande', Arial, sans-serif;