diff --git a/app/app.ts b/app/app.ts
index a708b583c371..63241d1a136b 100644
--- a/app/app.ts
+++ b/app/app.ts
@@ -25,6 +25,7 @@ import moment from 'moment';
 import { setupGlobalContextMenuForEditableElement } from 'util/menus/GlobalMenu';
 import VModal from 'vue-js-modal';
 import VeeValidate from 'vee-validate';
+import ChildWindow from 'components/windows/ChildWindow.vue';
 
 const { ipcRenderer, remote } = electron;
 
@@ -157,8 +158,9 @@ document.addEventListener('DOMContentLoaded', () => {
       i18n,
       store,
       render: h => {
-        const componentName = windowsService.state[windowId].componentName;
+        if (windowId === 'child') return h(ChildWindow);
 
+        const componentName = windowsService.state[windowId].componentName;
         return h(windowsService.components[componentName]);
       }
     });
diff --git a/app/components/ApiSettings.vue b/app/components/ApiSettings.vue
index d44a763d2998..456ccf8a67ed 100644
--- a/app/components/ApiSettings.vue
+++ b/app/components/ApiSettings.vue
@@ -7,13 +7,15 @@
     </div>
 
     <div class="section">
-      <ObsTextInput :value="tokenInput">
-        <button
-            class="button button--default button--input"
-            @click="generateToken">
-          Update
-        </button>
-      </ObsTextInput>
+      <div class="section-content">
+        <ObsTextInput :value="tokenInput">
+          <button
+              class="button button--default"
+              @click="generateToken">
+            Update
+          </button>
+        </ObsTextInput>
+      </div>
     </div>
 
 
diff --git a/app/components/AppearanceSettings.vue b/app/components/AppearanceSettings.vue
index 27d2bc0e3d70..5416d5806d3a 100644
--- a/app/components/AppearanceSettings.vue
+++ b/app/components/AppearanceSettings.vue
@@ -1,7 +1,9 @@
 <template>
   <div>
     <div class="section">
-      <GenericForm v-model="settingsFormData" @input="saveSettings" />
+      <div class="section-content">
+        <GenericForm v-model="settingsFormData" @input="saveSettings" />
+      </div>
     </div>
   </div>
 </template>
diff --git a/app/components/ExperimentalSettings.vue b/app/components/ExperimentalSettings.vue
index 8e8625da2ab5..51ce7b5e7d5c 100644
--- a/app/components/ExperimentalSettings.vue
+++ b/app/components/ExperimentalSettings.vue
@@ -1,11 +1,8 @@
 <template>
   <div>
     <div class="section">
-    </div>
-
-    <!--<div class="section">-->
       <!--<GenericForm v-model="settingsFormData" @input="saveSettings" />-->
-    <!--</div>-->
+    </div>
 
   </div>
 </template>
diff --git a/app/components/HotkeyGroup.vue b/app/components/HotkeyGroup.vue
index 29f133e9619d..5a037eb9718f 100644
--- a/app/components/HotkeyGroup.vue
+++ b/app/components/HotkeyGroup.vue
@@ -1,15 +1,19 @@
 <template>
 <div class="section">
-  <div class="section-title--dropdown">
+  <div
+    class="section-title section-title--dropdown"
+    v-if="title"
+    :class="{ 'section-title--opened': !collapsed }"
+  >
     <h4
       v-if="title"
       @click="collapsed = !collapsed">
       <i
         v-if="collapsed === true"
-        class="icon-plus"/>
+        class="icon-plus section-title__icon"/>
       <i
         v-if="collapsed === false"
-        class="icon-minus"/>
+        class="icon-minus section-title__icon"/>
       {{ title }}
     </h4>
   </div>
diff --git a/app/components/LanguageSettings.vue b/app/components/LanguageSettings.vue
index 7705f17793c3..eef01b8ef272 100644
--- a/app/components/LanguageSettings.vue
+++ b/app/components/LanguageSettings.vue
@@ -1,6 +1,8 @@
 <template>
 <div class="section">
-  <GenericForm :value="settings" @input="save"></GenericForm>
+  <div class="section-content">
+    <GenericForm :value="settings" @input="save"></GenericForm>
+  </div>
 </div>
 </template>
 
diff --git a/app/components/Login.vue.ts b/app/components/Login.vue.ts
index d972e0130951..19f3c3cb8ac5 100644
--- a/app/components/Login.vue.ts
+++ b/app/components/Login.vue.ts
@@ -9,7 +9,6 @@ import electron from 'electron';
 @Component({})
 export default class Login extends Vue {
   @Inject() userService: UserService;
-  @Inject() onboardingService: OnboardingService;
 
   get loggedIn() {
     return this.userService.isLoggedIn();
@@ -35,7 +34,7 @@ export default class Login extends Vue {
   }
 
   login() {
-    this.onboardingService.start({ isLogin: true });
+    this.userService.showLogin();
   }
 
   openUserpage() {
diff --git a/app/components/NotificationsSettings.vue b/app/components/NotificationsSettings.vue
index 4efd29e7688c..5140179157e8 100644
--- a/app/components/NotificationsSettings.vue
+++ b/app/components/NotificationsSettings.vue
@@ -9,7 +9,9 @@
       </button>
     </div>
     <div class="section">
-      <GenericForm v-model="settingsFormData" @input="saveNotificationsSettings" />
+      <div class="section-content">
+        <GenericForm v-model="settingsFormData" @input="saveNotificationsSettings" />
+      </div>
     </div>
     <div class="section">
       <h4>
diff --git a/app/components/Tabs.vue b/app/components/Tabs.vue
index 7664f6ab6659..80fc2176f349 100644
--- a/app/components/Tabs.vue
+++ b/app/components/Tabs.vue
@@ -36,6 +36,6 @@
 }
 
 .tab-content {
-  padding-top: 60px;
+  padding-top: 54px;
 }
 </style>
diff --git a/app/components/obs/inputs/ObsInput.ts b/app/components/obs/inputs/ObsInput.ts
index cddd35c90150..f630c16da3f0 100644
--- a/app/components/obs/inputs/ObsInput.ts
+++ b/app/components/obs/inputs/ObsInput.ts
@@ -496,18 +496,6 @@ export function setupConfigurableDefaults(
       defaultSettings[obsProp.name] = items[0].value;
       continue;
     }
-
-    let validItem = false;
-
-    /* If there is a setting, make sure it's a valid item */
-    for (let i = 0; i < items.length; ++i) {
-      if (settings[obsProp.name] === items[i].value) {
-        validItem = true;
-        break;
-      }
-    }
-
-    if (!validItem) defaultSettings[obsProp.name] = items[0].value;
   } while ((obsProp = obsProp.next()));
   const needUpdate = Object.keys(defaultSettings).length > 0;
   if (needUpdate) configurable.update(defaultSettings);
diff --git a/app/components/pages/Onboarding.vue b/app/components/pages/Onboarding.vue
index 3b27e61aabeb..2ebd777d94b8 100644
--- a/app/components/pages/Onboarding.vue
+++ b/app/components/pages/Onboarding.vue
@@ -20,10 +20,7 @@
   .button--lg {
     width: 300px;
     padding: 0 0;
-    font-size: 12px;
-    letter-spacing: 1px;
-    font-weight: normal;
-    margin-top: 15px;
+    margin-top: 16px;
   }
 }
 
@@ -59,7 +56,6 @@
   color: @text-primary;
   font-size: 22px;
   margin-bottom: 20px;
-  letter-spacing: .5px;
 }
 
 .onboarding-title--sm {
@@ -85,7 +81,8 @@
 
   a {
     text-decoration: underline;
-    transition: all 275ms;
+    .transition();
+
     &:hover {
       color: @white;
     }
@@ -146,7 +143,7 @@
   top: 0;
   height: 240px;
   width: auto;
-  margin: 15px 0;
+  margin: 16px 0;
 
   img {
     height: 100%;
diff --git a/app/components/pages/Studio.vue b/app/components/pages/Studio.vue
index a2fa7ffd428d..2bf82e2c30b9 100644
--- a/app/components/pages/Studio.vue
+++ b/app/components/pages/Studio.vue
@@ -65,7 +65,6 @@
   flex-grow: 1;
   background-color: @bg-tertiary;
   display: flex;
-  align-items: center;
   justify-content: center;
 
   .message {
diff --git a/app/components/pages/onboarding_steps/SceneCollectionsImport.vue b/app/components/pages/onboarding_steps/SceneCollectionsImport.vue
index b6b9ba564e24..9eaaf61e286c 100644
--- a/app/components/pages/onboarding_steps/SceneCollectionsImport.vue
+++ b/app/components/pages/onboarding_steps/SceneCollectionsImport.vue
@@ -23,11 +23,11 @@
 @import "../../../styles/_colors";
 
 .scene-collections-list {
-  margin: 0;
+  margin-left: 0;
   padding: 10px;
   width: 100%;
   height: 200px;
-  color: white;
+  color: @white;
   list-style: none;
   overflow: auto;
   border-radius: 3px;
diff --git a/app/components/shared/DropdownMenu.vue b/app/components/shared/DropdownMenu.vue
index 19ee8eb2057b..b51ff49d0677 100644
--- a/app/components/shared/DropdownMenu.vue
+++ b/app/components/shared/DropdownMenu.vue
@@ -8,7 +8,7 @@
     </div>
 
     <button slot="reference" class="dropdown-menu__toggle">
-      <span class="scene-name">{{ title }}</span><i class="icon-down-arrow"/>
+      <span class="scene-name">{{ title }}</span><i :class="icon || 'icon-down-arrow'"/>
     </button>
 
   </popper>
@@ -68,6 +68,9 @@
 
 .dropdown-menu__item {
   white-space: nowrap;
+  max-width: 300px;
+  overflow: hidden;
+  text-overflow: ellipsis;
   cursor: pointer;
   color: @text-secondary;
 
diff --git a/app/components/shared/HelpTip.vue b/app/components/shared/HelpTip.vue
index 90172f31f6c0..cf1597108316 100644
--- a/app/components/shared/HelpTip.vue
+++ b/app/components/shared/HelpTip.vue
@@ -46,7 +46,7 @@
   font-size: 20px;
   cursor: pointer;
   opacity: .6;
-  .transition;
+  .transition();
 
   &:hover {
     opacity: 1;
diff --git a/app/components/shared/Hotkey.vue b/app/components/shared/Hotkey.vue
index 5b60dccd73a4..3c8acc889141 100644
--- a/app/components/shared/Hotkey.vue
+++ b/app/components/shared/Hotkey.vue
@@ -26,6 +26,8 @@
 <script lang="ts" src="./Hotkey.vue.ts"></script>
 
 <style lang="less" scoped>
+@import "../../styles/index";
+
 .hotkey {
   display: flex;
   flex-direction: row;
@@ -55,8 +57,9 @@
   }
 }
 
-.bindings-enter-active, .bindings-leave-active {
-  transition: all 0.2s;
+.bindings-enter-active,
+.bindings-leave-active {
+  .transition();
 }
 
 .bindings-enter, .bindings-leave-to {
diff --git a/app/components/shared/NavItem.vue b/app/components/shared/NavItem.vue
index 2d3eb1138169..220a2ef17bef 100644
--- a/app/components/shared/NavItem.vue
+++ b/app/components/shared/NavItem.vue
@@ -32,7 +32,7 @@
     .semibold;
 
     i {
-       color: @text-primary;
+      color: @text-primary;
     }
   }
 
@@ -47,8 +47,8 @@
 
   i {
     position: relative;
-    margin-right: -15px;
-    left: -25px;
+    margin-right: -16px;
+    left: -24px;
     width: 16px;
   }
 }
diff --git a/app/components/shared/inputs/ColorInput.vue b/app/components/shared/inputs/ColorInput.vue
index d65ff3de9ccb..ce2a227d66ca 100644
--- a/app/components/shared/inputs/ColorInput.vue
+++ b/app/components/shared/inputs/ColorInput.vue
@@ -3,22 +3,17 @@
 
     <div class="input-wrapper">
       <div class="colorpicker">
-        <div class="input-container">
+        <div
+            class="colorpicker__text"
+            @click="togglePicker">
+          <input
+              class="colorpicker__input"
+              type="text"
+              readonly
+              :value="value">
           <div
-              class="colorpicker__text"
-              @click="togglePicker">
-            <input
-                class="colorpicker__input"
-                type="text"
-                readonly
-                :value="value">
-            <div
-                class="colorpicker__swatch"
-                :style="swatchStyle"/>
-          </div>
-          <div v-if="metadata && metadata.tooltip" class="w-tooltip">
-            <i class="icon-question icon-btn" v-tooltip="metadata.tooltip" />
-          </div>
+              class="colorpicker__swatch"
+              :style="swatchStyle"/>
         </div>
         <color-picker
             :value="{hex: value}"
@@ -39,11 +34,6 @@
     width: 220px;
   }
 
-  .input-container {
-    display: flex;
-    align-items: center;
-  }
-
   .colorpicker__text {
     position: relative;
     cursor: pointer;
diff --git a/app/components/shared/inputs/FontFamilyInput.vue b/app/components/shared/inputs/FontFamilyInput.vue
index 4a59adfe9f9e..f77f15a89daa 100644
--- a/app/components/shared/inputs/FontFamilyInput.vue
+++ b/app/components/shared/inputs/FontFamilyInput.vue
@@ -6,9 +6,6 @@
       :options="fonts">
     </multiselect>
   </div>
-  <div class="w-tooltip">
-    <i class="icon-question icon-btn" :v-tooltip="tooltipText" />
-  </div>
 </div>
 </template>
 
diff --git a/app/components/shared/inputs/FontFamilyInput.vue.ts b/app/components/shared/inputs/FontFamilyInput.vue.ts
index b48925c90bb0..09ddffe2b97f 100644
--- a/app/components/shared/inputs/FontFamilyInput.vue.ts
+++ b/app/components/shared/inputs/FontFamilyInput.vue.ts
@@ -10,10 +10,5 @@ import { IInputMetadata } from './index';
 export default class FontFamilyInput extends BaseInput<string, IInputMetadata> {
   @Prop() value: string;
 
-  tooltipText = $t(
-    'The Google Font to use for the text. Visit http://google.com/fonts to find one!'
-    + 'Popular Fonts include: Open Sans, Roboto, Oswald, Lato, and Droid Sans.'
-  );
-
   fonts: string[] = [];
 }
diff --git a/app/components/shared/inputs/FontSize.vue b/app/components/shared/inputs/FontSize.vue
index f9529dddad2e..df34463ec04f 100644
--- a/app/components/shared/inputs/FontSize.vue
+++ b/app/components/shared/inputs/FontSize.vue
@@ -1,7 +1,5 @@
 <template>
-  <div>
-    <slider-input :metadata="sliderOptions" :value="sliderValue" @input="value => updateValue(value)"/>
-  </div>
+  <slider-input :metadata="sliderOptions" :value="sliderValue" @input="value => updateValue(value)"/>
 </template>
 
 <script lang="ts" src="./FontSize.vue.ts"></script>
diff --git a/app/components/shared/inputs/FormGroup.vue b/app/components/shared/inputs/FormGroup.vue
index d4a0a41692af..fc40fad203b9 100644
--- a/app/components/shared/inputs/FormGroup.vue
+++ b/app/components/shared/inputs/FormGroup.vue
@@ -4,12 +4,19 @@
       {{ options.title }}
     </div>
     <div class="col-xs-8">
-      <form-input
-         :value="value"
-         :metadata="formInputMetadata"
-         @input="value => $emit('input', value)"
-      />
-      <slot v-if="!type"></slot>
+      <div class="input-container">
+        <form-input
+          :value="value"
+          :metadata="formInputMetadata"
+          @input="value => $emit('input', value)"
+        />
+        <div v-if="!type" class="slots">
+          <slot></slot>
+        </div>
+        <div v-if="options.tooltip" class="tooltip">
+          <i class="icon-question icon-btn" v-tooltip="metadata.tooltip" />
+        </div>
+      </div>
       <div v-if="options.description" class="whisper">
         {{ options.description }}
       </div>
@@ -21,8 +28,26 @@
 <script lang="ts" src="./FormGroup.vue.ts"></script>
 
 <style lang="less" scoped>
-  .row {
-    margin-bottom: 20px;
+  @import "../../../styles/index";
+
+  .input-container {
+    display: flex;
+    align-items: center;
+    width: 100%;
+    justify-content: flex-start;
+  }
+
+  .slots {
+    width: 100%;
+  }
+
+  .tooltip {
+    position: relative;
+    margin-left: 8px;
+    font-size: 16px;
+    align-self: center;
+    display: inline-block;
+    color: @icon;
   }
 
   .whisper {
diff --git a/app/components/shared/inputs/FormGroup.vue.ts b/app/components/shared/inputs/FormGroup.vue.ts
index 2a26dfe0c788..415b4bdf6081 100644
--- a/app/components/shared/inputs/FormGroup.vue.ts
+++ b/app/components/shared/inputs/FormGroup.vue.ts
@@ -1,5 +1,4 @@
 import { Component, Prop } from 'vue-property-decorator';
-import { Multiselect } from 'vue-multiselect';
 import { EInputType, IInputMetadata } from './index';
 import { BaseInput } from './BaseInput';
 import FormInput from './FormInput.vue';
@@ -31,6 +30,7 @@ export default class FormGroup extends BaseInput<any, IInputMetadata> {
     // FormGroup handle the render of the FormInput title
     // so remove the title from FormInput metadata
     delete inputMetadata.title;
+    delete inputMetadata.tooltip;
     return inputMetadata;
   }
 
@@ -41,5 +41,4 @@ export default class FormGroup extends BaseInput<any, IInputMetadata> {
     return options;
   }
 
-
 }
diff --git a/app/components/shared/inputs/ImagePickerInput.vue b/app/components/shared/inputs/ImagePickerInput.vue
new file mode 100644
index 000000000000..d235deabe777
--- /dev/null
+++ b/app/components/shared/inputs/ImagePickerInput.vue
@@ -0,0 +1,66 @@
+<template>
+<div class="container">
+  <div
+    v-for="option in metadata.options"
+    :key="option.value"
+    class="image-container radius"
+    :class="[value === option.value ? 'active' : '']"
+    @click="emitInput(option.value)"
+  >
+    <img :src="option.description" >
+  </div>
+</div>
+</template>
+
+<script lang="ts" src="./ImagePickerInput.vue.ts"></script>
+
+<style lang="less" scoped>
+@import "../../../styles/index";
+
+.container {
+  width: 370px;
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.image-container {
+  width: 80px;
+  height: 80px;
+  border: 1px solid @day-input-border;
+  margin: 2px;
+  transition: all .1s linear;
+  position: relative;
+
+  &:hover {
+    border-color: @teal-light-opac;
+    cursor: pointer;
+  }
+
+  img {
+    height: 70px;
+    width: auto;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+  }
+
+  &.active {
+    background-color: @teal-light-opac;
+    border-color: @teal-med-opac;
+  }
+}
+
+.night-theme {
+  .image-container {
+    border-color: @night-border;
+
+    &:hover {
+      border-color: @teal-light-opac;
+    }
+    &.active {
+      border-color: @teal-med-opac;
+    }
+  }
+}
+</style>
diff --git a/app/components/shared/inputs/ImagePickerInput.vue.ts b/app/components/shared/inputs/ImagePickerInput.vue.ts
new file mode 100644
index 000000000000..c44bbaedd89f
--- /dev/null
+++ b/app/components/shared/inputs/ImagePickerInput.vue.ts
@@ -0,0 +1,13 @@
+import { Component, Prop } from 'vue-property-decorator';
+import { BaseInput } from './BaseInput';
+import { IListOption } from './index';
+
+@Component({})
+export default class ImagePickerInput extends BaseInput<string, IListOption<string>> {
+
+  @Prop({ default: '' })
+  value: string;
+
+  @Prop({ default: {} })
+  metadata: IListOption<string>;
+}
diff --git a/app/components/shared/inputs/NumberInput.vue b/app/components/shared/inputs/NumberInput.vue
index 52ee7ed10125..ef5725a7cb14 100644
--- a/app/components/shared/inputs/NumberInput.vue
+++ b/app/components/shared/inputs/NumberInput.vue
@@ -8,9 +8,7 @@
         :name="uuid"
         v-validate="validate"
     />
-    <div v-if="metadata && metadata.tooltip" class="w-tooltip">
-      <i class="icon-question icon-btn" v-tooltip="metadata.tooltip" />
-    </div>
+
     <span class="input-error" v-show="errors.first(uuid)">
       {{ errors.first(uuid) }}
     </span>
@@ -22,11 +20,7 @@
 <style lang="less" scoped>
   .number-input {
     position: relative;
-    display: flex;
 
-    input {
-      width: 220px;
-    }
     .input-error {
       position: absolute;
       white-space: nowrap;
diff --git a/app/components/shared/inputs/SliderInput.vue b/app/components/shared/inputs/SliderInput.vue
index ed26ead5d5f0..937645b2d62b 100644
--- a/app/components/shared/inputs/SliderInput.vue
+++ b/app/components/shared/inputs/SliderInput.vue
@@ -1,39 +1,34 @@
 <template>
-<div>
-  <div class="w-form-group__wrapper slider-container">
-    <vue-slider class="slider w-form-group__input"
-      :value="value"
-      @input="value => updateValue(value)"
-      :max="options.max"
-      :min="options.min"
-      :interval="options.interval"
-      :speed="0"
-      :height="4"
-      :formatter="formatter"
-      :piecewise="!!options.interval"
-      ref="slider"
-      :piecewiseStyle="{
-          position: 'absolute',
-          'backgroundColor': nightMode ? '#253239' : '#eaecee',
-          height: '2px',
-          width: '2px',
-          'borderRadius': '1px',
-          top: '12px'
-      }"
-      :piecewiseActiveStyle="{ backgroundColor: '#3c4c53' }"
-    />
-    <input
-      v-if="options.hasValueBox && !options.usePercentages"
-      class="slider-input"
-      type="text"
-      :value="value"
-      @change="updateValue(parseFloat($event.target.value))"
-      @keydown="handleKeydown"
-    />
-    <div v-if="options.tooltip" class="w-tooltip">
-      <i class="icon-question icon-btn" v-tooltip="metadata.tooltip" />
-    </div>
-  </div>
+<div class="w-form-group__wrapper slider-container">
+  <vue-slider class="slider w-form-group__input"
+    :value="value"
+    @input="value => updateValue(value)"
+    :max="options.max"
+    :min="options.min"
+    :interval="options.interval"
+    :speed="0"
+    :height="4"
+    :formatter="formatter"
+    :piecewise="!!options.interval"
+    ref="slider"
+    :piecewiseStyle="{
+        position: 'absolute',
+        'backgroundColor': nightMode ? '#253239' : '#eaecee',
+        height: '2px',
+        width: '2px',
+        'borderRadius': '1px',
+        top: '12px'
+    }"
+    :piecewiseActiveStyle="{ backgroundColor: '#3c4c53' }"
+  />
+  <input
+    v-if="options.hasValueBox && !options.usePercentages"
+    class="slider-input"
+    type="text"
+    :value="value"
+    @change="updateValue(parseFloat($event.target.value))"
+    @keydown="handleKeydown"
+  />
 </div>
 </template>
 
@@ -46,7 +41,6 @@
   width: 100%;
   display: flex;
   position: relative;
-  align-items: center;
 }
 
 .slider-input {
diff --git a/app/components/shared/inputs/TextInput.vue b/app/components/shared/inputs/TextInput.vue
index fd90f2c1316e..cabd746f1fd2 100644
--- a/app/components/shared/inputs/TextInput.vue
+++ b/app/components/shared/inputs/TextInput.vue
@@ -20,12 +20,14 @@
 <script lang="ts" src="./TextInput.vue.ts"></script>
 
 <style lang="less" scoped>
+  @import "../../../styles/index";
+
   .text-input {
     position: relative;
     width: 75%;
     display: flex;
     .input-error {
-      position: absolute;
+      .absolute(100%);
       white-space: nowrap;
     }
   }
diff --git a/app/components/shared/inputs/ValidatedForm.vue.ts b/app/components/shared/inputs/ValidatedForm.vue.ts
index 55ea80757eaf..f23564a8302d 100644
--- a/app/components/shared/inputs/ValidatedForm.vue.ts
+++ b/app/components/shared/inputs/ValidatedForm.vue.ts
@@ -10,9 +10,14 @@ import { IInputMetadata } from './index';
 @Component({})
 export default class ValidatedForm extends Vue {
 
-  getInputs(): BaseInput<any, IInputMetadata>[] {
-    return this.$children
-      .filter(child => child instanceof BaseInput) as BaseInput<any, IInputMetadata>[];
+  getInputs(children?: Vue[]): BaseInput<any, IInputMetadata>[] {
+    children = children || this.$children;
+    const inputs: BaseInput<any, IInputMetadata>[] = [];
+    children.forEach(child => {
+      if (child instanceof BaseInput) inputs.push(child);
+      if (child.$children.length) inputs.push(...this.getInputs(child.$children));
+    });
+    return inputs;
   }
 
   /**
diff --git a/app/components/shared/inputs/index.ts b/app/components/shared/inputs/index.ts
index 402a7ac8e3ef..2023ce6701d9 100644
--- a/app/components/shared/inputs/index.ts
+++ b/app/components/shared/inputs/index.ts
@@ -23,9 +23,9 @@ export enum EInputType {
 export interface IInputMetadata {
   required?: boolean;
   description?: string;
-  hint?: string;
   type?: EInputType;
   title?: string;
+  tooltip?: string;
 }
 
 export interface INumberMetadata extends IInputMetadata {
@@ -58,6 +58,11 @@ export interface IListOption<TValue> {
   description?: string;
 }
 
+export interface IMediaGalleryMetadata extends IInputMetadata {
+  fileName: string;
+  clearImage: string;
+}
+
 // a helper for creating metadata
 export const metadata = {
   bool: (options: IInputMetadata) => ({ type: EInputType.bool, ...options } as IInputMetadata),
diff --git a/app/components/shared/inputs/inputs.ts b/app/components/shared/inputs/inputs.ts
index b2a52751da7b..efbb39473184 100644
--- a/app/components/shared/inputs/inputs.ts
+++ b/app/components/shared/inputs/inputs.ts
@@ -9,4 +9,4 @@ export { default as TextAreaInput } from './TextAreaInput.vue';
 export { default as BoolInput } from './BoolInput.vue';
 export { default as CodeInput } from './CodeInput.vue';
 export { default as FormInput } from './FormInput.vue';
-
+export { default as ImagePickerInput } from './ImagePickerInput.vue';
diff --git a/app/components/windows/ChildWindow.vue b/app/components/windows/ChildWindow.vue
new file mode 100644
index 000000000000..8aa6bf23091f
--- /dev/null
+++ b/app/components/windows/ChildWindow.vue
@@ -0,0 +1,12 @@
+<template>
+<div style="height: 100%">
+    <!--
+        we use 2 components for situation when we need to open a new window and
+        save the previous window-component state
+    -->
+    <component v-if="components[0].name" v-show="components[0].isShown" :is="components[0].name"/>
+    <component v-if="components[1].name" v-show="components[1].isShown" :is="components[1].name"/>
+</div>
+</template>
+
+<script lang="ts" src="./ChildWindow.vue.ts"></script>
diff --git a/app/components/windows/ChildWindow.vue.ts b/app/components/windows/ChildWindow.vue.ts
new file mode 100644
index 000000000000..57c4185b1dc4
--- /dev/null
+++ b/app/components/windows/ChildWindow.vue.ts
@@ -0,0 +1,73 @@
+import Vue from 'vue';
+import { Component } from 'vue-property-decorator';
+import { Inject } from 'util/injector';
+import { getComponents, WindowsService } from 'services/windows';
+
+
+@Component({
+  components: {
+    ...getComponents()
+  }
+})
+export default class ChildWindow extends Vue {
+  @Inject() private windowsService: WindowsService;
+
+
+  activeComponentInd = 0;
+
+  components = [
+    { name: this.options.componentName, isShown: this.options.isShown},
+    { name: '', isShown: false},
+  ];
+
+
+  private widowUpdatedSubscr = this.windowsService.windowUpdated.subscribe(params => {
+    if (params.windowId !== 'child') return;
+    this.onWindowUpdatedHandler();
+  });
+
+  get options() {
+    return this.windowsService.state.child;
+  }
+
+  get componentName() {
+    return this.options.componentName;
+  }
+  //
+  // destroy() {
+  //   this.widowUpdatedSubscr.unsubscribe();
+  // }
+
+  destroy() {
+    this.widowUpdatedSubscr.unsubscribe();
+  }
+
+  private onWindowUpdatedHandler() {
+    if (!this.options.isShown) {
+      this.components = [
+        { name: '', isShown: false},
+        { name: '', isShown: false},
+      ];
+      this.activeComponentInd = 0;
+    } else if (this.options.preservePrevWindow) {
+      this.components[this.activeComponentInd].isShown = false;
+      this.activeComponentInd++;
+      if (this.activeComponentInd > 1 ) this.activeComponentInd = 0;
+    } else if (this.options.isPreserved) {
+      this.$set(this.components, this.activeComponentInd, {
+        name: '',
+        isShown: false
+      });
+      this.activeComponentInd--;
+      if (this.activeComponentInd < 0) this.activeComponentInd = 1;
+      this.components[this.activeComponentInd].isShown = true;
+      return;
+    }
+
+    this.$set(this.components, this.activeComponentInd, {
+      name: this.options.componentName,
+      isShown: this.options.isShown
+    });
+
+  }
+}
diff --git a/app/components/windows/Settings.vue b/app/components/windows/Settings.vue
index 384a9dec7747..959580ce8427 100644
--- a/app/components/windows/Settings.vue
+++ b/app/components/windows/Settings.vue
@@ -100,7 +100,8 @@
   .input-container {
     flex-direction: column;
 
-    .input-label, .input-wrapper {
+    .input-label,
+    .input-wrapper {
       width: 100%;
     }
 
diff --git a/app/services/sources/sources.ts b/app/services/sources/sources.ts
index 55516baba9fe..d486c868203a 100644
--- a/app/services/sources/sources.ts
+++ b/app/services/sources/sources.ts
@@ -412,6 +412,7 @@ export class SourcesService extends StatefulService<ISourcesState> implements IS
   showNameSource(sourceType: TSourceType, propertiesManager?: TPropertiesManager) {
     this.windowsService.showWindow({
       componentName: 'NameSource',
+      preservePrevWindow: true,
       queryParams: { sourceType, propertiesManager },
       size: {
         width: 400,
diff --git a/app/services/user.ts b/app/services/user.ts
index f0a83c13053c..6783d101ba93 100644
--- a/app/services/user.ts
+++ b/app/services/user.ts
@@ -5,7 +5,6 @@ import { PersistentStatefulService } from 'services/persistent-stateful-service'
 import { Inject } from 'util/injector';
 import { mutation } from 'services/stateful-service';
 import electron from 'electron';
-import { HostsService } from './hosts';
 import {
   getPlatformService,
   IPlatformAuth,
@@ -13,7 +12,6 @@ import {
   IPlatformService,
   IStreamingSetting
 } from './platforms';
-import { CustomizationService } from 'services/customization';
 import Raven from 'raven-js';
 import { AppService } from 'services/app';
 import { SceneCollectionsService } from 'services/scene-collections';
@@ -21,7 +19,6 @@ import { Subject } from 'rxjs/Subject';
 import { Observable } from 'rxjs/Observable';
 import { mergeStatic } from 'rxjs/operator/merge';
 import { WindowsService } from 'services/windows';
-import { SettingsService } from 'services/settings';
 import {
   cpu as systemInfoCpu,
   graphics as systemInfoGraphics,
@@ -36,6 +33,7 @@ import {
 } from 'os';
 import { memoryUsage as nodeMemUsage } from 'process';
 import uuid from 'uuid/v4';
+import { OnboardingService } from './onboarding';
 
 // Eventually we will support authing multiple platforms at once
 interface IUserServiceState {
@@ -43,12 +41,10 @@ interface IUserServiceState {
 }
 
 export class UserService extends PersistentStatefulService<IUserServiceState> {
-  @Inject() hostsService: HostsService;
-  @Inject() customizationService: CustomizationService;
-  @Inject() appService: AppService;
-  @Inject() sceneCollectionsService: SceneCollectionsService;
-  @Inject() windowsService: WindowsService;
-  @Inject() settingsService: SettingsService;
+  @Inject() private appService: AppService;
+  @Inject() private sceneCollectionsService: SceneCollectionsService;
+  @Inject() private windowsService: WindowsService;
+  @Inject() private onboardingService: OnboardingService;
 
   @mutation()
   LOGIN(auth: IPlatformAuth) {
@@ -176,6 +172,11 @@ export class UserService extends PersistentStatefulService<IUserServiceState> {
     }
   }
 
+  async showLogin() {
+    if (this.isLoggedIn()) await this.logOut();
+    this.onboardingService.start({ isLogin: true });
+  }
+
   private async login(service: IPlatformService, auth: IPlatformAuth) {
     this.LOGIN(auth);
     this.userLogin.next(auth);
diff --git a/app/services/windows.ts b/app/services/windows.ts
index d3bb471f5791..e7183ea3e035 100644
--- a/app/services/windows.ts
+++ b/app/services/windows.ts
@@ -1,5 +1,6 @@
 // This singleton class provides a renderer-space API
 // for spawning various child windows.
+import { cloneDeep } from 'lodash';
 
 import Main from 'components/windows/Main.vue';
 import Settings from 'components/windows/Settings.vue';
@@ -26,11 +27,41 @@ import { mutation, StatefulService } from 'services/stateful-service';
 import electron from 'electron';
 import Vue from 'vue';
 import Util from 'services/utils';
+import { Subject } from 'rxjs/Subject';
 
 const { ipcRenderer, remote } = electron;
 const BrowserWindow = remote.BrowserWindow;
 const uuid = window['require']('uuid/v4');
 
+// This is a list of components that are registered to be
+// top level components in new child windows.
+export function getComponents() {
+  return {
+    Main,
+    Settings,
+    SceneTransitions,
+    SourcesShowcase,
+    NameSource,
+    AddSource,
+    NameScene,
+    NameFolder,
+    SourceProperties,
+    SourceFilters,
+    AddSourceFilter,
+    Blank,
+    AdvancedAudio,
+    Notifications,
+    Troubleshooter,
+    ManageSceneCollections,
+    Projector,
+    OptimizeForNiconico,
+    CroppingOverlay,
+    NicoliveProgramSelector,
+    Informations,
+  };
+}
+
+
 export interface IWindowOptions {
   componentName: string;
   queryParams?: Dictionary<any>;
@@ -41,17 +72,27 @@ export interface IWindowOptions {
     height: number;
   };
   scaleFactor: number;
+  isShown: boolean;
   title?: string;
   center?: boolean;
   transparent?: boolean;
   resizable?: boolean;
   alwaysOnTop?: boolean;
+  isPreserved?: boolean;
+  preservePrevWindow?: boolean;
+  prevWindowOptions? : IWindowOptions;
 }
 
 interface IWindowsState {
   [windowId: string]: IWindowOptions;
 }
 
+const DEFAULT_WINDOW_OPTIONS: IWindowOptions = {
+  componentName: 'Blank',
+  scaleFactor: 1,
+  isShown: true
+};
+
 export class WindowsService extends StatefulService<IWindowsState> {
 
   /**
@@ -63,40 +104,21 @@ export class WindowsService extends StatefulService<IWindowsState> {
     main: {
       componentName: 'Main',
       scaleFactor: 1,
-      title: `${remote.process.env.NAIR_PRODUCT_NAME} - Ver: ${remote.process.env.NAIR_VERSION}`
+      title: `${remote.process.env.NAIR_PRODUCT_NAME} - Ver: ${remote.process.env.NAIR_VERSION}`,
+      isShown: true
     },
     child: {
       componentName: 'Blank',
       scaleFactor: 1,
+      isShown: false
     }
   };
 
   // This is a list of components that are registered to be
   // top level components in new child windows.
-  components = {
-    Main,
-    Settings,
-    SceneTransitions,
-    SourcesShowcase,
-    NameSource,
-    AddSource,
-    NameScene,
-    NameFolder,
-    SourceProperties,
-    SourceFilters,
-    AddSourceFilter,
-    Blank,
-    AdvancedAudio,
-    Notifications,
-    Troubleshooter,
-    ManageSceneCollections,
-    Projector,
-    OptimizeForNiconico,
-    CroppingOverlay,
-    NicoliveProgramSelector,
-    Informations,
-  };
+  components = getComponents();
 
+  windowUpdated = new Subject<{windowId: string, options:  Partial<IWindowOptions>}>();
   private windows: Dictionary<Electron.BrowserWindow> = {};
 
 
@@ -128,11 +150,24 @@ export class WindowsService extends StatefulService<IWindowsState> {
   }
 
   closeChildWindow() {
+
+    const windowOptions = this.state.child;
+
+    // show previous window if `preservePrevWindow` flag is true
+    if (windowOptions.preservePrevWindow && windowOptions.prevWindowOptions) {
+      ipcRenderer.send('window-showChildWindow', {
+        ...windowOptions.prevWindowOptions,
+        isPreserved: true
+      });
+      return;
+    }
+
+
     ipcRenderer.send('window-closeChildWindow');
 
     // This prevents you from seeing the previous contents
     // of the window for a split second after it is shown.
-    this.updateChildWindowOptions({ componentName: 'Blank' });
+    this.updateChildWindowOptions({ componentName: 'Blank', isShown: false });
 
     // Refocus the main window
     ipcRenderer.send('window-focusMain');
@@ -233,8 +268,23 @@ export class WindowsService extends StatefulService<IWindowsState> {
     return this.windows[windowId];
   }
 
-  updateChildWindowOptions(options: Partial<IWindowOptions>) {
-    this.UPDATE_CHILD_WINDOW_OPTIONS(options);
+  updateChildWindowOptions(optionsPatch: Partial<IWindowOptions>) {
+    const newOptions: IWindowOptions = { ...DEFAULT_WINDOW_OPTIONS, ...optionsPatch };
+    if (newOptions.preservePrevWindow) {
+      const currentOptions = cloneDeep(this.state.child);
+
+      if (currentOptions.preservePrevWindow) {
+        throw new Error('You can\'t use preservePrevWindow option for more that 1 window in the row');
+      }
+
+      newOptions.prevWindowOptions = currentOptions;
+
+      // restrict saving history only for 1 window before
+      delete newOptions.prevWindowOptions.prevWindowOptions;
+    }
+
+    this.SET_CHILD_WINDOW_OPTIONS(newOptions);
+    this.windowUpdated.next({ windowId: 'child', options: newOptions });
   }
 
   updateMainWindowOptions(options: Partial<IWindowOptions>) {
@@ -242,8 +292,8 @@ export class WindowsService extends StatefulService<IWindowsState> {
   }
 
   @mutation()
-  private UPDATE_CHILD_WINDOW_OPTIONS(options: Partial<IWindowOptions>) {
-    this.state.child = { ...this.state.child, ...options };
+  private SET_CHILD_WINDOW_OPTIONS(options: IWindowOptions) {
+    this.state.child = options;
   }
 
   @mutation()
diff --git a/app/styles/buttons.less b/app/styles/buttons.less
index 26eeef5c546a..c0ece16b9ece 100644
--- a/app/styles/buttons.less
+++ b/app/styles/buttons.less
@@ -229,4 +229,4 @@ button,
       background-color: transparent;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/styles/classes.less b/app/styles/classes.less
index 86114b9355d0..5d8611615fed 100644
--- a/app/styles/classes.less
+++ b/app/styles/classes.less
@@ -38,11 +38,6 @@
   width: 100%;
 }
 
-// Margins
-.margin-bot--20 {
-  margin-bottom: 20px;
-}
-
 .margin-right--20 {
   margin-right: 20px;
 }
@@ -81,10 +76,14 @@
   }
 }
 
-.text--sm {
-  font-size: 11px;
+.section-title__icon {
+  .radius();
+  .margin-right();
+  font-size: 10px;
+  padding: 4px;
+  vertical-align: text-bottom;
 }
 
-.noselect {
-  user-select: none;
+.section-content {
+  margin-bottom: -24px;
 }
diff --git a/app/styles/inputs.less b/app/styles/inputs.less
index e7719173b273..ba56160af708 100644
--- a/app/styles/inputs.less
+++ b/app/styles/inputs.less
@@ -2,6 +2,7 @@
   margin-bottom: 12px;
   position: relative;
   display: flex;
+  align-items: flex-start;
 
   &.input-container--no-label {
     width: 100%;
@@ -192,7 +193,7 @@ textarea {
   border: none;
   height: 0;
   min-height: 0;
-  .radius;
+  .radius();
 
   input[type="text"] {
     cursor: pointer;
diff --git a/app/styles/mixins.less b/app/styles/mixins.less
index 33f9cc82ae60..9cb469fd03a0 100644
--- a/app/styles/mixins.less
+++ b/app/styles/mixins.less
@@ -87,6 +87,39 @@
   margin-right: 6px;
 }
 
+// Margins
+.margin-top() {
+  margin-top: 8px;
+}
+
+.margin-right() {
+  margin-right: 8px;
+}
+
+.margin-right--16() {
+  margin-right: 16px;
+}
+
+.margin-right--24() {
+  margin-right: 24px;
+}
+
+.margin-bottom() {
+  margin-bottom: 8px;
+}
+
+.margin-bottom--16() {
+  margin-bottom: 16px;
+}
+
+.margin-bottom--24() {
+  margin-bottom: 24px;
+}
+
+.margin-left() {
+  margin-left: 8px;
+}
+
 // Paddings
 .no-padding-left {
   padding-left: 0;
diff --git a/package.json b/package.json
index 26972bd4cf30..ed72ffba80d6 100644
--- a/package.json
+++ b/package.json
@@ -14,16 +14,16 @@
     "compile:production": "yarn clear && webpack-cli --progress --mode production",
     "watch": "yarn clear && webpack-cli --watch --progress --mode development",
     "start": "electron .",
-    "clear-plugins": "rimraf plugins",
-    "package": "rimraf dist && yarn install --cwd bin && node bin/convert-to-shiftjis.js AGREEMENT && build -w --x64 --config.extraMetadata.env=production --config.extraMetadata.getlicensenair_key=%NAIR_LICENSE_API_KEY%",
-    "package:preview": "rimraf dist && build -w --x64 --config.extraMetadata.env=production --config.extraMetadata.name=\"nair-client-preview\" --config.productName=\"N Air Preview\" --config.appId=\"jp.nicovideo.n-air-app.preview\"",
-    "package:ipc": "rimraf dist && build -w --x64 --config.extraMetadata.env=production --config.extraMetadata.name=\"nair-client-ipc\" --config.productName=\"N Air IPC\" --config.appId=\"jp.nicovideo.n-air-app.ipc\"",
+    "clear-plugins": "shx rm -rf plugins",
+    "package": "shx rm -rf dist && yarn install --cwd bin && node bin/convert-to-shiftjis.js AGREEMENT && build -w --x64 --config.extraMetadata.env=production --config.extraMetadata.getlicensenair_key=%NAIR_LICENSE_API_KEY%",
+    "package:preview": "shx rm -rf dist && build -w --x64 --config.extraMetadata.env=production --config.extraMetadata.name=\"nair-client-preview\" --config.productName=\"N Air Preview\" --config.appId=\"jp.nicovideo.n-air-app.preview\"",
+    "package:ipc": "shx rm -rf dist && build -w --x64 --config.extraMetadata.env=production --config.extraMetadata.name=\"nair-client-ipc\" --config.productName=\"N Air IPC\" --config.appId=\"jp.nicovideo.n-air-app.ipc\"",
     "release": "yarn install --cwd bin && node bin/mini-release.js",
     "webfont": "yarn install --cwd bin && node bin/generate-webfont.js",
     "test": "node bin/i18n-early-check.js && tsc -p test && ava -v",
     "test:unit": "jest --silent",
     "lint": "tslint -p . -c tslint.json",
-    "clear": "rimraf bundles/media",
+    "clear": "shx rm -rf bundles/media",
     "typedoc": "typedoc --out docs/dist ./app/services --mode modules --theme ./docs/theme --readme ./docs/README.md --ignoreCompilerErrors --excludePrivate --excludeExternals --hideGenerator",
     "compile-tests": "tsc -p test",
     "screentest": "node test/screentest/runner.js",
@@ -199,6 +199,7 @@
     "pixelmatch": "^4.0.2",
     "pngjs": "^3.3.1",
     "prettier": "1.14.0",
+    "shx": "^0.3.2",
     "spectron": "^3.6.4",
     "style-loader": "^0.23.1",
     "ts-jest": "^24.0.2",
diff --git a/updater/Updater.js b/updater/Updater.js
index 23d35a34e986..3f075f5c3679 100644
--- a/updater/Updater.js
+++ b/updater/Updater.js
@@ -134,7 +134,7 @@ isUnskippable: ${this.updateState.isUnskippable}`);
       frame: true,
       closable: true,
       resizable: false,
-      show: false
+      show: false,
     });
 
     browserWindow.setMenuBarVisibility(false);
diff --git a/yarn.lock b/yarn.lock
index 735c8a18d009..f69f01826e66 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4157,7 +4157,7 @@ commander@^2.11.0, commander@~2.19.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
   integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
 
-commander@^2.12.1, commander@^2.14.1:
+commander@^2.14.1:
   version "2.16.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.16.0.tgz#f16390593996ceb4f3eeb020b31d78528f7f8a50"
   integrity sha512-sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew==
@@ -5371,6 +5371,10 @@ es6-error@^4.0.1, es6-error@^4.0.2:
   resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.0.2.tgz#eec5c726eacef51b7f6b73c20db6e1b13b069c98"
   integrity sha1-7sXHJurO9Rt/a3PCDbbhsTsGnJg=
 
+es6-object-assign@^1.0.3:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/es6-object-assign/-/es6-object-assign-1.1.0.tgz#c2c3582656247c39ea107cb1e6652b6f9f24523c"
+
 es6-promise@^4.0.5:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.4.tgz#dc4221c2b16518760bd8c39a52d8f356fc00ed29"
@@ -8277,7 +8281,7 @@ js-yaml@^3.10.0:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@^3.12.0, js-yaml@^3.7.0:
+js-yaml@^3.12.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
   dependencies:
@@ -8823,20 +8827,15 @@ lodash.throttle@^4.0.0:
   resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
   integrity sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=
 
-lodash@^4.0.0, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.8.0:
-  version "4.17.4"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
+lodash@^4.0.0, lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.8.0, lodash@~4.17.10:
+  version "4.17.10"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
 
-lodash@^4.13.1, lodash@^4.17.11:
+lodash@^4.17.11:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
   integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
 
-lodash@^4.17.10, lodash@~4.17.10:
-  version "4.17.10"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
-  integrity sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==
-
 log-symbols@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
@@ -11594,11 +11593,29 @@ shelljs@^0.7.0:
     interpret "^1.0.0"
     rechoir "^0.6.2"
 
+shelljs@^0.8.1:
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.3.tgz#a7f3319520ebf09ee81275b2368adb286659b097"
+  integrity sha512-fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A==
+  dependencies:
+    glob "^7.0.0"
+    interpret "^1.0.0"
+    rechoir "^0.6.2"
+
 shellwords@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
   integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
 
+shx@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/shx/-/shx-0.3.2.tgz#40501ce14eb5e0cbcac7ddbd4b325563aad8c123"
+  integrity sha512-aS0mWtW3T2sHAenrSrip2XGv39O9dXIFUqxAEWHEOS1ePtGIBavdPJY1kE2IHl14V/4iCbUiNDPGdyYTtmhSoA==
+  dependencies:
+    es6-object-assign "^1.0.3"
+    minimist "^1.2.0"
+    shelljs "^0.8.1"
+
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
@@ -12640,10 +12657,10 @@ tslib@^1.6.1:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.7.1.tgz#bc8004164691923a79fe8378bbeb3da2017538ec"
   integrity sha1-vIAEFkaRkjp5/oN4u+s9ogF1OOw=
 
-tslib@^1.8.0:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.8.1.tgz#6946af2d1d651a7b1863b531d6e5afa41aa44eac"
-  integrity sha1-aUavLR1lGnsYY7Ux1uWvpBqkTqw=
+tslib@^1.7.1:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
+  integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
 
 tslib@^1.8.1:
   version "1.9.3"
@@ -12687,9 +12704,10 @@ tslint@^5.8.0:
     tslib "^1.7.1"
     tsutils "^2.12.1"
 
-tsutils@^2.27.2:
+tsutils@^2.12.1:
   version "2.29.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
+  integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==
   dependencies:
     tslib "^1.8.1"
 
@@ -12760,9 +12778,10 @@ typedoc@^0.9.0:
     typedoc-default-themes "^0.5.0"
     typescript "2.4.1"
 
-typescript@2.7.2:
-  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.7.2.tgz#2d615a1ef4aee4f574425cdff7026edf81919836"
+typescript@2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.4.1.tgz#c3ccb16ddaa0b2314de031e7e6fee89e5ba346bc"
+  integrity sha1-w8yxbdqgsjFN4DHn5v7onlujRrw=
 
 typescript@^3.4.5:
   version "3.4.5"
@@ -13670,6 +13689,14 @@ yargs-parser@10.x, yargs-parser@^10.1.0:
   dependencies:
     camelcase "^4.1.0"
 
+yargs-parser@^11.1.1:
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
+  integrity sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
 yargs@^12.0.1:
   version "12.0.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.1.tgz#6432e56123bb4e7c3562115401e98374060261c2"
@@ -13739,7 +13766,7 @@ yup@^0.27.0:
     synchronous-promise "^2.0.6"
     toposort "^2.0.2"
 
-zip-stream@^1.1.0, zip-stream@^1.2.0:
+zip-stream@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-1.2.0.tgz#a8bc45f4c1b49699c6b90198baacaacdbcd4ba04"
   integrity sha1-qLxF9MG0lpnGuQGYuqyqzbzUugQ=