diff --git a/src/components/calendar/CalendarEvent.vue b/src/components/calendar/CalendarEvent.vue
index eecc0b6..1b1e22a 100644
--- a/src/components/calendar/CalendarEvent.vue
+++ b/src/components/calendar/CalendarEvent.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { Popover, PopoverTrigger } from '@/components/ui/popover'
-import type { CalendarEvent } from '@/stores/events'
+import type { CalendarEvent } from '@/models/Events'
 import CalendarEventDetails from './CalendarEventDetails.vue'
 
 defineProps<{
diff --git a/src/components/calendar/CalendarEventDetails.vue b/src/components/calendar/CalendarEventDetails.vue
index 7bf59fb..790d30b 100644
--- a/src/components/calendar/CalendarEventDetails.vue
+++ b/src/components/calendar/CalendarEventDetails.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { PopoverContent } from '@/components/ui/popover'
+import type { CalendarEvent } from '@/models/Events'
 import { useCalendar } from '@/stores/calendar'
-import type { CalendarEvent } from '@/stores/events'
 
 const { getFormattedDateTitle } = useCalendar()
 
diff --git a/src/components/calendar/CalendarMenu.vue b/src/components/calendar/CalendarMenu.vue
index 844bfe5..6c60034 100644
--- a/src/components/calendar/CalendarMenu.vue
+++ b/src/components/calendar/CalendarMenu.vue
@@ -3,7 +3,7 @@ import { useCalendar } from '@/stores/calendar'
 import CalendarMenuToday from './CalendarMenuToday.vue'
 import CalendarMenuNav from './CalendarMenuNav.vue'
 import CalendarSwitch from './CalendarSwitch.vue'
-import CalendarMenuSearch from './CalendarMenuSearch.vue'
+import CalendarSearch from './search/CalendarSearch.vue'
 
 const { currentDate } = useCalendar()
 </script>
@@ -31,7 +31,7 @@ const { currentDate } = useCalendar()
           </div>
         </div>
         <div class="md:col-span-3 flex justify-end">
-          <CalendarMenuSearch />
+          <CalendarSearch />
         </div>
       </div>
     </div>
diff --git a/src/components/calendar/CalendarMenuNav.vue b/src/components/calendar/CalendarMenuNav.vue
index b42b5f9..6f9fa2e 100644
--- a/src/components/calendar/CalendarMenuNav.vue
+++ b/src/components/calendar/CalendarMenuNav.vue
@@ -1,13 +1,13 @@
 <script lang="ts" setup>
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
 import { useCalendar } from '@/stores/calendar'
-import Button from '../ui/button/Button.vue'
 import {
   PhCaretDoubleLeft,
   PhCaretDoubleRight,
   PhCaretLeft,
   PhCaretRight
 } from '@phosphor-icons/vue'
+import Button from '../ui/button/Button.vue'
 
 const { decrementMonth, incrementMonth, decrementYear, incrementYear } = useCalendar()
 </script>
diff --git a/src/components/calendar/CalendarMenuSearch.vue b/src/components/calendar/CalendarMenuSearch.vue
deleted file mode 100644
index f9d9be4..0000000
--- a/src/components/calendar/CalendarMenuSearch.vue
+++ /dev/null
@@ -1,89 +0,0 @@
-<script lang="ts" setup>
-import { ref, computed } from 'vue'
-import { Button } from '@/components/ui/button'
-import { Dialog, DialogContent, DialogTrigger } from '@/components/ui/dialog'
-import { Input } from '@/components/ui/input'
-import { PhMagnifyingGlass } from '@phosphor-icons/vue'
-import { useCalendarEvents } from '@/stores/events'
-import CalendarMenuSearchResults from './CalendarMenuSearchResults.vue'
-import { useMagicKeys, whenever } from '@vueuse/core'
-
-const { allEvents } = useCalendarEvents()
-
-const modalOpen = ref(false)
-
-const searchQuery = ref('')
-const searchEnough = computed(() => searchQuery.value.length >= 2)
-const displaySearch = computed(() => searchQuery.value && searchEnough.value)
-
-const unifier = new RegExp(/[^a-zA-Z0-9\-'']/g)
-
-const searchResults = computed(() => {
-  return allEvents.filter((event) => {
-    const queryString = new String(searchQuery.value).replace(unifier, '').toLocaleLowerCase()
-    const hitTitle = event.title.replace(unifier, '').toLocaleLowerCase().includes(queryString)
-    const hitDesc = event.description
-      ?.replace(unifier, '')
-      .toLocaleLowerCase()
-      .includes(queryString)
-
-    return hitTitle || hitDesc
-  })
-})
-
-function resetSearch() {
-  searchQuery.value = ''
-}
-
-function openDialog() {
-  modalOpen.value = true
-}
-
-function closeDialog() {
-  modalOpen.value = false
-}
-
-// Key combos to deploy modal
-const keys = useMagicKeys()
-
-whenever(keys.control_period, () => {
-  openDialog()
-})
-</script>
-
-<template>
-  <Dialog v-model:open="modalOpen" @update:open="resetSearch">
-    <DialogTrigger>
-      <Button search-slash>
-        <PhMagnifyingGlass size="20" weight="light" />
-        Recherche avancée
-      </Button>
-    </DialogTrigger>
-
-    <DialogContent
-      class="flex flex-col flex-nowrap top-32 -translate-y-0 data-[state=closed]:slide-out-to-top-[2rem] data-[state=open]:slide-in-from-top-[2rem]"
-      :class="{
-        'bottom-16': displaySearch && searchResults.length > 0
-      }"
-    >
-      <div class="relative w-full h-fit">
-        <Input
-          id="search"
-          type="text"
-          placeholder="Rechercher un évènement, un personnage…"
-          class="pl-10 py-6 text-lg"
-          v-model:model-value="searchQuery"
-          autocomplete="off"
-        />
-        <span class="absolute start-1 inset-y-0 flex items-center justify-center px-2 opacity-50">
-          <PhMagnifyingGlass size="20" />
-        </span>
-      </div>
-
-      <div v-if="displaySearch && searchResults.length > 0" class="overflow-y-auto">
-        <hr class="mb-4" />
-        <CalendarMenuSearchResults :events="searchResults" @jumped-to-date="closeDialog()" />
-      </div>
-    </DialogContent>
-  </Dialog>
-</template>
diff --git a/src/components/calendar/CalendarMenuSearchResults.vue b/src/components/calendar/CalendarMenuSearchResults.vue
deleted file mode 100644
index d29934b..0000000
--- a/src/components/calendar/CalendarMenuSearchResults.vue
+++ /dev/null
@@ -1,49 +0,0 @@
-<script lang="ts" setup>
-import type { LeimDate } from '@/models/Date'
-import { useCalendar } from '@/stores/calendar'
-import type { CalendarEvent } from '@/stores/events'
-
-defineProps<{
-  events: CalendarEvent[]
-}>()
-
-const emit = defineEmits(['jumpedToDate'])
-
-const { jumpToDate } = useCalendar()
-
-function handleJumpToDate(date: LeimDate) {
-  jumpToDate(date)
-  emit('jumpedToDate')
-}
-</script>
-
-<template>
-  <ul class="grid gap-3">
-    <li v-for="e in events" :key="e.title">
-      <button
-        class="block w-full text-left p-2 rounded-sm"
-        :class="{
-          'bg-slate-600 hover:bg-slate-700': !e.category,
-          'bg-green-700 hover:bg-green-800': e.category === 'birth',
-          'bg-stone-600 hover:bg-stone-800': e.category === 'death',
-          'bg-red-600 hover:bg-red-800': e.category === 'catastrophe',
-          'bg-pink-600 hover:bg-pink-800': e.category === 'natural-disaster',
-          'bg-blue-600 hover:bg-blue-800': e.category === 'legal',
-          'bg-amber-700 hover:bg-amber-800': e.category === 'player'
-        }"
-        @click="handleJumpToDate(e.date)"
-      >
-        <div>
-          {{ e.title }}
-        </div>
-
-        <div v-if="e.description" class="text-sm">
-          <hr class="my-2 border-white opacity-25" />
-          <span class="opacity-75">
-            {{ e.description }}
-          </span>
-        </div>
-      </button>
-    </li>
-  </ul>
-</template>
diff --git a/src/components/calendar/CalendarSwitch.vue b/src/components/calendar/CalendarSwitch.vue
index 727e7ec..8432b47 100644
--- a/src/components/calendar/CalendarSwitch.vue
+++ b/src/components/calendar/CalendarSwitch.vue
@@ -7,10 +7,10 @@ import {
   DropdownMenuSeparator,
   DropdownMenuTrigger
 } from '@/components/ui/dropdown-menu'
-import Button from '../ui/button/Button.vue'
 import { useCalendar } from '@/stores/calendar'
-import { computed } from 'vue'
 import { PhCalendarBlank } from '@phosphor-icons/vue'
+import { computed } from 'vue'
+import Button from '../ui/button/Button.vue'
 
 const { currentConfig, viewTypeOptions, getViewTypeTitle, setViewType } = useCalendar()
 
diff --git a/src/components/calendar/CalendarTile.vue b/src/components/calendar/CalendarTile.vue
index 0945f58..f7184e9 100644
--- a/src/components/calendar/CalendarTile.vue
+++ b/src/components/calendar/CalendarTile.vue
@@ -2,9 +2,9 @@
 import type { LeimDate } from '@/models/Date'
 import { useCalendar } from '@/stores/calendar'
 import { useCalendarEvents } from '@/stores/events'
+import { storeToRefs } from 'pinia'
 import { computed } from 'vue'
 import CalendarEvent from './CalendarEvent.vue'
-import { storeToRefs } from 'pinia'
 
 const props = defineProps<{
   date: LeimDate
diff --git a/src/components/calendar/Search.ts b/src/components/calendar/Search.ts
new file mode 100644
index 0000000..b565e1c
--- /dev/null
+++ b/src/components/calendar/Search.ts
@@ -0,0 +1,3 @@
+export const searchUnifier = new RegExp(/[^a-zA-Z0-9\-'']/g)
+
+export type SearchMode = 'characters' | 'events' | undefined
diff --git a/src/components/calendar/search/CalendarSearch.vue b/src/components/calendar/search/CalendarSearch.vue
new file mode 100644
index 0000000..4a0a4dd
--- /dev/null
+++ b/src/components/calendar/search/CalendarSearch.vue
@@ -0,0 +1,150 @@
+<script lang="ts" setup>
+import { Button } from '@/components/ui/button'
+import { Dialog, DialogContent, DialogTrigger } from '@/components/ui/dialog'
+import { Input } from '@/components/ui/input'
+import { ToggleGroup, ToggleGroupItem } from '@/components/ui/toggle-group'
+import { useCharacters } from '@/stores/characters'
+import { useCalendarEvents } from '@/stores/events'
+import { PhMagnifyingGlass } from '@phosphor-icons/vue'
+import { useMagicKeys, useStorage, useTimeoutFn, whenever } from '@vueuse/core'
+import { computed, ref } from 'vue'
+import { searchUnifier, type SearchMode } from '../Search'
+import SearchList from './lists/SearchList.vue'
+import { isCalendarEvent, type CalendarEvent } from '@/models/Events'
+import { isCharacter, type Character } from '@/models/Characters'
+
+const { characters } = useCharacters()
+const { baseEvents } = useCalendarEvents()
+
+const modalOpen = ref(false)
+
+const searchQuery = ref('')
+const searchEnough = computed(() => searchQuery.value.length >= 2)
+
+const selectedEntity = useStorage('se', undefined as SearchMode)
+
+const searchResults = computed(() => {
+  let results: (Character | CalendarEvent)[] = []
+  let dataToFilter: Character[] | CalendarEvent[] | (Character | CalendarEvent)[]
+
+  // Assign data to loop over and filter
+  // They are assigned this way for readability
+  if (selectedEntity.value === 'events') {
+    dataToFilter = baseEvents
+  } else if (selectedEntity.value === 'characters') {
+    dataToFilter = characters
+  } else {
+    dataToFilter = [...baseEvents, ...characters]
+  }
+
+  results = dataToFilter.filter((item) => {
+    // Filter calendar events
+    if (isCalendarEvent(item)) {
+      const queryString = new String(searchQuery.value)
+        .replace(searchUnifier, '')
+        .toLocaleLowerCase()
+
+      const hitTitle = item.title
+        .replace(searchUnifier, '')
+        .toLocaleLowerCase()
+        .includes(queryString)
+      const hitDesc = item.description
+        ?.replace(searchUnifier, '')
+        .toLocaleLowerCase()
+        .includes(queryString)
+
+      return hitTitle || hitDesc
+    }
+
+    // Filter characters
+    if (isCharacter(item)) {
+      const queryString = new String(searchQuery.value)
+        .replace(searchUnifier, '')
+        .toLocaleLowerCase()
+
+      const hitTitle = item.name
+        .replace(searchUnifier, '')
+        .toLocaleLowerCase()
+        .includes(queryString)
+
+      return hitTitle
+    }
+  })
+
+  return results
+})
+
+function resetSearch() {
+  searchQuery.value = ''
+}
+
+const resetSearchLazy = useTimeoutFn(() => {
+  resetSearch()
+}, 300)
+
+function openDialog() {
+  modalOpen.value = true
+}
+
+function closeDialog() {
+  modalOpen.value = false
+}
+
+// Key combos to deploy modal
+const keys = useMagicKeys()
+
+whenever(keys.control_period, () => {
+  openDialog()
+})
+</script>
+
+<template>
+  <Dialog v-model:open="modalOpen" @update:open="resetSearchLazy.start">
+    <DialogTrigger>
+      <Button search-slash>
+        <PhMagnifyingGlass size="20" weight="light" />
+        Recherche avancée
+      </Button>
+    </DialogTrigger>
+
+    <DialogContent
+      class="flex flex-col flex-nowrap top-16 -translate-y-0 data-[state=closed]:slide-out-to-top-[5%] data-[state=open]:slide-in-from-top-[5%]"
+      :class="{
+        'bottom-16': searchResults.length > 0
+      }"
+    >
+      <div class="relative w-full h-fit">
+        <Input
+          id="search"
+          type="text"
+          placeholder="Rechercher le calendrier"
+          class="pl-10 py-6 text-lg"
+          v-model:model-value="searchQuery"
+          autocomplete="off"
+        />
+        <span class="absolute start-1 inset-y-0 flex items-center justify-center px-2 opacity-50">
+          <PhMagnifyingGlass size="20" />
+        </span>
+      </div>
+
+      <ToggleGroup type="single" class="justify-start" v-model="selectedEntity">
+        <ToggleGroupItem value="events" aria-label="Uniquement les évènements">
+          Évènements
+        </ToggleGroupItem>
+        <ToggleGroupItem value="characters" aria-label="Uniquement les personnages">
+          Personnages
+        </ToggleGroupItem>
+      </ToggleGroup>
+
+      <hr />
+
+      <div v-if="searchResults.length > 0" class="overflow-y-auto">
+        <SearchList
+          :results="searchResults"
+          :current-entity="selectedEntity"
+          @jumped-to-date="closeDialog()"
+        />
+      </div>
+    </DialogContent>
+  </Dialog>
+</template>
diff --git a/src/components/calendar/search/lists/SearchList.vue b/src/components/calendar/search/lists/SearchList.vue
new file mode 100644
index 0000000..0a683b6
--- /dev/null
+++ b/src/components/calendar/search/lists/SearchList.vue
@@ -0,0 +1,99 @@
+<script lang="ts" setup>
+import { Button } from '@/components/ui/button'
+import { isCharacter, type Character } from '@/models/Characters'
+import type { LeimDate } from '@/models/Date'
+import { isCalendarEvent, type CalendarEvent } from '@/models/Events'
+import { useCalendar } from '@/stores/calendar'
+import { computed } from 'vue'
+import type { SearchMode } from '../../Search'
+
+const props = defineProps<{
+  results: (Character | CalendarEvent)[]
+  currentEntity: SearchMode
+}>()
+
+const emit = defineEmits(['jumpedToDate'])
+
+const { getFormattedDateTitle, jumpToDate } = useCalendar()
+
+function handleJumpToDate(date?: LeimDate) {
+  if (!date) return
+
+  jumpToDate(date)
+  emit('jumpedToDate')
+}
+
+const searchLimit = 10
+const activeSearchLimit = computed<number>(() => (!props.currentEntity ? searchLimit : 9999))
+
+const resultsToDisplay = computed(() => props.results.slice(0, activeSearchLimit.value))
+</script>
+
+<template>
+  <ul class="grid gap-3">
+    <li v-for="r in resultsToDisplay" :key="isCalendarEvent(r) ? r.title : r.name">
+      <button
+        v-if="isCalendarEvent(r)"
+        class="block w-full text-left p-2 rounded-sm"
+        :class="{
+          'bg-slate-600 hover:bg-slate-700': !r.category,
+          'bg-green-700 hover:bg-green-800': r.category === 'birth',
+          'bg-stone-600 hover:bg-stone-800': r.category === 'death',
+          'bg-red-600 hover:bg-red-800': r.category === 'catastrophe',
+          'bg-pink-600 hover:bg-pink-800': r.category === 'natural-disaster',
+          'bg-blue-600 hover:bg-blue-800': r.category === 'legal',
+          'bg-amber-700 hover:bg-amber-800': r.category === 'player'
+        }"
+        @click="handleJumpToDate(r.date)"
+      >
+        <div>
+          {{ r.title }}
+        </div>
+
+        <div>
+          <span class="opacity-75 italic">{{ getFormattedDateTitle(r.date, true) }}</span>
+        </div>
+
+        <div v-if="r.description" class="text-sm">
+          <hr class="my-2 border-white opacity-25" />
+          <span class="opacity-75">
+            {{ r.description }}
+          </span>
+        </div>
+      </button>
+
+      <div
+        v-else-if="isCharacter(r)"
+        class="block w-full text-left py-2 px-4 border-[1px] border-slate-700 rounded-sm"
+      >
+        <div class="flex items-center gap-6">
+          <div>
+            <div>
+              {{ r.name }}
+            </div>
+
+            <div v-if="r.description" class="text-sm">
+              <hr class="my-2 border-white opacity-25" />
+              <span class="opacity-75">
+                {{ r.description }}
+              </span>
+            </div>
+          </div>
+
+          <menu class="flex gap-2">
+            <li v-if="r.birth">
+              <Button @click="handleJumpToDate(r.birth)" variant="outline" size="sm">
+                Naissance
+              </Button>
+            </li>
+            <li v-if="r.death">
+              <Button @click="handleJumpToDate(r.death)" variant="outline" size="sm">
+                Décès
+              </Button>
+            </li>
+          </menu>
+        </div>
+      </div>
+    </li>
+  </ul>
+</template>
diff --git a/src/components/calendar/state/Monthly.vue b/src/components/calendar/state/Monthly.vue
index 97ff335..60cceaa 100644
--- a/src/components/calendar/state/Monthly.vue
+++ b/src/components/calendar/state/Monthly.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup>
 import type { LeimDate } from '@/models/Date'
 import { useCalendar } from '@/stores/calendar'
+import { useThrottleFn } from '@vueuse/core'
 import { computed } from 'vue'
 import CalendarTile from '../CalendarTile.vue'
-import { useThrottleFn } from '@vueuse/core'
 
 const { staticConfig, currentDate, decrementMonth, incrementMonth } = useCalendar()
 
diff --git a/src/components/ui/tabs/Tabs.vue b/src/components/ui/tabs/Tabs.vue
new file mode 100644
index 0000000..2fa0971
--- /dev/null
+++ b/src/components/ui/tabs/Tabs.vue
@@ -0,0 +1,15 @@
+<script setup lang="ts">
+import { TabsRoot, useForwardPropsEmits } from 'radix-vue'
+import type { TabsRootEmits, TabsRootProps } from 'radix-vue'
+
+const props = defineProps<TabsRootProps>()
+const emits = defineEmits<TabsRootEmits>()
+
+const forwarded = useForwardPropsEmits(props, emits)
+</script>
+
+<template>
+  <TabsRoot v-bind="forwarded">
+    <slot />
+  </TabsRoot>
+</template>
diff --git a/src/components/ui/tabs/TabsContent.vue b/src/components/ui/tabs/TabsContent.vue
new file mode 100644
index 0000000..475dc94
--- /dev/null
+++ b/src/components/ui/tabs/TabsContent.vue
@@ -0,0 +1,27 @@
+<script setup lang="ts">
+import { type HTMLAttributes, computed } from 'vue'
+import { TabsContent, type TabsContentProps } from 'radix-vue'
+import { cn } from '@/lib/utils'
+
+const props = defineProps<TabsContentProps & { class?: HTMLAttributes['class'] }>()
+
+const delegatedProps = computed(() => {
+  const { class: _, ...delegated } = props
+
+  return delegated
+})
+</script>
+
+<template>
+  <TabsContent
+    :class="
+      cn(
+        'mt-2 ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2',
+        props.class
+      )
+    "
+    v-bind="delegatedProps"
+  >
+    <slot />
+  </TabsContent>
+</template>
diff --git a/src/components/ui/tabs/TabsList.vue b/src/components/ui/tabs/TabsList.vue
new file mode 100644
index 0000000..4d6c7f7
--- /dev/null
+++ b/src/components/ui/tabs/TabsList.vue
@@ -0,0 +1,27 @@
+<script setup lang="ts">
+import { type HTMLAttributes, computed } from 'vue'
+import { TabsList, type TabsListProps } from 'radix-vue'
+import { cn } from '@/lib/utils'
+
+const props = defineProps<TabsListProps & { class?: HTMLAttributes['class'] }>()
+
+const delegatedProps = computed(() => {
+  const { class: _, ...delegated } = props
+
+  return delegated
+})
+</script>
+
+<template>
+  <TabsList
+    v-bind="delegatedProps"
+    :class="
+      cn(
+        'inline-flex h-10 items-center justify-center rounded-md bg-muted p-1 text-muted-foreground',
+        props.class
+      )
+    "
+  >
+    <slot />
+  </TabsList>
+</template>
diff --git a/src/components/ui/tabs/TabsTrigger.vue b/src/components/ui/tabs/TabsTrigger.vue
new file mode 100644
index 0000000..79c4dc9
--- /dev/null
+++ b/src/components/ui/tabs/TabsTrigger.vue
@@ -0,0 +1,29 @@
+<script setup lang="ts">
+import { type HTMLAttributes, computed } from 'vue'
+import { TabsTrigger, type TabsTriggerProps, useForwardProps } from 'radix-vue'
+import { cn } from '@/lib/utils'
+
+const props = defineProps<TabsTriggerProps & { class?: HTMLAttributes['class'] }>()
+
+const delegatedProps = computed(() => {
+  const { class: _, ...delegated } = props
+
+  return delegated
+})
+
+const forwardedProps = useForwardProps(delegatedProps)
+</script>
+
+<template>
+  <TabsTrigger
+    v-bind="forwardedProps"
+    :class="
+      cn(
+        'inline-flex items-center justify-center whitespace-nowrap rounded-sm px-3 py-1.5 text-sm font-medium ring-offset-background transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-background data-[state=active]:text-foreground data-[state=active]:shadow-sm',
+        props.class
+      )
+    "
+  >
+    <slot />
+  </TabsTrigger>
+</template>
diff --git a/src/components/ui/tabs/index.ts b/src/components/ui/tabs/index.ts
new file mode 100644
index 0000000..fbea0c6
--- /dev/null
+++ b/src/components/ui/tabs/index.ts
@@ -0,0 +1,4 @@
+export { default as Tabs } from './Tabs.vue'
+export { default as TabsTrigger } from './TabsTrigger.vue'
+export { default as TabsList } from './TabsList.vue'
+export { default as TabsContent } from './TabsContent.vue'
diff --git a/src/components/ui/toggle-group/ToggleGroup.vue b/src/components/ui/toggle-group/ToggleGroup.vue
new file mode 100644
index 0000000..3ff029e
--- /dev/null
+++ b/src/components/ui/toggle-group/ToggleGroup.vue
@@ -0,0 +1,44 @@
+<script setup lang="ts">
+import type { VariantProps } from 'class-variance-authority'
+import { type HTMLAttributes, computed, provide } from 'vue'
+import {
+  ToggleGroupRoot,
+  type ToggleGroupRootEmits,
+  type ToggleGroupRootProps,
+  useForwardPropsEmits
+} from 'radix-vue'
+import type { toggleVariants } from '@/components/ui/toggle'
+import { cn } from '@/lib/utils'
+
+type ToggleGroupVariants = VariantProps<typeof toggleVariants>
+
+const props = defineProps<
+  ToggleGroupRootProps & {
+    class?: HTMLAttributes['class']
+    variant?: ToggleGroupVariants['variant']
+    size?: ToggleGroupVariants['size']
+  }
+>()
+const emits = defineEmits<ToggleGroupRootEmits>()
+
+provide('toggleGroup', {
+  variant: props.variant,
+  size: props.size
+})
+
+const delegatedProps = computed(() => {
+  const { class: _, ...delegated } = props
+  return delegated
+})
+
+const forwarded = useForwardPropsEmits(delegatedProps, emits)
+</script>
+
+<template>
+  <ToggleGroupRoot
+    v-bind="forwarded"
+    :class="cn('flex items-center justify-center gap-1', props.class)"
+  >
+    <slot />
+  </ToggleGroupRoot>
+</template>
diff --git a/src/components/ui/toggle-group/ToggleGroupItem.vue b/src/components/ui/toggle-group/ToggleGroupItem.vue
new file mode 100644
index 0000000..af7ca39
--- /dev/null
+++ b/src/components/ui/toggle-group/ToggleGroupItem.vue
@@ -0,0 +1,43 @@
+<script setup lang="ts">
+import type { VariantProps } from 'class-variance-authority'
+import { type HTMLAttributes, computed, inject } from 'vue'
+import { ToggleGroupItem, type ToggleGroupItemProps, useForwardProps } from 'radix-vue'
+import { toggleVariants } from '@/components/ui/toggle'
+import { cn } from '@/lib/utils'
+
+type ToggleGroupVariants = VariantProps<typeof toggleVariants>
+
+const props = defineProps<
+  ToggleGroupItemProps & {
+    class?: HTMLAttributes['class']
+    variant?: ToggleGroupVariants['variant']
+    size?: ToggleGroupVariants['size']
+  }
+>()
+
+const context = inject<ToggleGroupVariants>('toggleGroup')
+
+const delegatedProps = computed(() => {
+  const { class: _, variant, size, ...delegated } = props
+  return delegated
+})
+
+const forwardedProps = useForwardProps(delegatedProps)
+</script>
+
+<template>
+  <ToggleGroupItem
+    v-bind="forwardedProps"
+    :class="
+      cn(
+        toggleVariants({
+          variant: context?.variant || variant,
+          size: context?.size || size
+        }),
+        props.class
+      )
+    "
+  >
+    <slot />
+  </ToggleGroupItem>
+</template>
diff --git a/src/components/ui/toggle-group/index.ts b/src/components/ui/toggle-group/index.ts
new file mode 100644
index 0000000..9f89ad7
--- /dev/null
+++ b/src/components/ui/toggle-group/index.ts
@@ -0,0 +1,2 @@
+export { default as ToggleGroup } from './ToggleGroup.vue'
+export { default as ToggleGroupItem } from './ToggleGroupItem.vue'
diff --git a/src/components/ui/toggle/Toggle.vue b/src/components/ui/toggle/Toggle.vue
new file mode 100644
index 0000000..8092669
--- /dev/null
+++ b/src/components/ui/toggle/Toggle.vue
@@ -0,0 +1,37 @@
+<script setup lang="ts">
+import { type HTMLAttributes, computed } from 'vue'
+import { Toggle, type ToggleEmits, type ToggleProps, useForwardPropsEmits } from 'radix-vue'
+import { type ToggleVariants, toggleVariants } from '.'
+import { cn } from '@/lib/utils'
+
+const props = withDefaults(
+  defineProps<
+    ToggleProps & {
+      class?: HTMLAttributes['class']
+      variant?: ToggleVariants['variant']
+      size?: ToggleVariants['size']
+    }
+  >(),
+  {
+    variant: 'default',
+    size: 'default',
+    disabled: false
+  }
+)
+
+const emits = defineEmits<ToggleEmits>()
+
+const delegatedProps = computed(() => {
+  const { class: _, size, variant, ...delegated } = props
+
+  return delegated
+})
+
+const forwarded = useForwardPropsEmits(delegatedProps, emits)
+</script>
+
+<template>
+  <Toggle v-bind="forwarded" :class="cn(toggleVariants({ variant, size }), props.class)">
+    <slot />
+  </Toggle>
+</template>
diff --git a/src/components/ui/toggle/index.ts b/src/components/ui/toggle/index.ts
new file mode 100644
index 0000000..6eed09f
--- /dev/null
+++ b/src/components/ui/toggle/index.ts
@@ -0,0 +1,26 @@
+import { type VariantProps, cva } from 'class-variance-authority'
+
+export { default as Toggle } from './Toggle.vue'
+
+export const toggleVariants = cva(
+  'inline-flex items-center justify-center rounded-md text-sm font-medium ring-offset-background transition-colors hover:bg-muted hover:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=on]:bg-accent data-[state=on]:text-accent-foreground',
+  {
+    variants: {
+      variant: {
+        default: 'bg-transparent',
+        outline: 'border border-input bg-transparent hover:bg-accent hover:text-accent-foreground'
+      },
+      size: {
+        default: 'h-10 px-3',
+        sm: 'h-9 px-2.5',
+        lg: 'h-11 px-5'
+      }
+    },
+    defaultVariants: {
+      variant: 'default',
+      size: 'default'
+    }
+  }
+)
+
+export type ToggleVariants = VariantProps<typeof toggleVariants>
diff --git a/src/models/Characters.ts b/src/models/Characters.ts
new file mode 100644
index 0000000..6373603
--- /dev/null
+++ b/src/models/Characters.ts
@@ -0,0 +1,12 @@
+import type { LeimDate } from './Date'
+
+export interface Character {
+  name: string
+  description?: string
+  birth?: LeimDate
+  death?: LeimDate
+}
+
+export function isCharacter(object: any): object is Character {
+  return 'birth' in object
+}
diff --git a/src/models/Date.ts b/src/models/Date.ts
index 6c8950a..dcad803 100644
--- a/src/models/Date.ts
+++ b/src/models/Date.ts
@@ -1,4 +1,4 @@
-export type LeimDate = {
+export interface LeimDate {
   day: number
   month: number
   year: number
diff --git a/src/models/Events.ts b/src/models/Events.ts
new file mode 100644
index 0000000..720794e
--- /dev/null
+++ b/src/models/Events.ts
@@ -0,0 +1,20 @@
+import type { LeimDate } from './Date'
+
+export interface CalendarEvent {
+  title: string
+  date: LeimDate
+  description?: string
+  category?: CalendarEventCategory
+}
+
+export type CalendarEventCategory =
+  | 'birth'
+  | 'death'
+  | 'catastrophe'
+  | 'legal'
+  | 'natural-disaster'
+  | 'player'
+
+export function isCalendarEvent(object: any): object is CalendarEvent {
+  return 'date' in object
+}
diff --git a/src/stores/calendar.ts b/src/stores/calendar.ts
index ba640df..4d05170 100644
--- a/src/stores/calendar.ts
+++ b/src/stores/calendar.ts
@@ -1,8 +1,8 @@
-import { computed, type Ref, type ComputedRef, ref } from 'vue'
-import { defineStore } from 'pinia'
-import { useUrlSearchParams } from '@vueuse/core'
 import type { LeimDate, LeimPeriod, LeimPeriodShort } from '@/models/Date'
 import { isDigit, isInt, isSignedInt } from '@/utils/Regex'
+import { useUrlSearchParams } from '@vueuse/core'
+import { defineStore } from 'pinia'
+import { computed, ref, type ComputedRef, type Ref } from 'vue'
 
 type CalendarViewType = 'month' | 'year' | 'decade' | 'century'
 
diff --git a/src/stores/characters.ts b/src/stores/characters.ts
index 58d9023..f4eb0a6 100644
--- a/src/stores/characters.ts
+++ b/src/stores/characters.ts
@@ -1,13 +1,7 @@
+import type { Character } from '@/models/Characters'
 import { defineStore } from 'pinia'
-import type { LeimDate } from '@/models/Date'
 import { computed, type ComputedRef } from 'vue'
 
-export type Character = {
-  name: string
-  birth?: LeimDate
-  death?: LeimDate
-}
-
 export const useCharacters = defineStore('characters', () => {
   const characters: Character[] = [
     // Counts of the Alliance
diff --git a/src/stores/events.ts b/src/stores/events.ts
index 7599a72..d505ef9 100644
--- a/src/stores/events.ts
+++ b/src/stores/events.ts
@@ -1,24 +1,8 @@
+import type { CalendarEvent } from '@/models/Events'
 import { defineStore } from 'pinia'
-import { computed, watch, type Ref, ref, toRaw } from 'vue'
-import { useCharacters } from './characters'
-
-import type { LeimDate } from '@/models/Date'
+import { computed, ref, watch, type Ref } from 'vue'
 import { useCalendar } from './calendar'
-
-export type CalendarEvent = {
-  title: string
-  date: LeimDate
-  description?: string
-  category?: CalendarEventCategory
-}
-
-export type CalendarEventCategory =
-  | 'birth'
-  | 'death'
-  | 'catastrophe'
-  | 'legal'
-  | 'natural-disaster'
-  | 'player'
+import { useCharacters } from './characters'
 
 export const useCalendarEvents = defineStore('calendar-events', () => {
   const { currentDate, currentConfig } = useCalendar()
@@ -130,5 +114,5 @@ export const useCalendarEvents = defineStore('calendar-events', () => {
     return allEvents.value.filter((event) => shouldEventBeDisplayed(event))
   }
 
-  return { allEvents, currentEvents }
+  return { baseEvents, allEvents, currentEvents }
 })