diff --git a/package-lock.json b/package-lock.json
index 4fde9d304..c3e3a774d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1897,6 +1897,14 @@
 				"@babel/plugin-transform-typescript": "^7.6.0"
 			}
 		},
+		"@babel/runtime": {
+			"version": "7.6.3",
+			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.6.3.tgz",
+			"integrity": "sha512-kq6anf9JGjW8Nt5rYfEuGRaEAaH1mkv3Bbu6rYvLOpPh/RusSJXuKPEAoZ7L7gybZkchE8+NV5g9vKF4AGAtsA==",
+			"requires": {
+				"regenerator-runtime": "^0.13.2"
+			}
+		},
 		"@babel/template": {
 			"version": "7.4.4",
 			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.4.tgz",
@@ -2869,6 +2877,25 @@
 				}
 			}
 		},
+		"@nextcloud/vue": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-1.1.0.tgz",
+			"integrity": "sha512-SGWrNTalT/59vElPnPJZ0xQb9sui1yq5fKRiIA2w81NlAK9JQGq+ADeqdVb8sciVnLGobQJ1qERhpo3pIyOhaQ==",
+			"requires": {
+				"@babel/polyfill": "^7.4.4",
+				"@nextcloud/axios": "^0.4.0",
+				"escape-html": "^1.0.3",
+				"hammerjs": "^2.0.8",
+				"md5": "^2.2.1",
+				"v-click-outside": "^2.1.4",
+				"v-tooltip": "^2.0.0-rc.33",
+				"vue": "^2.6.7",
+				"vue-color": "^2.7.0",
+				"vue-multiselect": "^2.1.3",
+				"vue-visible": "^1.0.2",
+				"vue2-datepicker": "^2.10.0"
+			}
+		},
 		"@types/babel__core": {
 			"version": "7.1.2",
 			"resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.2.tgz",
@@ -12382,7 +12409,7 @@
 			"dependencies": {
 				"minimist": {
 					"version": "0.0.10",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+					"resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
 					"integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
 					"dev": true
 				},
diff --git a/package.json b/package.json
index 61c42dea5..7b8fd9b48 100644
--- a/package.json
+++ b/package.json
@@ -27,11 +27,12 @@
 	},
 	"dependencies": {
 		"@babel/polyfill": "^7.7.0",
+		"@babel/runtime": "^7.6.3",
 		"@nextcloud/l10n": "^0.2.1",
 		"@nextcloud/router": "^0.1.0",
+		"@nextcloud/vue": "^1.1.0",
 		"nextcloud-axios": "^0.2.1",
 		"nextcloud-server": "^0.15.10",
-		"nextcloud-vue": "^0.12.7",
 		"nextcloud-vue-collections": "^0.6.0",
 		"vue": "^2.6.7",
 		"vue-click-outside": "^1.0.7",
diff --git a/src/components/CollaborationView.vue b/src/components/CollaborationView.vue
index ee1fc1d5a..babda933b 100644
--- a/src/components/CollaborationView.vue
+++ b/src/components/CollaborationView.vue
@@ -30,7 +30,7 @@
 <script>
 import { CollectionList } from 'nextcloud-vue-collections'
 import Vue from 'vue'
-import PopoverMenu from 'nextcloud-vue/dist/Components/PopoverMenu'
+import PopoverMenu from '@nextcloud/vue/dist/Components/PopoverMenu'
 
 Vue.component('popover-menu', PopoverMenu)
 
diff --git a/src/components/board/BoardSidebar.vue b/src/components/board/BoardSidebar.vue
index 4c880a889..57a02c9b0 100644
--- a/src/components/board/BoardSidebar.vue
+++ b/src/components/board/BoardSidebar.vue
@@ -51,7 +51,7 @@ import SharingTabSidebar from './SharingTabSidebar'
 import TagsTabSidebar from './TagsTabSidebar'
 import DeletedTabSidebar from './DeletedTabSidebar'
 import TimelineTabSidebar from './TimelineTabSidebar'
-import { AppSidebar, AppSidebarTab } from 'nextcloud-vue'
+import { AppSidebar, AppSidebarTab } from '@nextcloud/vue'
 
 export default {
 	name: 'BoardSidebar',
diff --git a/src/components/board/SharingTabSidebar.vue b/src/components/board/SharingTabSidebar.vue
index 9986bf20d..98df78b7a 100644
--- a/src/components/board/SharingTabSidebar.vue
+++ b/src/components/board/SharingTabSidebar.vue
@@ -46,7 +46,7 @@
 </template>
 
 <script>
-import { Avatar, Multiselect, Actions, ActionButton, ActionCheckbox } from 'nextcloud-vue'
+import { Avatar, Multiselect, Actions, ActionButton, ActionCheckbox } from '@nextcloud/vue'
 import { CollectionList } from 'nextcloud-vue-collections'
 import { mapGetters } from 'vuex'
 
diff --git a/src/components/board/Stack.vue b/src/components/board/Stack.vue
index 8c106093c..8293a69f1 100644
--- a/src/components/board/Stack.vue
+++ b/src/components/board/Stack.vue
@@ -60,8 +60,8 @@
 <script>
 
 import { Container, Draggable } from 'vue-smooth-dnd'
-import { Actions } from 'nextcloud-vue/dist/Components/Actions'
-import { ActionButton } from 'nextcloud-vue/dist/Components/ActionButton'
+import { Actions } from '@nextcloud/vue/dist/Components/Actions'
+import { ActionButton } from '@nextcloud/vue/dist/Components/ActionButton'
 import CardItem from '../cards/CardItem'
 
 export default {
diff --git a/src/components/boards/BoardItem.vue b/src/components/boards/BoardItem.vue
index a5fb5c6de..aecfdb5b2 100644
--- a/src/components/boards/BoardItem.vue
+++ b/src/components/boards/BoardItem.vue
@@ -39,7 +39,7 @@
 </template>
 
 <script>
-import { Avatar } from 'nextcloud-vue'
+import { Avatar } from '@nextcloud/vue'
 
 export default {
 	name: 'BoardItem',
diff --git a/src/components/card/CardSidebar.vue b/src/components/card/CardSidebar.vue
index 32ae3a701..e86dca5d1 100644
--- a/src/components/card/CardSidebar.vue
+++ b/src/components/card/CardSidebar.vue
@@ -95,11 +95,11 @@
 </template>
 
 <script>
-import { AppSidebar, AppSidebarTab, Multiselect, DatetimePicker, Avatar } from 'nextcloud-vue'
+import { AppSidebar, AppSidebarTab, Multiselect, DatetimePicker, Avatar } from '@nextcloud/vue'
 import { mapState } from 'vuex'
 import VueEasymde from 'vue-easymde'
-import { Actions } from 'nextcloud-vue/dist/Components/Actions'
-import { ActionButton } from 'nextcloud-vue/dist/Components/ActionButton'
+import { Actions } from '@nextcloud/vue/dist/Components/Actions'
+import { ActionButton } from '@nextcloud/vue/dist/Components/ActionButton'
 import ActivityEntry from '../ActivityEntry'
 import Color from '../../mixins/color'
 import { CollectionList } from 'nextcloud-vue-collections'
diff --git a/src/components/cards/AvatarList.vue b/src/components/cards/AvatarList.vue
index 3175977af..a85ef631e 100644
--- a/src/components/cards/AvatarList.vue
+++ b/src/components/cards/AvatarList.vue
@@ -36,9 +36,9 @@
 </template>
 
 <script>
-import Avatar from 'nextcloud-vue/dist/Components/Avatar'
-import PopoverMenu from 'nextcloud-vue/dist/Components/PopoverMenu'
-import Tooltip from 'nextcloud-vue/dist/Directives/Tooltip'
+import Avatar from '@nextcloud/vue/dist/Components/Avatar'
+import PopoverMenu from '@nextcloud/vue/dist/Components/PopoverMenu'
+import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip'
 export default {
 	name: 'AvatarList',
 	components: {
diff --git a/src/components/cards/CardBadges.vue b/src/components/cards/CardBadges.vue
index 25aaab835..0ea48fe7e 100644
--- a/src/components/cards/CardBadges.vue
+++ b/src/components/cards/CardBadges.vue
@@ -40,7 +40,7 @@ cardbadges
 	</div>
 </template>
 <script>
-import { Avatar } from 'nextcloud-vue'
+import { Avatar } from '@nextcloud/vue'
 import AvatarList from './AvatarList'
 
 export default {
diff --git a/src/components/cards/CardItem.vue b/src/components/cards/CardItem.vue
index 56d7613e3..644f95fd1 100644
--- a/src/components/cards/CardItem.vue
+++ b/src/components/cards/CardItem.vue
@@ -69,10 +69,10 @@
 </template>
 
 <script>
-import { Modal } from 'nextcloud-vue/dist/Components/Modal'
-import { Actions } from 'nextcloud-vue/dist/Components/Actions'
-import { ActionButton } from 'nextcloud-vue/dist/Components/ActionButton'
-import { Multiselect } from 'nextcloud-vue/dist/Components/Multiselect'
+import { Modal } from '@nextcloud/vue/dist/Components/Modal'
+import { Actions } from '@nextcloud/vue/dist/Components/Actions'
+import { ActionButton } from '@nextcloud/vue/dist/Components/ActionButton'
+import { Multiselect } from '@nextcloud/vue/dist/Components/Multiselect'
 import ClickOutside from 'vue-click-outside'
 import { mapState } from 'vuex'
 import axios from 'nextcloud-axios'
diff --git a/src/components/navigation/AppNavigation.vue b/src/components/navigation/AppNavigation.vue
index b76a9463b..e60f91427 100644
--- a/src/components/navigation/AppNavigation.vue
+++ b/src/components/navigation/AppNavigation.vue
@@ -63,7 +63,7 @@
 import axios from 'nextcloud-axios'
 import { mapGetters } from 'vuex'
 import ClickOutside from 'vue-click-outside'
-import { Multiselect } from 'nextcloud-vue'
+import { Multiselect } from '@nextcloud/vue'
 
 import AppNavigationAddBoard from './AppNavigationAddBoard'
 import AppNavigationBoard from './AppNavigationBoard'
diff --git a/src/components/navigation/AppNavigationBoard.vue b/src/components/navigation/AppNavigationBoard.vue
index 73c24740e..841c7bb35 100644
--- a/src/components/navigation/AppNavigationBoard.vue
+++ b/src/components/navigation/AppNavigationBoard.vue
@@ -69,7 +69,7 @@
 </template>
 
 <script>
-import { PopoverMenu } from 'nextcloud-vue'
+import { PopoverMenu } from '@nextcloud/vue'
 import ClickOutside from 'vue-click-outside'
 import ColorPicker from '../ColorPicker'
 
diff --git a/src/components/navigation/AppNavigationBoardCategory.vue b/src/components/navigation/AppNavigationBoardCategory.vue
index ad684529a..468feae3e 100644
--- a/src/components/navigation/AppNavigationBoardCategory.vue
+++ b/src/components/navigation/AppNavigationBoardCategory.vue
@@ -33,7 +33,7 @@
 </template>
 
 <script>
-import { PopoverMenu } from 'nextcloud-vue'
+import { PopoverMenu } from '@nextcloud/vue'
 import ClickOutside from 'vue-click-outside'
 import AppNavigationBoard from './AppNavigationBoard'
 
diff --git a/src/main.js b/src/main.js
index 02a53940c..75cb4a613 100644
--- a/src/main.js
+++ b/src/main.js
@@ -26,7 +26,7 @@ import store from './store/main'
 import { sync } from 'vuex-router-sync'
 import { translate, translatePlural } from '@nextcloud/l10n'
 import { generateFilePath } from '@nextcloud/router'
-import Tooltip from 'nextcloud-vue/dist/Directives/Tooltip'
+import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip'
 import './models'
 
 // eslint-disable-next-line