diff --git a/package-lock.json b/package-lock.json
index b8e60527..e8655d1b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5226,6 +5226,11 @@
       "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=",
       "dev": true
     },
+    "hammerjs": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
+      "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
+    },
     "handlebars": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.0.tgz",
@@ -7508,17 +7513,18 @@
       }
     },
     "nextcloud-vue": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/nextcloud-vue/-/nextcloud-vue-0.7.0.tgz",
-      "integrity": "sha512-g37cCB5p+AuN0ajH5BJVTuLOVAjcd/yKCyqTpEfIMLovgeJaTidbiogxua49T2Wcj5m/S0zsQp7fu6e6dXQovA==",
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/nextcloud-vue/-/nextcloud-vue-0.7.1.tgz",
+      "integrity": "sha512-7KtOuZh2hGlppN8zyxGU+tg/8SxO/DYxed7NG4m6YpaCpFJXg/OKADlKTy44meHXnnCW/+TPeDTh+KvPKxU/Sw==",
       "requires": {
+        "hammerjs": "^2.0.8",
         "md5": "^2.2.1",
-        "nextcloud-axios": "^0.1.2",
+        "nextcloud-axios": "^0.1.3",
         "v-tooltip": "^2.0.0-rc.33",
-        "vue": "^2.5.20",
+        "vue": "^2.6.7",
         "vue-click-outside": "^1.0.7",
-        "vue-multiselect": "^2.1.0",
-        "vue2-datepicker": "^2.6.1"
+        "vue-multiselect": "^2.1.3",
+        "vue2-datepicker": "^2.10.0"
       }
     },
     "nice-try": {
diff --git a/package.json b/package.json
index 5e601531..f6a0b608 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
 	"dependencies": {
 		"linkifyjs": "^2.1.8",
 		"nextcloud-axios": "^0.1.3",
-		"nextcloud-vue": "^0.7.0",
+		"nextcloud-vue": "^0.7.1",
 		"tributejs": "^3.5.3",
 		"twemoji": "^11.3.0",
 		"uuid": "^3.3.2",
diff --git a/src/App.vue b/src/App.vue
index 786a8c7e..c5633cf6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -91,9 +91,7 @@
 </style>
 
 <script>
-import {
-	AppNavigationItem
-} from 'nextcloud-vue'
+import AppNavigationItem from 'nextcloud-vue/dist/Components/AppNavigationItem'
 import axios from 'nextcloud-axios'
 import Search from './components/Search'
 import currentuserMixin from './mixins/currentUserMixin'
diff --git a/src/components/ActorAvatar.vue b/src/components/ActorAvatar.vue
index 9621e2ce..6f6dac39 100644
--- a/src/components/ActorAvatar.vue
+++ b/src/components/ActorAvatar.vue
@@ -28,7 +28,7 @@
 </template>
 
 <script>
-import { Avatar } from 'nextcloud-vue'
+import Avatar from 'nextcloud-vue/dist/Components/Avatar'
 
 export default {
 	name: 'ActorAvatar',
diff --git a/src/components/Composer.vue b/src/components/Composer.vue
index 7ec53222..fbdd2b0f 100644
--- a/src/components/Composer.vue
+++ b/src/components/Composer.vue
@@ -331,11 +331,10 @@
 </style>
 <script>
 
-import { Avatar, PopoverMenu } from 'nextcloud-vue'
-import ClickOutside from 'vue-click-outside'
+import Avatar from 'nextcloud-vue/dist/Components/Avatar'
+import PopoverMenu from 'nextcloud-vue/dist/Components/PopoverMenu'
 import EmojiPicker from 'vue-emoji-picker'
 import VueTribute from 'vue-tribute'
-import { VTooltip } from 'v-tooltip'
 import CurrentUserMixin from './../mixins/currentUserMixin'
 import FocusOnCreate from '../directives/focusOnCreate'
 import axios from 'nextcloud-axios'
@@ -351,8 +350,6 @@ export default {
 		VueTribute
 	},
 	directives: {
-		tooltip: VTooltip,
-		ClickOutside: ClickOutside,
 		FocusOnCreate: FocusOnCreate
 	},
 	mixins: [CurrentUserMixin],
diff --git a/src/components/ProfileInfo.vue b/src/components/ProfileInfo.vue
index e1352084..0cacbfb5 100644
--- a/src/components/ProfileInfo.vue
+++ b/src/components/ProfileInfo.vue
@@ -98,8 +98,7 @@
 	}
 </style>
 <script>
-
-import { Avatar } from 'nextcloud-vue'
+import Avatar from 'nextcloud-vue/dist/Components/Avatar'
 import serverData from '../mixins/serverData'
 import currentUser from '../mixins/currentUserMixin'
 import follow from '../mixins/follow'
diff --git a/src/components/TimelineEntry.vue b/src/components/TimelineEntry.vue
index 37b6dd4d..5b17c5a3 100644
--- a/src/components/TimelineEntry.vue
+++ b/src/components/TimelineEntry.vue
@@ -45,7 +45,7 @@
 </template>
 
 <script>
-import { Avatar } from 'nextcloud-vue'
+import Avatar from 'nextcloud-vue/dist/Components/Avatar'
 import * as linkify from 'linkifyjs'
 import pluginTag from 'linkifyjs/plugins/hashtag'
 import pluginMention from 'linkifyjs/plugins/mention'
diff --git a/src/components/UserEntry.vue b/src/components/UserEntry.vue
index 4631ca68..dd633d44 100644
--- a/src/components/UserEntry.vue
+++ b/src/components/UserEntry.vue
@@ -55,7 +55,7 @@
 </template>
 
 <script>
-import { Avatar } from 'nextcloud-vue'
+import Avatar from 'nextcloud-vue/dist/Components/Avatar'
 import follow from '../mixins/follow'
 import currentUser from '../mixins/currentUserMixin'
 import FollowButton from './FollowButton'
diff --git a/src/main.js b/src/main.js
index 1eb2ff56..3016c5ec 100644
--- a/src/main.js
+++ b/src/main.js
@@ -29,7 +29,7 @@ import router from './router'
 import vuetwemoji from 'vue-twemoji'
 import contenteditableDirective from 'vue-contenteditable-directive'
 import ClickOutside from 'vue-click-outside'
-import VTooltip from 'v-tooltip'
+import VTooltip from 'nextcloud-vue/dist/Directives/Tooltip'
 
 sync(store, router)
 
diff --git a/src/mixins/popoverMenu.js b/src/mixins/popoverMenu.js
index cbbca5d4..3330cb91 100644
--- a/src/mixins/popoverMenu.js
+++ b/src/mixins/popoverMenu.js
@@ -20,7 +20,7 @@
  *
  */
 
-import { PopoverMenu } from 'nextcloud-vue'
+import PopoverMenu from 'nextcloud-vue/dist/Components/PopoverMenu'
 
 export default {
 	components: {
diff --git a/src/views/OStatus.vue b/src/views/OStatus.vue
index 0952d2f8..6ec69eaf 100644
--- a/src/views/OStatus.vue
+++ b/src/views/OStatus.vue
@@ -60,7 +60,7 @@
 </style>
 
 <script>
-import { Avatar } from 'nextcloud-vue'
+import Avatar from 'nextcloud-vue/dist/Components/Avatar'
 import axios from 'nextcloud-axios'
 import currentuserMixin from './../mixins/currentUserMixin'