diff --git a/src/components/about/Developer.vue b/src/components/about/Developer.vue
index 96f67a0..04bef94 100644
--- a/src/components/about/Developer.vue
+++ b/src/components/about/Developer.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from '@vue/composition-api';
+import { defineComponent } from 'vue';
 export default defineComponent({
   name: 'Developer',
   props: {
diff --git a/src/components/loading/CircularProgress.vue b/src/components/loading/CircularProgress.vue
index 33b5815..1b8c425 100644
--- a/src/components/loading/CircularProgress.vue
+++ b/src/components/loading/CircularProgress.vue
@@ -16,7 +16,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from '@vue/composition-api';
+import { defineComponent } from 'vue';
 export default defineComponent({
   name: 'CircularProgress',
 });
diff --git a/src/components/loading/DarkCircularProgress.vue b/src/components/loading/DarkCircularProgress.vue
index 8304601..cca513a 100644
--- a/src/components/loading/DarkCircularProgress.vue
+++ b/src/components/loading/DarkCircularProgress.vue
@@ -16,7 +16,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from '@vue/composition-api';
+import { defineComponent } from 'vue';
 export default defineComponent({
   name: 'DarkCircularProgress',
 });
diff --git a/src/components/navigation/EmptyParent.vue b/src/components/navigation/EmptyParent.vue
index 4dc75e8..10da9a2 100644
--- a/src/components/navigation/EmptyParent.vue
+++ b/src/components/navigation/EmptyParent.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from '@vue/composition-api';
+import { defineComponent } from 'vue';
 
 export default defineComponent({
   name: 'EmptyParent',
diff --git a/src/components/navigation/EssentialLink.vue b/src/components/navigation/EssentialLink.vue
index 2065ea3..0c38a79 100644
--- a/src/components/navigation/EssentialLink.vue
+++ b/src/components/navigation/EssentialLink.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent } from '@vue/composition-api';
+import { computed, defineComponent } from 'vue';
 import { hasPermissions } from 'src/utils/permission';
 
 export default defineComponent({
diff --git a/src/components/navigation/ShortCutLink.vue b/src/components/navigation/ShortCutLink.vue
index 69d6de1..507f5e2 100644
--- a/src/components/navigation/ShortCutLink.vue
+++ b/src/components/navigation/ShortCutLink.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent } from '@vue/composition-api';
+import { computed, defineComponent } from 'vue';
 import { hasPermissions } from 'src/utils/permission';
 
 export default defineComponent({
diff --git a/src/components/utils/IsoDateInput.vue b/src/components/utils/IsoDateInput.vue
index cb9da1e..c93f0f3 100644
--- a/src/components/utils/IsoDateInput.vue
+++ b/src/components/utils/IsoDateInput.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, ref } from '@vue/composition-api';
+import { computed, defineComponent, ref } from 'vue';
 import { date } from 'quasar';
 interface Props {
   value?: Date;
diff --git a/src/layouts/OutLayout.vue b/src/layouts/OutLayout.vue
index b14bbac..0900c0d 100644
--- a/src/layouts/OutLayout.vue
+++ b/src/layouts/OutLayout.vue
@@ -42,7 +42,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from '@vue/composition-api';
+import { defineComponent } from 'vue';
 import ShortCutLink from 'components/navigation/ShortCutLink.vue';
 
 export default defineComponent({
diff --git a/src/pages/Dashboard.vue b/src/pages/Dashboard.vue
index cf1c61d..2bcb32a 100644
--- a/src/pages/Dashboard.vue
+++ b/src/pages/Dashboard.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, onMounted, ref } from '@vue/composition-api';
+import { defineComponent, onMounted, ref } from 'vue';
 import { hasPermissions } from 'src/utils/permission';
 import { AsyncComponentPromise } from 'vue/types/options';
 
diff --git a/src/pages/Login.vue b/src/pages/Login.vue
index ba25af3..5f2a1f5 100644
--- a/src/pages/Login.vue
+++ b/src/pages/Login.vue
@@ -54,7 +54,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from '@vue/composition-api';
+import { defineComponent, ref } from 'vue';
 import { Loading, Notify } from 'quasar';
 import { setBaseUrl } from 'boot/axios';
 
diff --git a/src/pages/Offline.vue b/src/pages/Offline.vue
index f274397..e08b683 100644
--- a/src/pages/Offline.vue
+++ b/src/pages/Offline.vue
@@ -35,7 +35,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref, onUnmounted } from '@vue/composition-api';
+import { defineComponent, ref, onUnmounted } from 'vue';
 
 export default defineComponent({
   name: 'Offline',
diff --git a/src/pages/PluginError.vue b/src/pages/PluginError.vue
index 1c46396..4ffb0a6 100644
--- a/src/pages/PluginError.vue
+++ b/src/pages/PluginError.vue
@@ -35,7 +35,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from '@vue/composition-api';
+import { defineComponent } from 'vue';
 
 export default defineComponent({
   name: 'PluginError.vue',
diff --git a/src/pages/Reset.vue b/src/pages/Reset.vue
index a52fac0..162aa69 100644
--- a/src/pages/Reset.vue
+++ b/src/pages/Reset.vue
@@ -34,7 +34,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from '@vue/composition-api';
+import { defineComponent, ref } from 'vue';
 import { Loading, Notify } from 'quasar';
 import { AxiosResponse } from 'axios';
 
diff --git a/src/pages/about/About.vue b/src/pages/about/About.vue
index 2e65fc8..ae687ea 100644
--- a/src/pages/about/About.vue
+++ b/src/pages/about/About.vue
@@ -59,7 +59,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from '@vue/composition-api';
+import { defineComponent } from 'vue';
 import Developer from 'components/about/Developer.vue';
 
 const developers = [
diff --git a/src/plugins/balance/components/BalanceAdd.vue b/src/plugins/balance/components/BalanceAdd.vue
index 1c08dc3..7a3031d 100644
--- a/src/plugins/balance/components/BalanceAdd.vue
+++ b/src/plugins/balance/components/BalanceAdd.vue
@@ -61,7 +61,7 @@
 </template>
 
 <script lang="ts">
-import { computed, ref, defineComponent, onBeforeMount } from '@vue/composition-api';
+import { computed, ref, defineComponent, onBeforeMount } from 'vue';
 import { hasPermission } from 'src/utils/permission';
 import { StateInterfaceBalance } from '../store/balance';
 import { Store } from 'vuex';
diff --git a/src/plugins/balance/components/BalanceHeader.vue b/src/plugins/balance/components/BalanceHeader.vue
index 60bd489..31a6751 100644
--- a/src/plugins/balance/components/BalanceHeader.vue
+++ b/src/plugins/balance/components/BalanceHeader.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script lang="ts">
-import { ref, computed, defineComponent, onBeforeMount } from '@vue/composition-api';
+import { ref, computed, defineComponent, onBeforeMount } from 'vue';
 import UserSelector from 'src/plugins/user/components/UserSelector.vue';
 import { StateInterfaceBalance } from '../store/balance';
 import { Store } from 'vuex';
diff --git a/src/plugins/balance/components/BalanceTransfer.vue b/src/plugins/balance/components/BalanceTransfer.vue
index 6f36382..8168c91 100644
--- a/src/plugins/balance/components/BalanceTransfer.vue
+++ b/src/plugins/balance/components/BalanceTransfer.vue
@@ -27,7 +27,7 @@
 </template>
 
 <script lang="ts">
-import { computed, ref, defineComponent } from '@vue/composition-api';
+import { computed, ref, defineComponent } from 'vue';
 import { hasPermission } from 'src/utils/permission';
 import { StateInterfaceBalance } from '../store/balance';
 import { Store } from 'vuex';
diff --git a/src/plugins/balance/components/Transaction.vue b/src/plugins/balance/components/Transaction.vue
index 5edc87e..4e44751 100644
--- a/src/plugins/balance/components/Transaction.vue
+++ b/src/plugins/balance/components/Transaction.vue
@@ -30,7 +30,7 @@
 </template>
 
 <script lang="ts">
-import { ref, computed, defineComponent, onUnmounted, onMounted } from '@vue/composition-api';
+import { ref, computed, defineComponent, onUnmounted, onMounted } from 'vue';
 import { hasPermission } from 'src/utils/permission';
 import { formatDateTime } from 'src/utils/datetime';
 import { StateInterfaceBalance } from 'src/plugins/balance/store/balance';
diff --git a/src/plugins/balance/components/Widget.vue b/src/plugins/balance/components/Widget.vue
index 5d60080..4d3c67a 100644
--- a/src/plugins/balance/components/Widget.vue
+++ b/src/plugins/balance/components/Widget.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, onBeforeMount } from '@vue/composition-api';
+import { computed, defineComponent, onBeforeMount } from 'vue';
 import { StateInterfaceBalance } from 'src/plugins/balance/store/balance';
 import { Store } from 'vuex';
 
diff --git a/src/plugins/balance/pages/Admin.vue b/src/plugins/balance/pages/Admin.vue
index 008e75b..b7f591d 100644
--- a/src/plugins/balance/pages/Admin.vue
+++ b/src/plugins/balance/pages/Admin.vue
@@ -13,7 +13,7 @@
 <script lang="ts">
 // TODO: Fill usefull data
 
-import { ref, defineComponent, onMounted } from '@vue/composition-api';
+import { ref, defineComponent, onMounted } from 'vue';
 import { StateInterfaceBalance, BalancesResponse } from '../store/balance';
 import { Store } from 'vuex';
 export default defineComponent({
diff --git a/src/plugins/balance/pages/MainPage.vue b/src/plugins/balance/pages/MainPage.vue
index 27a1f5f..e9ec725 100644
--- a/src/plugins/balance/pages/MainPage.vue
+++ b/src/plugins/balance/pages/MainPage.vue
@@ -67,7 +67,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, ref, onMounted } from '@vue/composition-api';
+import { computed, defineComponent, ref, onMounted } from 'vue';
 import { Store } from 'vuex';
 import { hasPermissions, hasSomePermissions } from 'src/utils/permission';
 import PERMISSIONS from '../permissions';
diff --git a/src/plugins/balance/pages/Overview.vue b/src/plugins/balance/pages/Overview.vue
index 0ba97d6..462415d 100644
--- a/src/plugins/balance/pages/Overview.vue
+++ b/src/plugins/balance/pages/Overview.vue
@@ -32,7 +32,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, onMounted, ref } from '@vue/composition-api';
+import { computed, defineComponent, onMounted, ref } from 'vue';
 import { StateInterfaceBalance, TransactionsResponse } from '../store/balance';
 import { Store } from 'vuex';
 import { formatDateTime } from 'src/utils/datetime';
diff --git a/src/plugins/schedule/components/Widget.vue b/src/plugins/schedule/components/Widget.vue
index 55d465d..a1890d9 100644
--- a/src/plugins/schedule/components/Widget.vue
+++ b/src/plugins/schedule/components/Widget.vue
@@ -8,7 +8,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from '@vue/composition-api';
+import { defineComponent } from 'vue';
 
 export default defineComponent({
   name: 'DummyWidget',
diff --git a/src/plugins/schedule/components/management/CreateEvent.vue b/src/plugins/schedule/components/management/CreateEvent.vue
index 26c99c0..dc8629d 100644
--- a/src/plugins/schedule/components/management/CreateEvent.vue
+++ b/src/plugins/schedule/components/management/CreateEvent.vue
@@ -64,7 +64,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref, onBeforeMount, computed } from '@vue/composition-api';
+import { defineComponent, ref, onBeforeMount, computed } from 'vue';
 import IsoDateInput from 'src/components/utils/IsoDateInput.vue';
 import Job from './Job.vue';
 import { Store } from 'vuex';
diff --git a/src/plugins/schedule/components/management/Eventtypes.vue b/src/plugins/schedule/components/management/Eventtypes.vue
index ef6b7d0..7ab7161 100644
--- a/src/plugins/schedule/components/management/Eventtypes.vue
+++ b/src/plugins/schedule/components/management/Eventtypes.vue
@@ -45,7 +45,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref, computed, onBeforeMount } from '@vue/composition-api';
+import { defineComponent, ref, computed, onBeforeMount } from 'vue';
 import { Store } from 'vuex';
 import { StateInterface } from 'src/store';
 import { ScheduleInterface, EventType } from '../../store/schedule';
diff --git a/src/plugins/schedule/components/management/Job.vue b/src/plugins/schedule/components/management/Job.vue
index c5f5ce6..c3f969c 100644
--- a/src/plugins/schedule/components/management/Job.vue
+++ b/src/plugins/schedule/components/management/Job.vue
@@ -62,7 +62,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, computed, ref } from '@vue/composition-api';
+import { defineComponent, computed, ref } from 'vue';
 import IsoDateInput from 'src/components/utils/IsoDateInput.vue';
 import { Store } from 'vuex';
 import { StateInterface } from 'src/store';
diff --git a/src/plugins/schedule/components/management/JobTypes.vue b/src/plugins/schedule/components/management/JobTypes.vue
index edea49c..cefffe1 100644
--- a/src/plugins/schedule/components/management/JobTypes.vue
+++ b/src/plugins/schedule/components/management/JobTypes.vue
@@ -45,7 +45,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref, computed, onBeforeMount } from '@vue/composition-api';
+import { defineComponent, ref, computed, onBeforeMount } from 'vue';
 import { Store } from 'vuex';
 import { StateInterface } from 'src/store';
 import { ScheduleInterface, JobType } from '../../store/schedule';
diff --git a/src/plugins/schedule/pages/MainPage.vue b/src/plugins/schedule/pages/MainPage.vue
index 5ccec52..e3c79dd 100644
--- a/src/plugins/schedule/pages/MainPage.vue
+++ b/src/plugins/schedule/pages/MainPage.vue
@@ -21,7 +21,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent } from '@vue/composition-api';
+import { computed, defineComponent } from 'vue';
 import EssentialLink from 'src/components/navigation/EssentialLink.vue';
 import mainRoutes from 'src/plugins/schedule/routes';
 import { Store } from 'vuex';
diff --git a/src/plugins/schedule/pages/Management.vue b/src/plugins/schedule/pages/Management.vue
index 50f7ee7..d530794 100644
--- a/src/plugins/schedule/pages/Management.vue
+++ b/src/plugins/schedule/pages/Management.vue
@@ -46,7 +46,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, ref } from '@vue/composition-api';
+import { computed, defineComponent, ref } from 'vue';
 import Eventtypes from '../components/management/Eventtypes.vue';
 import JobTypes from '../components/management/JobTypes.vue';
 import CreateEvent from '../components/management/CreateEvent.vue';
diff --git a/src/plugins/user/components/NewUser.vue b/src/plugins/user/components/NewUser.vue
index 960e313..07f20cd 100644
--- a/src/plugins/user/components/NewUser.vue
+++ b/src/plugins/user/components/NewUser.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from '@vue/composition-api';
+import { defineComponent, ref } from 'vue';
 import MainUserSettings from 'src/plugins/user/components/settings/MainUserSettings.vue';
 import { Store } from 'vuex';
 import { StateInterface } from 'src/store';
diff --git a/src/plugins/user/components/UpdateUser.vue b/src/plugins/user/components/UpdateUser.vue
index 14bb10a..198655d 100644
--- a/src/plugins/user/components/UpdateUser.vue
+++ b/src/plugins/user/components/UpdateUser.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from '@vue/composition-api';
+import { defineComponent, ref } from 'vue';
 import { Store } from 'vuex';
 import { StateInterface } from '../../../store';
 import UserSelector from '../components/UserSelector.vue';
diff --git a/src/plugins/user/components/UserSelector.vue b/src/plugins/user/components/UserSelector.vue
index bedf530..aba3226 100644
--- a/src/plugins/user/components/UserSelector.vue
+++ b/src/plugins/user/components/UserSelector.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, onBeforeMount } from '@vue/composition-api';
+import { computed, defineComponent, onBeforeMount } from 'vue';
 import { Store } from 'vuex';
 import { StateInterface } from 'src/store';
 
diff --git a/src/plugins/user/components/Widget.vue b/src/plugins/user/components/Widget.vue
index 0a97163..48c2428 100644
--- a/src/plugins/user/components/Widget.vue
+++ b/src/plugins/user/components/Widget.vue
@@ -26,7 +26,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, onMounted, ref } from '@vue/composition-api';
+import { computed, defineComponent, onMounted, ref } from 'vue';
 import { Store } from 'vuex';
 import { StateInterface } from 'src/store';
 
diff --git a/src/plugins/user/components/settings/MainUserSettings.vue b/src/plugins/user/components/settings/MainUserSettings.vue
index 789c18e..c89082e 100644
--- a/src/plugins/user/components/settings/MainUserSettings.vue
+++ b/src/plugins/user/components/settings/MainUserSettings.vue
@@ -107,7 +107,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, ref, onBeforeMount } from '@vue/composition-api';
+import { computed, defineComponent, ref, onBeforeMount } from 'vue';
 import { Store } from 'vuex';
 import { StateInterface } from 'src/store';
 import { hasPermission } from 'src/utils/permission';
diff --git a/src/plugins/user/components/settings/RoleSettings.vue b/src/plugins/user/components/settings/RoleSettings.vue
index 0e89506..35fe80f 100644
--- a/src/plugins/user/components/settings/RoleSettings.vue
+++ b/src/plugins/user/components/settings/RoleSettings.vue
@@ -45,7 +45,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, ref, onBeforeMount } from '@vue/composition-api';
+import { computed, defineComponent, ref, onBeforeMount } from 'vue';
 import { Store } from 'vuex';
 import { StateInterface } from 'src/store';
 
diff --git a/src/plugins/user/components/settings/Sessions.vue b/src/plugins/user/components/settings/Sessions.vue
index 06fdd8f..08570ba 100644
--- a/src/plugins/user/components/settings/Sessions.vue
+++ b/src/plugins/user/components/settings/Sessions.vue
@@ -46,7 +46,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref, computed } from '@vue/composition-api';
+import { defineComponent, ref, computed } from 'vue';
 import { Store } from 'vuex';
 import { StateInterface } from 'src/store';
 
diff --git a/src/plugins/user/pages/AdminSettings.vue b/src/plugins/user/pages/AdminSettings.vue
index 8cfabf7..20a22bc 100644
--- a/src/plugins/user/pages/AdminSettings.vue
+++ b/src/plugins/user/pages/AdminSettings.vue
@@ -46,7 +46,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, ref } from '@vue/composition-api';
+import { computed, defineComponent, ref } from 'vue';
 import RoleSettings from '../components/settings/RoleSettings.vue';
 import UpdateUser from '../components/UpdateUser.vue';
 import NewUser from '../components/NewUser.vue';
diff --git a/src/plugins/user/pages/MainPage.vue b/src/plugins/user/pages/MainPage.vue
index 0bb112b..4a48cec 100644
--- a/src/plugins/user/pages/MainPage.vue
+++ b/src/plugins/user/pages/MainPage.vue
@@ -21,7 +21,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent } from '@vue/composition-api';
+import { computed, defineComponent } from 'vue';
 import EssentialLink from 'src/components/navigation/EssentialLink.vue';
 import mainRoutes from 'src/plugins/user/routes';
 export default defineComponent({
diff --git a/src/plugins/user/pages/Settings.vue b/src/plugins/user/pages/Settings.vue
index 6183de0..2b64a5d 100644
--- a/src/plugins/user/pages/Settings.vue
+++ b/src/plugins/user/pages/Settings.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, onBeforeMount, ref } from '@vue/composition-api';
+import { computed, defineComponent, onBeforeMount, ref } from 'vue';
 import Sessions from '../components/settings/Sessions.vue';
 import MainUserSettings from '../components/settings/MainUserSettings.vue';
 import { Store } from 'vuex';
@@ -24,7 +24,7 @@ import setLoadingBar from 'src/utils/loading';
 export default defineComponent({
   // name: 'PageName'
   components: { Sessions, MainUserSettings },
-  setup(_, { root }) {
+  setup(_, _,  {
     const store = <Store<StateInterface>>root.$store;
 
     onBeforeMount(() => {
diff --git a/src/utils/loading.ts b/src/utils/loading.ts
index 67adc0a..e758267 100644
--- a/src/utils/loading.ts
+++ b/src/utils/loading.ts
@@ -1,4 +1,4 @@
-import { watch, WatchSource } from '@vue/composition-api';
+import { watch, WatchSource } from 'vue';
 import { LoadingBar } from 'quasar';
 
 function setLoadingBar(loading: WatchSource<boolean>) {