diff --git a/src/components.d.ts b/src/components.d.ts
index 3e6c56844e222a62ff176b88666ae62f46b3062a..c477b71b71acf8b26b38903504f17c3a425a18f0 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -1,82 +1,25 @@
 // generated by unplugin-vue-components
 // We suggest you to commit this file into source control
 // Read more: https://github.com/vuejs/vue-next/pull/3399
-import "@vue/runtime-core";
+import '@vue/runtime-core'
 
-declare module "@vue/runtime-core" {
+declare module '@vue/runtime-core' {
   export interface GlobalComponents {
-    BAlert: typeof import("bootstrap-vue")["BAlert"];
-    BBadge: typeof import("bootstrap-vue")["BBadge"];
-    BBreadcrumb: typeof import("bootstrap-vue")["BBreadcrumb"];
-    BBreadcrumbItem: typeof import("bootstrap-vue")["BBreadcrumbItem"];
-    BButton: typeof import("bootstrap-vue")["BButton"];
-    BButtonGroup: typeof import("bootstrap-vue")["BButtonGroup"];
-    BCard: typeof import("bootstrap-vue")["BCard"];
-    BCardBody: typeof import("bootstrap-vue")["BCardBody"];
-    BCardGroup: typeof import("bootstrap-vue")["BCardGroup"];
-    BCardText: typeof import("bootstrap-vue")["BCardText"];
-    BCol: typeof import("bootstrap-vue")["BCol"];
-    BCollapse: typeof import("bootstrap-vue")["BCollapse"];
-    BContainer: typeof import("bootstrap-vue")["BContainer"];
-    BDropdown: typeof import("bootstrap-vue")["BDropdown"];
-    BDropdownDivider: typeof import("bootstrap-vue")["BDropdownDivider"];
-    BDropdownItem: typeof import("bootstrap-vue")["BDropdownItem"];
-    BForm: typeof import("bootstrap-vue")["BForm"];
-    BFormCheckbox: typeof import("bootstrap-vue")["BFormCheckbox"];
-    BFormDatepicker: typeof import("bootstrap-vue")["BFormDatepicker"];
-    BFormFile: typeof import("bootstrap-vue")["BFormFile"];
-    BFormGroup: typeof import("bootstrap-vue")["BFormGroup"];
-    BFormInput: typeof import("bootstrap-vue")["BFormInput"];
-    BFormRadioGroup: typeof import("bootstrap-vue")["BFormRadioGroup"];
-    BFormSelect: typeof import("bootstrap-vue")["BFormSelect"];
-    BFormSelectOption: typeof import("bootstrap-vue")["BFormSelectOption"];
-    BFormTag: typeof import("bootstrap-vue")["BFormTag"];
-    BFormTags: typeof import("bootstrap-vue")["BFormTags"];
-    BFormText: typeof import("bootstrap-vue")["BFormText"];
-    BFormTextarea: typeof import("bootstrap-vue")["BFormTextarea"];
-    BIcon: typeof import("bootstrap-vue")["BIcon"];
-    BIconLink45deg: typeof import("bootstrap-vue")["BIconLink45deg"];
-    BInputGroup: typeof import("bootstrap-vue")["BInputGroup"];
-    BInputGroupAppend: typeof import("bootstrap-vue")["BInputGroupAppend"];
-    BLink: typeof import("bootstrap-vue")["BLink"];
-    BModal: typeof import("bootstrap-vue")["BModal"];
-    BNavbar: typeof import("bootstrap-vue")["BNavbar"];
-    BNavbarBrand: typeof import("bootstrap-vue")["BNavbarBrand"];
-    BNavbarNav: typeof import("bootstrap-vue")["BNavbarNav"];
-    BNavbarToggle: typeof import("bootstrap-vue")["BNavbarToggle"];
-    BNavForm: typeof import("bootstrap-vue")["BNavForm"];
-    BNavItem: typeof import("bootstrap-vue")["BNavItem"];
-    BNavItemDropdown: typeof import("bootstrap-vue")["BNavItemDropdown"];
-    BOverlay: typeof import("bootstrap-vue")["BOverlay"];
-    BPagination: typeof import("bootstrap-vue")["BPagination"];
-    BPopover: typeof import("bootstrap-vue")["BPopover"];
-    BProgress: typeof import("bootstrap-vue")["BProgress"];
-    BProgressBar: typeof import("bootstrap-vue")["BProgressBar"];
-    BreadCrumbs: typeof import("./components/elements/BreadCrumbs.vue")["default"];
-    BRow: typeof import("bootstrap-vue")["BRow"];
-    BSkeleton: typeof import("bootstrap-vue")["BSkeleton"];
-    BSkeletonTable: typeof import("bootstrap-vue")["BSkeletonTable"];
-    BSkeletonWrapper: typeof import("bootstrap-vue")["BSkeletonWrapper"];
-    BSpinner: typeof import("bootstrap-vue")["BSpinner"];
-    BTab: typeof import("bootstrap-vue")["BTab"];
-    BTable: typeof import("bootstrap-vue")["BTable"];
-    BTabs: typeof import("bootstrap-vue")["BTabs"];
-    BToast: typeof import("bootstrap-vue")["BToast"];
-    BTooltip: typeof import("bootstrap-vue")["BTooltip"];
-    CoscineCard: typeof import("./components/coscine/CoscineCard.vue")["default"];
-    CoscineFormGroup: typeof import("./components/coscine/CoscineFormGroup.vue")["default"];
-    CoscineHeadline: typeof import("./components/coscine/CoscineHeadline.vue")["default"];
-    CoscineModal: typeof import("./components/coscine/CoscineModal.vue")["default"];
-    ExpiryToast: typeof import("./components/toasts/ExpiryToast.vue")["default"];
-    LoadingIndicator: typeof import("./components/elements/LoadingIndicator.vue")["default"];
-    LoadingSpinner: typeof import("./components/coscine/LoadingSpinner.vue")["default"];
-    Maintenance: typeof import("./components/banner/Maintenance.vue")["default"];
-    MultiSelect: typeof import("./components/coscine/MultiSelect.vue")["default"];
-    Navbar: typeof import("./components/elements/Navbar.vue")["default"];
-    NotificationToast: typeof import("./components/toasts/NotificationToast.vue")["default"];
-    Pilot: typeof import("./components/banner/Pilot.vue")["default"];
-    SidebarMenu: typeof import("./components/elements/SidebarMenu.vue")["default"];
+    BreadCrumbs: typeof import('./components/elements/BreadCrumbs.vue')['default']
+    CoscineCard: typeof import('./components/coscine/CoscineCard.vue')['default']
+    CoscineFormGroup: typeof import('./components/coscine/CoscineFormGroup.vue')['default']
+    CoscineHeadline: typeof import('./components/coscine/CoscineHeadline.vue')['default']
+    CoscineModal: typeof import('./components/coscine/CoscineModal.vue')['default']
+    ExpiryToast: typeof import('./components/toasts/ExpiryToast.vue')['default']
+    LoadingIndicator: typeof import('./components/elements/LoadingIndicator.vue')['default']
+    LoadingSpinner: typeof import('./components/coscine/LoadingSpinner.vue')['default']
+    Maintenance: typeof import('./components/banner/Maintenance.vue')['default']
+    MultiSelect: typeof import('./components/coscine/MultiSelect.vue')['default']
+    Navbar: typeof import('./components/elements/Navbar.vue')['default']
+    NotificationToast: typeof import('./components/toasts/NotificationToast.vue')['default']
+    Pilot: typeof import('./components/banner/Pilot.vue')['default']
+    SidebarMenu: typeof import('./components/elements/SidebarMenu.vue')['default']
   }
 }
 
-export {};
+export {}
diff --git a/src/plugins/bootstrap-vue.ts b/src/plugins/bootstrap-vue.ts
index ba5ef15694d25d83ae919b2d1a122ac752f3a898..9c56bab4b6a6bf1552f42097a6c5fab6da557972 100644
--- a/src/plugins/bootstrap-vue.ts
+++ b/src/plugins/bootstrap-vue.ts
@@ -1,7 +1,15 @@
 import Vue from "vue";
-import { IconsPlugin } from "bootstrap-vue";
+import { BootstrapVue, BootstrapVueIcons } from "bootstrap-vue";
+
+
+// From Bootstrap Vue resolver
+// import { IconsPlugin } from "bootstrap-vue";
 
 import "bootstrap/dist/css/bootstrap.min.css";
 import "bootstrap-vue/dist/bootstrap-vue.min.css";
 
-Vue.use(IconsPlugin);
+Vue.use(BootstrapVue);
+Vue.use(BootstrapVueIcons);
+
+// From Bootstrap Vue resolver
+// Vue.use(IconsPlugin);
diff --git a/src/util/bootstrap-vue-resolver.ts b/src/util/bootstrap-vue-resolver.ts
index afc4e1dd9702e1cd045e884a62760ce2fe335bf7..9bc086d81bb470809fbf22dbe64409e7899159fa 100644
--- a/src/util/bootstrap-vue-resolver.ts
+++ b/src/util/bootstrap-vue-resolver.ts
@@ -13,3 +13,6 @@ export function BootstrapVueResolver(): ComponentResolver {
     },
   };
 }
+
+
+// From Bootstrap Vue resolver
\ No newline at end of file
diff --git a/vite.config.js b/vite.config.js
index 56ee32f7905e82fce15d97b7c68390f2010248fa..5e155eaec1cece84d6413a3ec1a0bdac129a874f 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -12,7 +12,8 @@ import replace from '@rollup/plugin-replace';
 import WindiCSS from "vite-plugin-windicss";
 import Components from "unplugin-vue-components/vite";
 
-import { BootstrapVueResolver } from "./src/util/bootstrap-vue-resolver";
+// From Bootstrap Vue resolver
+// import { BootstrapVueResolver } from "./src/util/bootstrap-vue-resolver";
 
 const config = defineConfig({
   resolve: {
@@ -81,23 +82,23 @@ const config = defineConfig({
             "Readable$3.call": "Readable$2.call",
             'return new Readable$2(options);': 
               `{
-      Object.assign(this, EventEmitter.prototype);
-      this.push = Readable$1.prototype.push;
-      this.unshift = Readable$1.prototype.unshift;
-      this.isPaused = Readable$1.prototype.isPaused;
-      this.setEncoding = Readable$1.prototype.setEncoding;
-      this.read = Readable$1.prototype.read;
-      this.pipe = Readable$1.prototype.pipe;
-      this.unpipe = Readable$1.prototype.unpipe;
-      this.on = Readable$1.prototype.on;
-      this.addListener = Readable$1.prototype.addListener;
-      this.resume = Readable$1.prototype.resume;
-      this.pause = Readable$1.prototype.pause;
-      this.wrap = Readable$1.prototype.wrap;
-      this.push = Transform$2.prototype.push;
-      this._read = Transform$2.prototype._read;
-      this._destroy = Transform$2.prototype._destroy;
-    }`
+                  Object.assign(this, EventEmitter.prototype);
+                  this.push = Readable$1.prototype.push;
+                  this.unshift = Readable$1.prototype.unshift;
+                  this.isPaused = Readable$1.prototype.isPaused;
+                  this.setEncoding = Readable$1.prototype.setEncoding;
+                  this.read = Readable$1.prototype.read;
+                  this.pipe = Readable$1.prototype.pipe;
+                  this.unpipe = Readable$1.prototype.unpipe;
+                  this.on = Readable$1.prototype.on;
+                  this.addListener = Readable$1.prototype.addListener;
+                  this.resume = Readable$1.prototype.resume;
+                  this.pause = Readable$1.prototype.pause;
+                  this.wrap = Readable$1.prototype.wrap;
+                  this.push = Transform$2.prototype.push;
+                  this._read = Transform$2.prototype._read;
+                  this._destroy = Transform$2.prototype._destroy;
+                }`
           },
           delimiters: ['', ''],
           preventAssignment: false,
@@ -114,7 +115,8 @@ const config = defineConfig({
       include: [/\.vue$/, /\.vue\?vue/],
       exclude: [/[\\/]node_modules[\\/]/, /[\\/]\.git[\\/]/, /[\\/]\.nuxt[\\/]/],
       resolvers: [
-        BootstrapVueResolver()
+        // From Bootstrap Vue resolver
+        // BootstrapVueResolver()
       ],
     }),
   ],