diff --git a/package.json b/package.json
index d30176d81ba..a5c7de50a3a 100644
--- a/package.json
+++ b/package.json
@@ -43,6 +43,7 @@
     "typescript": "^3.1.3",
     "typescript-eslint-parser": "^20.0.0",
     "typestrict": "^1.0.1",
-    "vue": "^2.5.17"
+    "vue": "^2.5.21",
+    "vue-template-compiler": "^2.5.21"
   }
 }
diff --git a/packages/api-generator/package.json b/packages/api-generator/package.json
index 8c5e3775d9f..3144dd9aac6 100755
--- a/packages/api-generator/package.json
+++ b/packages/api-generator/package.json
@@ -12,7 +12,6 @@
   "license": "ISC",
   "dependencies": {
     "deepmerge": "^2.2.1",
-    "vue": "^2.5.16",
     "vuetify": "^1.3.13"
   },
   "devDependencies": {
diff --git a/packages/vuetify/package.json b/packages/vuetify/package.json
index f2e2465e47d..f5b976aac66 100644
--- a/packages/vuetify/package.json
+++ b/packages/vuetify/package.json
@@ -77,7 +77,6 @@
     "url-loader": "^1.1.2",
     "vue-loader": "^15.4.2",
     "vue-router": "^3.0.1",
-    "vue-template-compiler": "^2.5.17",
     "vue-template-es2015-compiler": "^1.6.0",
     "vuetify-loader": "^0.2.0",
     "webpack": "^4.23.1",
@@ -86,7 +85,7 @@
     "webpack-merge": "^4.1.4"
   },
   "peerDependencies": {
-    "vue": "^2.5.10"
+    "vue": "^2.5.18"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/vuetify/src/components/VAlert/VAlert.ts b/packages/vuetify/src/components/VAlert/VAlert.ts
index e3e0875a8bb..56c382eae2f 100644
--- a/packages/vuetify/src/components/VAlert/VAlert.ts
+++ b/packages/vuetify/src/components/VAlert/VAlert.ts
@@ -90,7 +90,7 @@ export default mixins(Colorable, Toggleable, Transitionable).extend({
       directives: [{
         name: 'show',
         value: this.isActive
-      }] as any,
+      }],
       on: this.$listeners
     }), children)
 
diff --git a/packages/vuetify/src/components/VBadge/VBadge.ts b/packages/vuetify/src/components/VBadge/VBadge.ts
index 0b66dd74b61..e706499e1eb 100644
--- a/packages/vuetify/src/components/VBadge/VBadge.ts
+++ b/packages/vuetify/src/components/VBadge/VBadge.ts
@@ -46,14 +46,14 @@ export default mixins(
   },
 
   render (h): VNode {
-    const badge = this.$slots.badge ? [h('span', this.setBackgroundColor(this.color, {
+    const badge = this.$slots.badge && [h('span', this.setBackgroundColor(this.color, {
       staticClass: 'v-badge__badge',
       attrs: this.$attrs,
       directives: [{
         name: 'show',
         value: this.isActive
-      }] as any
-    }), this.$slots.badge)] as any : null
+      }]
+    }), this.$slots.badge)]
 
     return h('span', {
       staticClass: 'v-badge',
diff --git a/packages/vuetify/src/components/VBreadcrumbs/VBreadcrumbs.ts b/packages/vuetify/src/components/VBreadcrumbs/VBreadcrumbs.ts
index 4336b1bd216..49d8b201cf0 100644
--- a/packages/vuetify/src/components/VBreadcrumbs/VBreadcrumbs.ts
+++ b/packages/vuetify/src/components/VBreadcrumbs/VBreadcrumbs.ts
@@ -89,7 +89,7 @@ export default mixins(
       for (let i = 0; i < this.items.length; i++) {
         const item = this.items[i]
 
-        if (hasSlot) items.push(this.$scopedSlots.item({ item }))
+        if (hasSlot) items.push(this.$scopedSlots.item!({ item }))
         else items.push(this.$createElement(VBreadcrumbsItem, { key: item.text, props: item }, [item.text]))
 
         if (i < this.items.length - 1) items.push(this.genDivider())
diff --git a/packages/vuetify/src/components/VBtn/VBtn.ts b/packages/vuetify/src/components/VBtn/VBtn.ts
index d28655d14d8..2db9e543aba 100644
--- a/packages/vuetify/src/components/VBtn/VBtn.ts
+++ b/packages/vuetify/src/components/VBtn/VBtn.ts
@@ -2,9 +2,9 @@
 import '../../stylus/components/_buttons.styl'
 
 // Types
-import { VNode, VNodeChildren } from 'vue'
+import { VNode } from 'vue'
 import { PropValidator } from 'vue/types/options'
-import mixins from '../../util/mixins'
+import mixins, { ExtractVue } from '../../util/mixins'
 import { RippleOptions } from '../../directives/ripple'
 
 // Components
@@ -21,7 +21,7 @@ import { factory as ToggleableFactory } from '../../mixins/toggleable'
 // Utilities
 import { getObjectValueByPath } from '../../util/helpers'
 
-export default mixins(
+const baseMixins = mixins(
   Colorable,
   Routable,
   Positionable,
@@ -29,7 +29,12 @@ export default mixins(
   GroupableFactory('btnToggle'),
   ToggleableFactory('inputValue')
   /* @vue/component */
-).extend({
+)
+interface options extends ExtractVue<typeof baseMixins> {
+  $el: HTMLElement
+}
+
+export default baseMixins.extend<options>().extend({
   name: 'v-btn',
 
   props: {
@@ -114,25 +119,19 @@ export default mixins(
       return this.$createElement(
         'div',
         { 'class': 'v-btn__content' },
-        [this.$slots.default]
+        this.$slots.default
       )
     },
     genLoader (): VNode {
-      const children: VNodeChildren = []
-
-      if (!this.$slots.loader) {
-        children.push(this.$createElement(VProgressCircular, {
-          props: {
-            indeterminate: true,
-            size: 23,
-            width: 2
-          }
-        }))
-      } else {
-        children.push(this.$slots.loader)
-      }
-
-      return this.$createElement('span', { 'class': 'v-btn__loading' }, children)
+      return this.$createElement('span', {
+        class: 'v-btn__loading'
+      }, this.$slots.loader || [this.$createElement(VProgressCircular, {
+        props: {
+          indeterminate: true,
+          size: 23,
+          width: 2
+        }
+      })])
     },
     onRouteChange () {
       if (!this.to || !this.$refs.link) return
@@ -150,10 +149,12 @@ export default mixins(
   render (h): VNode {
     const setColor = (!this.outline && !this.flat && !this.disabled) ? this.setBackgroundColor : this.setTextColor
     const { tag, data } = this.generateRouteLink(this.classes)
-    const children = [this.genContent()]
+    const children = [
+      this.genContent(),
+      this.loading && this.genLoader()
+    ]
 
-    tag === 'button' && (data.attrs!.type = this.type)
-    this.loading && children.push(this.genLoader())
+    if (tag === 'button') data.attrs!.type = this.type
 
     data.attrs!.value = ['string', 'number'].includes(typeof this.value)
       ? this.value
diff --git a/packages/vuetify/src/components/VCard/index.ts b/packages/vuetify/src/components/VCard/index.ts
index 5a865335f11..ed174f4dd10 100644
--- a/packages/vuetify/src/components/VCard/index.ts
+++ b/packages/vuetify/src/components/VCard/index.ts
@@ -2,10 +2,9 @@ import { createSimpleFunctional } from '../../util/helpers'
 import VCard from './VCard'
 import VCardMedia from './VCardMedia'
 import VCardTitle from './VCardTitle'
-import Vue from 'vue'
 
-const VCardActions = Vue.extend(createSimpleFunctional('v-card__actions'))
-const VCardText = Vue.extend(createSimpleFunctional('v-card__text'))
+const VCardActions = createSimpleFunctional('v-card__actions')
+const VCardText = createSimpleFunctional('v-card__text')
 
 export { VCard, VCardMedia, VCardTitle, VCardActions, VCardText }
 
diff --git a/packages/vuetify/src/components/VChip/VChip.ts b/packages/vuetify/src/components/VChip/VChip.ts
index 3d24b7a02c6..0babba1eb45 100644
--- a/packages/vuetify/src/components/VChip/VChip.ts
+++ b/packages/vuetify/src/components/VChip/VChip.ts
@@ -1,7 +1,7 @@
 import '../../stylus/components/_chips.styl'
 
 // Types
-import { CreateElement, VNode, VNodeChildren } from 'vue'
+import { CreateElement, VNode } from 'vue'
 import mixins from '../../util/mixins'
 
 // Components
@@ -63,13 +63,12 @@ export default mixins(Colorable, Themeable, Toggleable).extend({
       ])
     },
     genContent (h: CreateElement): VNode {
-      const children: VNodeChildren = [this.$slots.default]
-
-      this.close && children.push(this.genClose(h))
-
       return h('span', {
         staticClass: 'v-chip__content'
-      }, children)
+      }, [
+        this.$slots.default,
+        this.close && this.genClose(h)
+      ])
     }
   },
 
@@ -81,7 +80,7 @@ export default mixins(Colorable, Themeable, Toggleable).extend({
       directives: [{
         name: 'show',
         value: this.isActive
-      }] as any,
+      }],
       on: this.$listeners
     })
 
diff --git a/packages/vuetify/src/components/VExpansionPanel/VExpansionPanelContent.ts b/packages/vuetify/src/components/VExpansionPanel/VExpansionPanelContent.ts
index 29e071beef6..11c45f2e839 100644
--- a/packages/vuetify/src/components/VExpansionPanel/VExpansionPanelContent.ts
+++ b/packages/vuetify/src/components/VExpansionPanel/VExpansionPanelContent.ts
@@ -99,7 +99,7 @@ export default mixins<options &
         directives: [{
           name: 'show',
           value: this.isActive
-        }] as any
+        }]
       }, this.showLazyContent(this.$slots.default))
     },
     genHeader () {
@@ -112,7 +112,7 @@ export default mixins<options &
         directives: [{
           name: 'ripple',
           value: this.ripple
-        }] as any,
+        }],
         on: {
           click: this.onHeaderClick
         }
@@ -130,7 +130,7 @@ export default mixins<options &
           directives: [{
             name: 'show',
             value: !this.isDisabled
-          }] as any
+          }]
         }, icon)
       ])
     },
@@ -142,11 +142,6 @@ export default mixins<options &
   },
 
   render (h): VNode {
-    const children = []
-
-    this.$slots.header && children.push(this.genHeader())
-    children.push(h(VExpandTransition, [this.genBody()]))
-
     return h('li', {
       staticClass: 'v-expansion-panel__container',
       class: this.containerClasses,
@@ -156,6 +151,9 @@ export default mixins<options &
       on: {
         keydown: this.onKeydown
       }
-    }, children)
+    }, [
+      this.$slots.header && this.genHeader(),
+      h(VExpandTransition, [this.genBody()])
+    ])
   }
 })
diff --git a/packages/vuetify/src/components/VHover/VHover.ts b/packages/vuetify/src/components/VHover/VHover.ts
index 31172e1e9eb..25ce8ea9ca9 100644
--- a/packages/vuetify/src/components/VHover/VHover.ts
+++ b/packages/vuetify/src/components/VHover/VHover.ts
@@ -47,7 +47,7 @@ export default mixins(
 
     if (this.$scopedSlots.default) {
       element = this.$scopedSlots.default({ hover: this.isActive })
-    } else if (this.$slots.default.length === 1) {
+    } else if (this.$slots.default && this.$slots.default.length === 1) {
       element = this.$slots.default[0]
     }
 
diff --git a/packages/vuetify/src/components/VPagination/VPagination.ts b/packages/vuetify/src/components/VPagination/VPagination.ts
index 75277ab8981..71487e8d9ea 100644
--- a/packages/vuetify/src/components/VPagination/VPagination.ts
+++ b/packages/vuetify/src/components/VPagination/VPagination.ts
@@ -186,7 +186,7 @@ export default mixins(Colorable, Themeable).extend({
         modifiers: { quiet: true },
         name: 'resize',
         value: this.onResize
-      }] as any,
+      }],
       class: this.classes
     }, children)
   }
diff --git a/packages/vuetify/src/components/VProgressCircular/VProgressCircular.ts b/packages/vuetify/src/components/VProgressCircular/VProgressCircular.ts
index ad243f8f3d9..d3bd4db3128 100644
--- a/packages/vuetify/src/components/VProgressCircular/VProgressCircular.ts
+++ b/packages/vuetify/src/components/VProgressCircular/VProgressCircular.ts
@@ -131,7 +131,7 @@ export default mixins(Colorable).extend({
   },
 
   render (h): VNode {
-    const info = h('div', { staticClass: 'v-progress-circular__info' }, [this.$slots.default])
+    const info = h('div', { staticClass: 'v-progress-circular__info' }, this.$slots.default)
     const svg = this.genSvg(h)
 
     return h('div', this.setTextColor(this.color, {
diff --git a/packages/vuetify/src/components/VRating/VRating.ts b/packages/vuetify/src/components/VRating/VRating.ts
index a1897dbdc68..87186eb23a0 100644
--- a/packages/vuetify/src/components/VRating/VRating.ts
+++ b/packages/vuetify/src/components/VRating/VRating.ts
@@ -16,7 +16,7 @@ import { createRange } from '../../util/helpers'
 import mixins from '../../util/mixins'
 
 // Types
-import { VNode, VNodeDirective, VNodeChildrenArrayContents } from 'vue'
+import { VNode, VNodeDirective, VNodeChildren } from 'vue'
 
 type ItemSlotProps = {
   index: number
@@ -188,7 +188,7 @@ export default mixins(
     onMouseLeave (): void {
       this.runDelay('close', () => (this.hoverIndex = -1))
     },
-    genItem (i: number): VNode | VNodeChildrenArrayContents | string {
+    genItem (i: number): VNode | VNodeChildren | string {
       const props = this.createProps(i)
 
       if (this.$scopedSlots.item) return this.$scopedSlots.item(props)
diff --git a/packages/vuetify/src/components/VSnackbar/VSnackbar.ts b/packages/vuetify/src/components/VSnackbar/VSnackbar.ts
index e31b1cc61d8..5ac691e6528 100644
--- a/packages/vuetify/src/components/VSnackbar/VSnackbar.ts
+++ b/packages/vuetify/src/components/VSnackbar/VSnackbar.ts
@@ -5,7 +5,7 @@ import Toggleable from '../../mixins/toggleable'
 import { factory as PositionableFactory } from '../../mixins/positionable'
 
 import mixins from '../../util/mixins'
-import { VNode, VNodeChildrenArrayContents } from 'vue'
+import { VNode } from 'vue'
 
 export default mixins(
   Colorable,
@@ -71,28 +71,22 @@ export default mixins(
   },
 
   render (h): VNode {
-    const children: VNodeChildrenArrayContents = []
-
-    if (this.isActive) {
-      children.push(
-        h('div', {
-          staticClass: 'v-snack',
-          class: this.classes,
-          on: this.$listeners
-        }, [
-          h('div', this.setBackgroundColor(this.color, {
-            staticClass: 'v-snack__wrapper'
-          }), [
-            h('div', {
-              staticClass: 'v-snack__content'
-            }, this.$slots.default)
-          ])
-        ])
-      )
-    }
-
     return h('transition', {
       attrs: { name: 'v-snack-transition' }
-    }, children)
+    }, this.isActive && [
+      h('div', {
+        staticClass: 'v-snack',
+        class: this.classes,
+        on: this.$listeners
+      }, [
+        h('div', this.setBackgroundColor(this.color, {
+          staticClass: 'v-snack__wrapper'
+        }), [
+          h('div', {
+            staticClass: 'v-snack__content'
+          }, this.$slots.default)
+        ])
+      ])
+    ])
   }
 })
diff --git a/packages/vuetify/src/components/VTimeline/VTimelineItem.ts b/packages/vuetify/src/components/VTimeline/VTimelineItem.ts
index 9ea58718e65..47907561e50 100644
--- a/packages/vuetify/src/components/VTimeline/VTimelineItem.ts
+++ b/packages/vuetify/src/components/VTimeline/VTimelineItem.ts
@@ -57,16 +57,12 @@ export default mixins(
       }, this.icon)
     },
     genInnerDot () {
-      const children = []
-
-      this.hasIcon && children.push(this.genIcon())
-
       const data: VNodeData = this.setBackgroundColor(this.color)
 
       return this.$createElement('div', {
         staticClass: 'v-timeline-item__inner-dot',
         ...data
-      }, children)
+      }, [this.hasIcon && this.genIcon()])
     },
     genDot () {
       return this.$createElement('div', {
@@ -80,7 +76,7 @@ export default mixins(
     genOpposite () {
       return this.$createElement('div', {
         staticClass: 'v-timeline-item__opposite'
-      }, [this.$slots.opposite])
+      }, this.$slots.opposite)
     }
   },
 
diff --git a/packages/vuetify/src/components/VTreeview/VTreeview.ts b/packages/vuetify/src/components/VTreeview/VTreeview.ts
index 204bdf79dc0..cb1e69e394d 100644
--- a/packages/vuetify/src/components/VTreeview/VTreeview.ts
+++ b/packages/vuetify/src/components/VTreeview/VTreeview.ts
@@ -327,7 +327,7 @@ export default mixins(
     const children: VNodeChildrenArrayContents = this.items.length
       ? this.items.map(VTreeviewNode.options.methods.genChild.bind(this))
       /* istanbul ignore next */
-      : this.$slots.default
+      : this.$slots.default! // TODO: remove type annotation with TS 3.2
 
     return h('div', {
       staticClass: 'v-treeview',
diff --git a/packages/vuetify/src/components/VWindow/VWindow.ts b/packages/vuetify/src/components/VWindow/VWindow.ts
index 930a7fd35d6..30ce6e55c47 100644
--- a/packages/vuetify/src/components/VWindow/VWindow.ts
+++ b/packages/vuetify/src/components/VWindow/VWindow.ts
@@ -125,7 +125,7 @@ export default BaseItemGroup.extend({
       data.directives.push({
         name: 'touch',
         value
-      } as VNodeDirective)
+      })
     }
 
     return h('div', data, [this.genContainer()])
diff --git a/packages/vuetify/src/components/VWindow/VWindowItem.ts b/packages/vuetify/src/components/VWindow/VWindowItem.ts
index b6eed8f54d3..63cc760c8d6 100644
--- a/packages/vuetify/src/components/VWindow/VWindowItem.ts
+++ b/packages/vuetify/src/components/VWindow/VWindowItem.ts
@@ -14,12 +14,12 @@ import { ExtractVue } from './../../util/mixins'
 import mixins from '../../util/mixins'
 
 // Types
-import Vue from 'vue'
-import { VNode, VNodeDirective } from 'vue/types'
+import Vue, { VNode } from 'vue'
 
 type VBaseWindow = InstanceType<typeof VWindow>
 
 interface options extends Vue {
+  $el: HTMLElement
   windowGroup: VBaseWindow
 }
 
@@ -139,7 +139,7 @@ export default mixins<options & ExtractVue<[typeof Bootable]>>(
       directives: [{
         name: 'show',
         value: this.isActive
-      }] as VNodeDirective[],
+      }],
       on: this.$listeners
     }, this.showLazyContent(this.genDefaultSlot()))
 
diff --git a/packages/vuetify/src/directives/resize.ts b/packages/vuetify/src/directives/resize.ts
index 8fb816b1938..192ba51f45e 100644
--- a/packages/vuetify/src/directives/resize.ts
+++ b/packages/vuetify/src/directives/resize.ts
@@ -1,12 +1,12 @@
 import { VNodeDirective } from 'vue/types/vnode'
 
 interface ResizeVNodeDirective extends VNodeDirective {
-  value: () => void
+  value?: () => void
   options?: boolean | AddEventListenerOptions
 }
 
 function inserted (el: HTMLElement, binding: ResizeVNodeDirective) {
-  const callback = binding.value
+  const callback = binding.value!
   const options = binding.options || { passive: true }
 
   window.addEventListener('resize', callback, options)
diff --git a/packages/vuetify/src/directives/touch.ts b/packages/vuetify/src/directives/touch.ts
index bac3c93d61c..4af105fd516 100644
--- a/packages/vuetify/src/directives/touch.ts
+++ b/packages/vuetify/src/directives/touch.ts
@@ -29,7 +29,7 @@ interface TouchWrapper extends TouchHandlers {
 }
 
 interface TouchVNodeDirective extends VNodeDirective {
-  value: TouchHandlers & {
+  value?: TouchHandlers & {
     parent?: boolean
     options?: AddEventListenerOptions
   }
@@ -108,14 +108,14 @@ function createHandlers (value: TouchHandlers): TouchStoredHandlers {
 }
 
 function inserted (el: HTMLElement, binding: TouchVNodeDirective, vnode: VNode) {
-  const value = binding.value
+  const value = binding.value!
   const target = value.parent ? el.parentElement : el
   const options = value.options || { passive: true }
 
   // Needed to pass unit tests
   if (!target) return
 
-  const handlers = createHandlers(binding.value)
+  const handlers = createHandlers(binding.value!)
   target._touchHandlers = Object(target._touchHandlers)
   target._touchHandlers![vnode.context!._uid] = handlers
 
@@ -125,7 +125,7 @@ function inserted (el: HTMLElement, binding: TouchVNodeDirective, vnode: VNode)
 }
 
 function unbind (el: HTMLElement, binding: TouchVNodeDirective, vnode: VNode) {
-  const target = binding.value.parent ? el.parentElement : el
+  const target = binding.value!.parent ? el.parentElement : el
   if (!target || !target._touchHandlers) return
 
   const handlers = target._touchHandlers[vnode.context!._uid]
diff --git a/packages/vuetify/src/mixins/bootable.ts b/packages/vuetify/src/mixins/bootable.ts
index ed03bc96b3a..d412057e8d3 100644
--- a/packages/vuetify/src/mixins/bootable.ts
+++ b/packages/vuetify/src/mixins/bootable.ts
@@ -37,7 +37,7 @@ export default Vue.extend<Vue & Toggleable>().extend({
   },
 
   methods: {
-    showLazyContent (content: VNode[]): VNode[] | undefined {
+    showLazyContent (content?: VNode[]): VNode[] | undefined {
       return this.hasContent ? content : undefined
     }
   }
diff --git a/packages/vuetify/src/mixins/dependent.ts b/packages/vuetify/src/mixins/dependent.ts
index ca8a8bc7061..7bd75aa14ed 100644
--- a/packages/vuetify/src/mixins/dependent.ts
+++ b/packages/vuetify/src/mixins/dependent.ts
@@ -3,6 +3,7 @@ import Vue from 'vue'
 import mixins from '../util/mixins'
 
 interface options extends Vue {
+  $el: HTMLElement
   $refs: {
     content: HTMLElement
   }
diff --git a/packages/vuetify/src/mixins/routable.ts b/packages/vuetify/src/mixins/routable.ts
index 1d9d2105538..72119c84f38 100644
--- a/packages/vuetify/src/mixins/routable.ts
+++ b/packages/vuetify/src/mixins/routable.ts
@@ -49,7 +49,7 @@ export default Vue.extend({
         directives: [{
           name: 'ripple',
           value: this.computedRipple
-        }] as any, // TODO
+        }],
         [this.to ? 'nativeOn' : 'on']: {
           ...this.$listeners,
           click: this.click
diff --git a/packages/vuetify/src/util/ThemeProvider.ts b/packages/vuetify/src/util/ThemeProvider.ts
index 18c9866f325..0d6ca7d81a1 100644
--- a/packages/vuetify/src/util/ThemeProvider.ts
+++ b/packages/vuetify/src/util/ThemeProvider.ts
@@ -17,6 +17,6 @@ export default mixins(Themeable).extend({
   },
 
   render (): VNode {
-    return this.$slots.default! && this.$slots.default.find(node => !node.isComment && node.text !== ' ')!
+    return this.$slots.default! && this.$slots.default!.find(node => !node.isComment && node.text !== ' ')!
   }
 })
diff --git a/packages/vuetify/src/util/helpers.ts b/packages/vuetify/src/util/helpers.ts
index b3f98434387..53023a646fc 100644
--- a/packages/vuetify/src/util/helpers.ts
+++ b/packages/vuetify/src/util/helpers.ts
@@ -1,12 +1,12 @@
-import { Vue } from 'vue/types/vue'
+import Vue from 'vue'
 import { VNode, VNodeDirective, FunctionalComponentOptions } from 'vue/types'
 
 export function createSimpleFunctional (
   c: string,
   el = 'div',
   name?: string
-): FunctionalComponentOptions {
-  return {
+) {
+  return Vue.extend({
     name: name || c.replace(/__/g, '-'),
 
     functional: true,
@@ -16,7 +16,7 @@ export function createSimpleFunctional (
 
       return h(el, data, children)
     }
-  }
+  })
 }
 
 function mergeTransitions (
diff --git a/packages/vuetify/test/unit/components/VMessages/VMessages.spec.js b/packages/vuetify/test/unit/components/VMessages/VMessages.spec.js
index 4dc3ebe26e8..5faf33c0d04 100644
--- a/packages/vuetify/test/unit/components/VMessages/VMessages.spec.js
+++ b/packages/vuetify/test/unit/components/VMessages/VMessages.spec.js
@@ -21,7 +21,6 @@ test('VMessages.js', ({ mount }) => {
     await wrapper.vm.$nextTick()
 
     expect(wrapper.html()).toMatchSnapshot()
-    expect('Cannot read property \'split\' of undefined').toHaveBeenWarned()
   })
 
   it('should allow HTML', () => {
diff --git a/packages/vuetify/test/unit/components/VMessages/__snapshots__/VMessages.spec.js.snap b/packages/vuetify/test/unit/components/VMessages/__snapshots__/VMessages.spec.js.snap
index 80846537cec..929aa0bc7d1 100644
--- a/packages/vuetify/test/unit/components/VMessages/__snapshots__/VMessages.spec.js.snap
+++ b/packages/vuetify/test/unit/components/VMessages/__snapshots__/VMessages.spec.js.snap
@@ -39,10 +39,6 @@ exports[`VMessages.js should show messages 2`] = `
     <div class="v-messages__message message-transition-leave message-transition-leave-active">
       bar
     </div>
-    <div class="v-messages__message message-transition-move"
-         style="display: none;"
-    >
-    </div>
   </div>
 </div>
 
diff --git a/packages/vuetifyjs.com/build/webpack.server.config.js b/packages/vuetifyjs.com/build/webpack.server.config.js
index 28bbd8cc65c..a23a11aca8c 100644
--- a/packages/vuetifyjs.com/build/webpack.server.config.js
+++ b/packages/vuetifyjs.com/build/webpack.server.config.js
@@ -1,3 +1,4 @@
+const path = require('path')
 const webpack = require('webpack')
 const merge = require('webpack-merge')
 const base = require('./webpack.base.config')
@@ -24,7 +25,7 @@ module.exports = merge(base, {
   externals: nodeExternals({
     // do not externalize CSS files in case we need to import it from a dep
     whitelist: isProd ? undefined : /^vuetify/,
-    modulesFromFile: true
+    modulesDir: path.resolve(__dirname, '../../../node_modules')
   }),
   module: {
     rules: [
diff --git a/packages/vuetifyjs.com/package.json b/packages/vuetifyjs.com/package.json
index 4af93cddd97..48ead6a3076 100755
--- a/packages/vuetifyjs.com/package.json
+++ b/packages/vuetifyjs.com/package.json
@@ -36,12 +36,11 @@
     "serve-favicon": "^2.5.0",
     "shopify-buy": "^1.4.0",
     "vee-validate": "^2.1.1",
-    "vue": "^2.5.17",
     "vue-analytics": "^5.16.0",
     "vue-i18n": "^7.8.1",
     "vue-no-ssr": "^0.2.2",
     "vue-router": "^3.0.1",
-    "vue-server-renderer": "^2.5.17",
+    "vue-server-renderer": "^2.5.21",
     "vuelidate": "^0.6.2",
     "vuetify": "^1.3.13",
     "vuex": "^3.0.1",
@@ -94,7 +93,6 @@
     "vue-loader": "^15.4.2",
     "vue-prism-component": "^1.1.1",
     "vue-style-loader": "^4.1.2",
-    "vue-template-compiler": "^2.5.17",
     "webpack": "^4.23.1",
     "webpack-bundle-analyzer": "^2.13.1",
     "webpack-cli": "^3.1.2",
diff --git a/packages/vuetifyjs.com/src/components/core/TableOfContents.vue b/packages/vuetifyjs.com/src/components/core/TableOfContents.vue
index c9db1bff59c..6b29779c502 100644
--- a/packages/vuetifyjs.com/src/components/core/TableOfContents.vue
+++ b/packages/vuetifyjs.com/src/components/core/TableOfContents.vue
@@ -2,7 +2,7 @@
   // Utilities
   import { goTo } from '@/util/helpers'
   import { mapState } from 'vuex'
-  import { getObjectValueByPath } from 'vuetify/es5/util/helpers'
+  import { getObjectValueByPath } from 'vuetify/lib/util/helpers'
   import upperFirst from 'lodash/upperFirst'
   import camelCase from 'lodash/camelCase'
 
diff --git a/packages/vuetifyjs.com/src/components/helpers/Parameters.vue b/packages/vuetifyjs.com/src/components/helpers/Parameters.vue
index 11225e32e30..f04fbf34f64 100644
--- a/packages/vuetifyjs.com/src/components/helpers/Parameters.vue
+++ b/packages/vuetifyjs.com/src/components/helpers/Parameters.vue
@@ -68,7 +68,7 @@
   import { mapState } from 'vuex'
   import { capitalize, camel } from '@/util/helpers'
   import componentNameMap from '@/data/i18n/componentNameMap'
-  import { getObjectValueByPath } from 'vuetify/es5/util/helpers'
+  import { getObjectValueByPath } from 'vuetify/lib/util/helpers'
 
   export default {
     props: {
diff --git a/packages/vuetifyjs.com/src/examples/scrolling/usage.vue b/packages/vuetifyjs.com/src/examples/scrolling/usage.vue
index dac7c94eb39..42b27573f87 100644
--- a/packages/vuetifyjs.com/src/examples/scrolling/usage.vue
+++ b/packages/vuetifyjs.com/src/examples/scrolling/usage.vue
@@ -26,7 +26,7 @@
 </template>
 
 <script>
-  import * as easings from 'vuetify/es5/util/easing-patterns'
+  import * as easings from 'vuetify/lib/util/easing-patterns'
 
   export default {
     data () {
diff --git a/packages/vuetifyjs.com/src/pages/ThemeGeneratorPage.vue b/packages/vuetifyjs.com/src/pages/ThemeGeneratorPage.vue
index 658bcee384a..92f4521cc43 100644
--- a/packages/vuetifyjs.com/src/pages/ThemeGeneratorPage.vue
+++ b/packages/vuetifyjs.com/src/pages/ThemeGeneratorPage.vue
@@ -85,7 +85,7 @@
 </template>
 
 <script>
-  import colors from 'vuetify/es5/util/colors'
+  import colors from 'vuetify/lib/util/colors'
   import { Swatches } from 'vue-color'
 
   const files = require.context(
@@ -144,7 +144,7 @@
             e[k] = this.findName(this.theme[k])
             return e
           }, {})
-          let str = `import colors from 'vuetify/es5/util/colors'\n\n${JSON.stringify(names, null, 2)}`
+          let str = `import colors from 'vuetify/lib/util/colors'\n\n${JSON.stringify(names, null, 2)}`
           str = str.replace(/"(.*)":\s"(.*)"/g, '$1: colors.$2')
 
           return str
diff --git a/packages/vuetifyjs.com/src/pages/framework/InternationalizationPage.vue b/packages/vuetifyjs.com/src/pages/framework/InternationalizationPage.vue
index 540cea4f5ae..aa906678628 100644
--- a/packages/vuetifyjs.com/src/pages/framework/InternationalizationPage.vue
+++ b/packages/vuetifyjs.com/src/pages/framework/InternationalizationPage.vue
@@ -20,7 +20,7 @@
         | import Vuetify from 'vuetify'
         |
         | // Translation provided by Vuetify (javascript)
-        | import zhHans from 'vuetify/es5/locale/zh-Hans'
+        | import zhHans from 'vuetify/lib/locale/zh-Hans'
         |
         | // Translation provided by Vuetify (typescript)
         | import pl from 'vuetify/src/locale/pl'
@@ -120,7 +120,7 @@
 </template>
 
 <script>
-  import enLocale from 'vuetify/es5/locale/en'
+  import enLocale from 'vuetify/lib/locale/en'
 
   export default {
     data: vm => ({
diff --git a/packages/vuetifyjs.com/src/pages/motion/TransitionsPage.vue b/packages/vuetifyjs.com/src/pages/motion/TransitionsPage.vue
index a763f359a68..ef72e8a7d4a 100644
--- a/packages/vuetifyjs.com/src/pages/motion/TransitionsPage.vue
+++ b/packages/vuetifyjs.com/src/pages/motion/TransitionsPage.vue
@@ -4,7 +4,7 @@
       helpers-section-head(value="Motion.Transitions.createYourOwnHeader")
       helpers-section-text(value="Motion.Transitions.createYourOwnText1")
       helpers-markup(lang="javascript")
-        | import { createSimpleTransition } from 'vuetify/es5/util/helpers'
+        | import { createSimpleTransition } from 'vuetify/lib/util/helpers'
         | &nbsp;
         | const myTransition = createSimpleTransition('my-transition')
         | &nbsp;
diff --git a/packages/vuetifyjs.com/src/pages/style/ColorsPage.vue b/packages/vuetifyjs.com/src/pages/style/ColorsPage.vue
index 1bf79d2468f..8e7bd624398 100644
--- a/packages/vuetifyjs.com/src/pages/style/ColorsPage.vue
+++ b/packages/vuetifyjs.com/src/pages/style/ColorsPage.vue
@@ -25,7 +25,7 @@
           | import Vuetify from 'vuetify'
           |
           | // Helpers
-          | import colors from 'vuetify/es5/util/colors'
+          | import colors from 'vuetify/lib/util/colors'
           |
           | Vue.use(Vuetify, {
           |   theme: {
@@ -102,7 +102,7 @@
 </template>
 
 <script>
-  import colors from 'vuetify/es5/util/colors'
+  import colors from 'vuetify/lib/util/colors'
   import { kebab } from '@/util/helpers'
 
   export default {
diff --git a/packages/vuetifyjs.com/src/pages/style/ThemePage.vue b/packages/vuetifyjs.com/src/pages/style/ThemePage.vue
index d489cd8b4e2..ac3f8a36736 100644
--- a/packages/vuetifyjs.com/src/pages/style/ThemePage.vue
+++ b/packages/vuetifyjs.com/src/pages/style/ThemePage.vue
@@ -39,7 +39,7 @@
           | })
         helpers-section-text(:value="`${namespace}.customizingText3`")
         helpers-markup(lang="javascript")
-          | import colors from 'vuetify/es5/util/colors'
+          | import colors from 'vuetify/lib/util/colors'
           |
           | Vue.use(Vuetify, {
           |   theme: {
@@ -58,7 +58,7 @@
         helpers-section-text(:value="`${namespace}.variantsText1`")
         helpers-markup(lang="javascript")
           | // src/theme.js
-          | import colors from 'vuetify/es5/util/colors'
+          | import colors from 'vuetify/lib/util/colors'
           |
           | export default {
           |   primary: {
diff --git a/tsconfig.json b/tsconfig.json
index ec3a9f632a9..119dc85c4e3 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -3,7 +3,14 @@
     /* Basic Options */
     "target": "es5",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */
     "module": "es2015",                       /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
-    "lib": ["es2017", "es2018", "dom", "dom.iterable"],       /* Specify library files to be included in the compilation. */
+    "lib": [                                  /* Specify library files to be included in the compilation */
+      "es2015",
+      "es2016",
+      "es2017",
+      "es2018",
+      "dom",
+      "dom.iterable"
+    ],
     "allowJs": true,                          /* Allow javascript files to be compiled. */
     // "checkJs": true,                       /* Report errors in .js files. */
     // "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
diff --git a/yarn.lock b/yarn.lock
index 4acf0540bfe..3a25364be08 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12416,10 +12416,10 @@ vue-router@^3.0.1:
   resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.0.1.tgz#d9b05ad9c7420ba0f626d6500d693e60092cc1e9"
   integrity sha512-vLLoY452L+JBpALMP5UHum9+7nzR9PeIBCghU9ZtJ1eWm6ieUI8Zb/DI3MYxH32bxkjzYV1LRjNv4qr8d+uX/w==
 
-vue-server-renderer@^2.5.17:
-  version "2.5.17"
-  resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.5.17.tgz#c1f24815a4b12a2797c154549b29b44b6be004b5"
-  integrity sha512-n62Fg4xv9ouxNloW2U3Bru2Jj+DkbnnrlzwuTkaU1o7CIDifG+r0+ILLMW0eVjgCjhKefHTYjwJ49RJ3bCjv1Q==
+vue-server-renderer@^2.5.21:
+  version "2.5.21"
+  resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.5.21.tgz#7c2b611d2e8558359cdb84dcd3080845c07121b4"
+  integrity sha512-bAkOYZ5DnmQKv3RboNbmCB4LReF2tIE20EgUeWrz/87aVkpMihf3FVK+8DT45nyN4k9iSQOhsyem49fq++cF8w==
   dependencies:
     chalk "^1.1.3"
     hash-sum "^1.0.2"
@@ -12446,10 +12446,10 @@ vue-style-loader@^4.1.2:
     hash-sum "^1.0.2"
     loader-utils "^1.0.2"
 
-vue-template-compiler@^2.5.17:
-  version "2.5.17"
-  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.5.17.tgz#52a4a078c327deb937482a509ae85c06f346c3cb"
-  integrity sha512-63uI4syCwtGR5IJvZM0LN5tVsahrelomHtCxvRkZPJ/Tf3ADm1U1wG6KWycK3qCfqR+ygM5vewUvmJ0REAYksg==
+vue-template-compiler@^2.5.21:
+  version "2.5.21"
+  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.5.21.tgz#a57ceb903177e8f643560a8d639a0f8db647054a"
+  integrity sha512-Vmk5Cv7UcmI99B9nXJEkaK262IQNnHp5rJYo+EwYpe2epTAXqcVyExhV6pk8jTkxQK2vRc8v8KmZBAwdmUZvvw==
   dependencies:
     de-indent "^1.0.2"
     he "^1.1.0"
@@ -12459,10 +12459,10 @@ vue-template-es2015-compiler@^1.6.0:
   resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.6.0.tgz#dc42697133302ce3017524356a6c61b7b69b4a18"
   integrity sha512-x3LV3wdmmERhVCYy3quqA57NJW7F3i6faas++pJQWtknWT+n7k30F4TVdHvCLn48peTJFRvCpxs3UuFPqgeELg==
 
-vue@^2.5.16, vue@^2.5.17:
-  version "2.5.17"
-  resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.17.tgz#0f8789ad718be68ca1872629832ed533589c6ada"
-  integrity sha512-mFbcWoDIJi0w0Za4emyLiW72Jae0yjANHbCVquMKijcavBGypqlF7zHRgMa5k4sesdv7hv2rB4JPdZfR+TPfhQ==
+vue@^2.5.21:
+  version "2.5.21"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.21.tgz#3d33dcd03bb813912ce894a8303ab553699c4a85"
+  integrity sha512-Aejvyyfhn0zjVeLvXd70h4hrE4zZDx1wfZqia6ekkobLmUZ+vNFQer53B4fu0EjWBSiqApxPejzkO1Znt3joxQ==
 
 vuelidate@^0.6.2:
   version "0.6.2"