diff --git a/.gitignore b/.gitignore
index f6400d9c..533fe8ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 
 \.idea/
-
+node_modules/
 vendor/
diff --git a/package-lock.json b/package-lock.json
index 6a4cfb4f..b2581d91 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -105,6 +105,22 @@
 				}
 			}
 		},
+		"@babel/polyfill": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.0.0.tgz",
+			"integrity": "sha512-dnrMRkyyr74CRelJwvgnnSUDh2ge2NCTyHVwpOdvRMHtJUyxLtMAfhBN3s64pY41zdw0kgiLPh6S20eb1NcX6Q==",
+			"requires": {
+				"core-js": "^2.5.7",
+				"regenerator-runtime": "^0.11.1"
+			},
+			"dependencies": {
+				"regenerator-runtime": {
+					"version": "0.11.1",
+					"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+					"integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
+				}
+			}
+		},
 		"@babel/template": {
 			"version": "7.0.0-beta.44",
 			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.0.0-beta.44.tgz",
@@ -4171,6 +4187,11 @@
 				"bser": "^2.0.0"
 			}
 		},
+		"fecha": {
+			"version": "2.3.3",
+			"resolved": "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz",
+			"integrity": "sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg=="
+		},
 		"figures": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
@@ -8241,6 +8262,18 @@
 			"integrity": "sha512-vdqTKI9GBIYcAEbFAcpKPErKINfPF5zIuz3/niBfq8WUZjpT2tytLlFVrBgWdOtqI4uaA/Rb6No0hux39XXDuw==",
 			"dev": true
 		},
+		"nextcloud-vue": {
+			"version": "0.1.5",
+			"resolved": "https://registry.npmjs.org/nextcloud-vue/-/nextcloud-vue-0.1.5.tgz",
+			"integrity": "sha512-2tFfPPzhTMtZnbBmUk91o2o+jiri3X6BEgNs+iAWf9WZq4Gcpb6kIFW2ckizZuPFccmV1rA4Ts18IpU25vGERw==",
+			"requires": {
+				"@babel/polyfill": "^7.0.0",
+				"v-tooltip": "^2.0.0-rc.33",
+				"vue": "^2.5.16",
+				"vue-click-outside": "^1.0.7",
+				"vue2-datepicker": "^2.4.1"
+			}
+		},
 		"nice-try": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
@@ -12703,16 +12736,6 @@
 			"resolved": "https://registry.npmjs.org/vue-click-outside/-/vue-click-outside-1.0.7.tgz",
 			"integrity": "sha1-zdKxYF48SUR4TheU6uShKg9wC9Y="
 		},
-		"vue-components": {
-			"version": "github:nextcloud/vue-components#205a20727285b86c8f7331a52182ff4d183c9636",
-			"from": "github:nextcloud/vue-components#init",
-			"requires": {
-				"babel-polyfill": "^6.26.0",
-				"v-tooltip": "^2.0.0-rc.33",
-				"vue": "^2.5.16",
-				"vue-click-outside": "^1.0.7"
-			}
-		},
 		"vue-eslint-parser": {
 			"version": "2.0.3",
 			"resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz",
@@ -12842,6 +12865,14 @@
 			"integrity": "sha512-x3LV3wdmmERhVCYy3quqA57NJW7F3i6faas++pJQWtknWT+n7k30F4TVdHvCLn48peTJFRvCpxs3UuFPqgeELg==",
 			"dev": true
 		},
+		"vue2-datepicker": {
+			"version": "2.4.3",
+			"resolved": "https://registry.npmjs.org/vue2-datepicker/-/vue2-datepicker-2.4.3.tgz",
+			"integrity": "sha512-Tw6k7AZyCl698CQgrNFKzHy1po6LVHYXBw+gQ3yozsxbpX6TCdq7MasvSpP5q0cQxgs8COlIZr1x4EjIKYjejQ==",
+			"requires": {
+				"fecha": "^2.3.3"
+			}
+		},
 		"vuex": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/vuex/-/vuex-3.0.1.tgz",
diff --git a/package.json b/package.json
index 90fb554e..7683776b 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,8 @@
 		"test:coverage": "jest --coverage"
 	},
 	"dependencies": {
-		"vue-components": "github:nextcloud/vue-components#init",
+		"babel-polyfill": "^6.26.0",
+		"nextcloud-vue": "^0.1.2",
 		"uuid": "^3.3.2",
 		"vue": "^2.5.16",
 		"vue-click-outside": "^1.0.7",
diff --git a/src/App.vue b/src/App.vue
index e347f5a0..3f71c5fb 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -17,7 +17,7 @@
 	import {
 		PopoverMenu,
 		AppNavigation
-	} from 'vue-components';
+	} from 'nextcloud-vue';
 
 	export default {
 		name: 'App',