diff --git a/zero.Web/App/Components/Forms/toggle.vue b/zero.Web/App/Components/Forms/toggle.vue
index 6e8f15ad..67aa72de 100644
--- a/zero.Web/App/Components/Forms/toggle.vue
+++ b/zero.Web/App/Components/Forms/toggle.vue
@@ -64,7 +64,7 @@
     display: inline-block;
     height: 22px;
     width: 40px;
-    background: var(--color-box);
+    background: var(--color-bg);
     border: 1px solid var(--color-line);
     border-radius: 20px;
     transition: all 0.2s ease;
diff --git a/zero.Web/App/pages/media/media.vue b/zero.Web/App/pages/media/media.vue
index 21bf046b..608b004f 100644
--- a/zero.Web/App/pages/media/media.vue
+++ b/zero.Web/App/pages/media/media.vue
@@ -1,19 +1,32 @@
 <template>
   <div class="media theme-dark">
-    <ui-header-bar title="Media">
-      <ui-search />
-      <ui-button label="Add media" icon="fth-plus" />
-    </ui-header-bar>
+    <div class="media-tree" v-resizable="resizable">
+      <ui-header-bar title="Media" />
+      <ui-tree :get="getItems" />
+      <div class="media-tree-resizable ui-resizable"></div>
+    </div>
 
-    <div class="ui-view-box">
-      <div class="media-items">
-        <a href="#" class="media-item" v-for="item in items">
-          <img v-if="item.type === 'image'" :src="item.source" />
-          <span class="media-item-content" v-if="item.type !== 'image'">
-            <i :class="icons[item.type]" :data-extension="item.extension"></i>
-            <span>{{item.source}}</span>
-          </span>
-        </a>
+    <div class="media-content">
+      <ui-header-bar title="Media">
+        <ui-search />
+        <ui-button label="Add media" icon="fth-plus" />
+      </ui-header-bar>
+
+      <div class="ui-view-box">
+        <div class="media-items">
+          <a href="#" class="media-item is-blank">
+            <span class="media-item-content">
+              <i class="fth-plus"></i>
+            </span>
+          </a>
+          <a href="#" class="media-item" v-for="item in items">
+            <img v-if="item.type === 'image'" :src="item.source" />
+            <span class="media-item-content" v-if="item.type !== 'image'">
+              <i :class="icons[item.type]" :data-extension="item.extension"></i>
+              <span>{{item.source}}</span>
+            </span>
+          </a>
+        </div>
       </div>
     </div>
   </div>
@@ -21,15 +34,25 @@
 
 
 <script>
+  import PageTreeApi from 'zero/resources/page-tree.js'
+
   export default {
 
     data: () => ({
+      cache: {},
       items: [],
       icons: {
         image: 'fth-image',
         video: 'fth-video',
         file: 'fth-file'
-      }
+      },
+      resizable: {
+        axis: 'x',
+        min: 260,
+        max: 520,
+        save: 'media-tree',
+        handle: '.ui-resizable'
+      },
     }),
 
     created()
@@ -72,7 +95,35 @@
 
 
     methods: {
+      getItems(parent)
+      {
+        const key = !parent ? '__root' : parent;
 
+        if (this.cache[key])
+        {
+          return Promise.resolve(this.cache[key]);
+        }
+
+        return PageTreeApi.getChildren(parent).then(response =>
+        {
+          response.forEach(item =>
+          {
+            item.url = {
+              name: 'page',
+              params: { id: item.id }
+            };
+
+            if (item.id === "recyclebin")
+            {
+              item.url = {
+                name: 'recyclebin'
+              };
+            }
+          });
+          this.cache[key] = response;
+          return response;
+        });
+      }
     }
   }
 </script>
@@ -84,6 +135,55 @@
     height: 100vh;
     background: var(--color-bg);
     overflow-y: auto;
+    display: grid;
+    grid-template-columns: auto 1fr;
+    grid-gap: 2px;
+    justify-content: stretch;
+  }
+
+  .media-tree
+  {
+    width: 340px;
+    background: var(--color-bg-light);
+    padding: 0;
+    position: relative;
+    overflow-y: auto;
+    height: 100vh;
+
+    .ui-header-bar + .ui-tree
+    {
+      margin-top: 2px;
+    }
+
+    .ui-dot-button
+    {
+      margin-right: -8px;
+    }
+  }
+
+  .media-tree-resizable
+  {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    background: var(--color-fg);
+    opacity: 0;
+    right: 0;
+    width: 6px;
+    cursor: ew-resize;
+    transition: opacity 0.15s ease 0s;
+
+    &:hover
+    {
+      transition-delay: 0.2s;
+      opacity: 0.04;
+    }
+  }
+
+  .media-content
+  {
+    height: 100vh;
+    overflow-y: auto;
   }
 
   .media-items
@@ -112,6 +212,12 @@
       height: 100%;
       object-fit: cover;
     }
+
+    &.is-blank
+    {
+      border: 2px dotted var(--color-line);
+      background: transparent;
+    }
   }
 
   .media-item-content
@@ -150,6 +256,11 @@
       }
     }
 
+    .is-blank & i:after
+    {
+      display: none;
+    }
+
     span
     {
       display: block;
diff --git a/zero.Web/App/pages/settings/users.vue b/zero.Web/App/pages/settings/users.vue
index 46cb2b5f..3e61018e 100644
--- a/zero.Web/App/pages/settings/users.vue
+++ b/zero.Web/App/pages/settings/users.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="users">
     <ui-header-bar title="Users & Permissions" :back-button="true">
-      <ui-button type="light" label="Add role" icon="fth-plus" />
-      <ui-button type="light" label="Add user" icon="fth-plus" />
       <ui-table-filter v-model="usersConfig" />
+      <ui-button type="light" label="Add role" icon="fth-plus" />
+      <ui-button label="Add user" icon="fth-plus" />
     </ui-header-bar>
 
     <div class="ui-blank-box">
diff --git a/zero.Web/Sass/Core/_settings.scss b/zero.Web/Sass/Core/_settings.scss
index de405a37..c80595f3 100644
--- a/zero.Web/Sass/Core/_settings.scss
+++ b/zero.Web/Sass/Core/_settings.scss
@@ -2,7 +2,7 @@
 :root, .theme-light
 {
   // accent colors
-  --color-primary: #24b3a4;
+  --color-primary: #2a68e7;
   --color-primary-fg: #fff;
   --color-secondary: #292b2c;
   --color-negative: #d82853; 
@@ -77,7 +77,7 @@
 
   // background color shades
   --color-bg: #1c1e1f;
-  --color-bg-dark: #919294;
+  --color-bg-dark: #fff;
   --color-bg-mid: #292b2c;
   --color-bg-light: #242526;
   --color-bg-xxlight: #242526;
diff --git a/zero.Web/Views/Index.cshtml b/zero.Web/Views/Index.cshtml
index 7b7f9492..fce66751 100644
--- a/zero.Web/Views/Index.cshtml
+++ b/zero.Web/Views/Index.cshtml
@@ -16,7 +16,7 @@
   </environment>
   <title>zero</title>
 </head>
-<body class="theme-light">
+<body class="theme-dark">
   <div id="app"></div>
   <script>
     window.zero = window.zero || {};