diff --git a/src/components/Autocomplete.vue b/src/components/Autocomplete.vue
index d2b66bd..073a54a 100644
--- a/src/components/Autocomplete.vue
+++ b/src/components/Autocomplete.vue
@@ -499,7 +499,7 @@ function getMoreAsyncData() {
         icon="search"
         clearable
         :data="filteredDataBase"
-        @select="(option: string) => (selectedBase = option)">
+        @select="(option: string | number) => (selectedBase = option)">
         <template #empty>No results found</template>
       </o-autocomplete>
     </o-field>
diff --git a/src/components/Collapse.vue b/src/components/Collapse.vue
index 6dcb9b6..95bbb3c 100644
--- a/src/components/Collapse.vue
+++ b/src/components/Collapse.vue
@@ -36,7 +36,7 @@ const collapses = ref([
         <o-button
           variant="primary"
           aria-controls="contentIdForA11y1"
-          label="Click me!" />"
+          label="Click me!" />
       </template>
       <div class="card card-body">
         <h3>Subtitle</h3>
diff --git a/src/components/Datepicker.vue b/src/components/Datepicker.vue
index b97b17e..f6d9a01 100644
--- a/src/components/Datepicker.vue
+++ b/src/components/Datepicker.vue
@@ -5,8 +5,12 @@ const today = new Date();
 const thisMonth = today.getMonth();
 const thisYear = today.getFullYear();
 const events = [
-  new Date(thisYear, thisMonth, 2),
-  new Date(thisYear, thisMonth, 6),
+  {
+    date: new Date(thisYear, thisMonth, 2),
+  },
+  {
+    date: new Date(thisYear, thisMonth, 6),
+  },
   {
     date: new Date(thisYear, thisMonth, 6),
     type: "info",
@@ -23,7 +27,9 @@ const events = [
     date: new Date(thisYear, thisMonth, 10),
     type: "link",
   },
-  new Date(thisYear, thisMonth, 12),
+  {
+    date: new Date(thisYear, thisMonth, 12),
+  },
   {
     date: new Date(thisYear, thisMonth, 12),
     type: "warning",
@@ -32,7 +38,9 @@ const events = [
     date: new Date(thisYear, thisMonth, 16),
     type: "danger",
   },
-  new Date(thisYear, thisMonth, 20),
+  {
+    date: new Date(thisYear, thisMonth, 20),
+  },
   {
     date: new Date(thisYear, thisMonth, 29),
     type: "success",
@@ -73,7 +81,7 @@ const selectedString = computed(() =>
   selected.value ? selected.value.toDateString() : "",
 );
 
-const date = ref<Date | null>(new Date());
+const date = ref<Date | undefined>(new Date());
 const multiple = ref([]);
 const range = ref([]);
 
@@ -90,8 +98,11 @@ const maxDate = new Date(
 
 const month = ref();
 
-function selectMonth(option: { name: string; value: number }) {
-  if (!option || !date.value) return;
+function selectMonth(name: string) {
+  if (!name || !date.value) return;
+
+  const option = months.find((m) => m.name === name);
+  if (!option) return;
 
   date.value.setMonth(option.value);
 }
@@ -238,7 +249,7 @@ const datepickerRef = ref();
               :data="months"
               field="name"
               expanded
-              @select="selectMonth" />
+              @select="(v) => selectMonth(v as string)" />
             <o-button disabled :label="date?.getFullYear().toString()" />
           </o-field>
         </template>
@@ -249,7 +260,7 @@ const datepickerRef = ref();
               <span>Today</span>
             </o-button>
 
-            <o-button variant="danger" @click="date = null">
+            <o-button variant="danger" @click="date = undefined">
               <o-icon icon="times" />
               <span>Clear</span>
             </o-button>
diff --git a/src/components/Datetimepicker.vue b/src/components/Datetimepicker.vue
index e932019..de64267 100644
--- a/src/components/Datetimepicker.vue
+++ b/src/components/Datetimepicker.vue
@@ -6,10 +6,10 @@ const enableSeconds = ref(false);
 const hourFormat = ref(); // Browser locale
 const locale = ref(); // Browser locale
 
-const datetime = ref<Date | null>(new Date());
+const datetime = ref<Date | undefined>(new Date());
 
-const minDatetime = ref(null);
-const maxDatetime = ref(null);
+const minDatetime = ref();
+const maxDatetime = ref();
 </script>
 
 <template>
@@ -83,7 +83,7 @@ const maxDatetime = ref(null);
               <o-icon icon="calendar" />
               <span>Today</span>
             </o-button>
-            <o-button variant="danger" @click="datetime = null">
+            <o-button variant="danger" @click="datetime = undefined">
               <o-icon icon="times" />
               <span>Clear</span>
             </o-button>
diff --git a/src/components/Notification.vue b/src/components/Notification.vue
index 09a8898..c550d27 100644
--- a/src/components/Notification.vue
+++ b/src/components/Notification.vue
@@ -143,9 +143,7 @@ function danger() {
   <section>
     <h3>Add custom buttons</h3>
 
-    <o-notification
-      v-slot="{ closeNotification }"
-      aria-close-label="Close notification">
+    <o-notification v-slot="{ close }" aria-close-label="Close notification">
       <div class="d-inline-flex">
         <span>
           Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce id
@@ -156,7 +154,7 @@ function danger() {
           label="Cancel"
           variant="primary"
           size="small"
-          @click="closeNotification" />
+          @click="close" />
       </div>
     </o-notification>
   </section>
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 120b5db..389697d 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -8,7 +8,7 @@ const isFullwidth = ref(false);
 const isReduced = ref(false);
 const expandOnHover = ref(false);
 const teleport = ref(false);
-const position = ref("left");
+const position = ref<"bottom" | "top" | "right" | "left" | undefined>("left");
 const inline = ref(false);
 
 const toggleSidebar = () => {
diff --git a/src/components/Steps.vue b/src/components/Steps.vue
index cb28fe8..560fe17 100644
--- a/src/components/Steps.vue
+++ b/src/components/Steps.vue
@@ -17,8 +17,8 @@ const prevIcon = ref("chevron-left");
 const nextIcon = ref("chevron-right");
 const labelPosition = ref("bottom");
 const stepsPosition = ref("left");
-const position = ref(null);
-const size = ref(null);
+const position = ref();
+const size = ref();
 </script>
 
 <template>
diff --git a/src/components/Switch.vue b/src/components/Switch.vue
index 48bab09..52afdb9 100644
--- a/src/components/Switch.vue
+++ b/src/components/Switch.vue
@@ -6,8 +6,8 @@ const isSwitchedCustom = ref("Yes");
 const isRounded = ref(false);
 const position = ref("right");
 const size = ref("");
-const variant = ref(null);
-const passive = ref(null);
+const variant = ref();
+const passive = ref();
 </script>
 
 <template>
diff --git a/src/components/Table.vue b/src/components/Table.vue
index c547263..49d7258 100644
--- a/src/components/Table.vue
+++ b/src/components/Table.vue
@@ -132,7 +132,7 @@ const defaultSortDirection = ref("asc");
 const perPage = ref(3);
 
 const checkedRows = ref([]);
-const selected = ref(null);
+const selected = ref();
 </script>
 
 <template>
diff --git a/src/components/Taginput.vue b/src/components/Taginput.vue
index 072dbe4..7aabbe6 100644
--- a/src/components/Taginput.vue
+++ b/src/components/Taginput.vue
@@ -405,7 +405,6 @@ function getFilteredTags(text: string) {
         v-model="tags"
         variant="primary"
         :data="filteredTags"
-        autocomplete
         :allow-new="allowNew"
         :open-on-focus="openOnFocus"
         field="user.first_name"
@@ -424,7 +423,6 @@ function getFilteredTags(text: string) {
         disabled
         :model-value="['One']"
         :data="['One', 'Two', 'Three', 'Four']"
-        autocomplete
         :allow-new="allowNew"
         :open-on-focus="openOnFocus"
         icon="tag"
@@ -438,17 +436,19 @@ function getFilteredTags(text: string) {
     <h3>Limits</h3>
 
     <o-field label="Limited to 10 characters">
-      <o-taginput maxlength="10" :model-value="['Oruga', 'Vue', 'CSS']" />
+      <o-taginput :maxlength="10" :model-value="['Oruga', 'Vue', 'CSS']" />
     </o-field>
 
     <o-field label="Limited to 5 tags">
-      <o-taginput maxitems="5" :model-value="['One', 'Two', 'Three', 'Four']" />
+      <o-taginput
+        :maxitems="5"
+        :model-value="['One', 'Two', 'Three', 'Four']" />
     </o-field>
 
     <o-field label="Limited to 10 characters and 5 tags">
       <o-taginput
-        maxlength="10"
-        maxitems="5"
+        :maxlength="10"
+        :maxitems="5"
         :model-value="['Red', 'Green', 'Blue', 'White']" />
     </o-field>
   </section>
diff --git a/src/components/Timepicker.vue b/src/components/Timepicker.vue
index bd42767..d83e30a 100644
--- a/src/components/Timepicker.vue
+++ b/src/components/Timepicker.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ref } from "vue";
 
-const time = ref<Date | null>(null);
+const time = ref<Date>();
 const hourFormat = ref(undefined); // Browser locale
 const enableSeconds = ref(false);
 const locale = ref(undefined); // Browser locale
@@ -103,7 +103,7 @@ const hoursGranularity = ref(2);
           variant="danger"
           icon-left="times"
           outlined
-          @click="time = null" />
+          @click="time = undefined" />
       </o-timepicker>
     </o-field>
   </section>
diff --git a/src/components/Upload.vue b/src/components/Upload.vue
index dfd07f1..6dc0053 100644
--- a/src/components/Upload.vue
+++ b/src/components/Upload.vue
@@ -2,7 +2,7 @@
 import { ref } from "vue";
 
 const dropFiles = ref<File[]>([]);
-const file = ref<File | null>(null);
+const file = ref<File>();
 
 function deleteDropFile(index: number) {
   dropFiles.value.splice(index, 1);
diff --git a/tsconfig.json b/tsconfig.json
index 308e045..4403b2a 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -7,7 +7,12 @@
         "./src/*"
       ]
     },
-    "types": ["vite/client"]
+    "types": ["vite/client", "./node_modules/@oruga-ui/oruga-next/volar"]
   },
-  "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue"]
+  "include": [
+    "src/**/*.ts", 
+    "src/**/*.d.ts", 
+    "src/**/*.tsx", 
+    "src/**/*.vue",
+  ]
 }