diff --git a/spaces/components/DatePicker.vue b/spaces/components/DatePicker.vue
index 02cf05f..2a97b2c 100644
--- a/spaces/components/DatePicker.vue
+++ b/spaces/components/DatePicker.vue
@@ -30,9 +30,7 @@ const date = computed({
 const attrs = [{
   key: 'today',
   highlight: {
-    color: 'green',
     fillMode: 'outline',
-    class: '!bg-gray-100 dark:!bg-gray-800'
   },
   dates: new Date()
 }]
@@ -40,11 +38,13 @@ const attrs = [{
 
 <template>
   <VCalendarDatePicker
+      show-weeknumbers
       v-model="date"
       :mode="props.mode"
       is24hr
       transparent
       borderless
+      color="green"
       :attributes="attrs"
       :is-dark="isDark"
       title-position="left"
diff --git a/spaces/layouts/default.vue b/spaces/layouts/default.vue
index c215af8..ca9b75d 100644
--- a/spaces/layouts/default.vue
+++ b/spaces/layouts/default.vue
@@ -203,6 +203,11 @@ let links = computed(() => {
           to: "/calendar/grid",
           icon: "i-heroicons-calendar-days"
         }] : [],
+        ... dataStore.ownTenant.features.calendar ? [{
+          label: "Termine",
+          to: "/events",
+          icon: "i-heroicons-calendar-days"
+        }] : [],
         {
           label: "Dokumente",
           to: "/documents",
@@ -490,7 +495,7 @@ const footerLinks = [/*{
     <UColorModeImage
       light="/Logo.png"
       dark="/Logo_Dark.png"
-      class="w-1/2 mx-auto my-10"
+      class="w-1/3 mx-auto my-10"
     />
 
     <UProgress animation="carousel" class="w-3/4 mx-auto mt-10" />
diff --git a/spaces/pages/calendar/[mode].vue b/spaces/pages/calendar/[mode].vue
index 6cf74e0..9a0498d 100644
--- a/spaces/pages/calendar/[mode].vue
+++ b/spaces/pages/calendar/[mode].vue
@@ -105,12 +105,14 @@ const calendarOptionsGrid = reactive({
     newEventData.value.end = info.endStr
     //showNewEventModal.value = true
 
-    router.push(`/calendar/edit/?start=${info.startStr}&end=${info.endStr}&source=grid`)
+    router.push(`/events/edit/?start=${info.startStr}&end=${info.endStr}&source=grid`)
 
   },
   eventClick: function (info){
-    selectedEvent.value = info.event
-    showEventModal.value = true
+    console.log(info)
+    router.push(`/events/show/${info.event.id}`)
+    //selectedEvent.value = info.event
+    //showEventModal.value = true
   },
 })
 
@@ -144,11 +146,12 @@ const calendarOptionsTimeline = reactive({
     convertResourceIds()
     //showNewEventModal.value = true
 
-    router.push(`/calendar/edit/?start=${info.startStr}&end=${info.endStr}&resources=${JSON.stringify([info.resource.id])}&source=timeline`)
+    router.push(`/events/edit/?start=${info.startStr}&end=${info.endStr}&resources=${JSON.stringify([info.resource.id])}&source=timeline`)
   },
   eventClick: function (info){
-    selectedEvent.value = info.event
-    showEventModal.value = true
+    router.push(`/events/show/${info.event.id}`)
+    //selectedEvent.value = info.event
+    //showEventModal.value = true
   },
   resourceGroupField: "type",
   resourceOrder: "-type",
diff --git a/spaces/pages/calendar/edit/[[id]].vue b/spaces/pages/calendar/edit/[[id]].vue
deleted file mode 100644
index 8121b3c..0000000
--- a/spaces/pages/calendar/edit/[[id]].vue
+++ /dev/null
@@ -1,132 +0,0 @@
-<script setup>
-
-const route = useRoute()
-const router = useRouter()
-const dataStore = useDataStore()
-
-
-const itemInfo = ref({
-  resources: []
-})
-
-const mapResources = () => {
-  itemInfo.value.resources.map(resource => {
-
-
-    return {
-      id: resource.id,
-      type: resource.type
-    }
-
-
-  })
-}
-
-
-const setupPage = () => {
-  if(route.query.start) itemInfo.value.start = route.query.start.replace(" ", "+")
-  if(route.query.end) itemInfo.value.end = route.query.end.replace(" ", "+")
-  if(route.query.resources) itemInfo.value.resources = JSON.parse(route.query.resources)
-  if(route.query.project) itemInfo.value.project = route.query.project
-}
-
-setupPage()
-</script>
-
-<template>
-  <UDashboardNavbar title="Neuen Termin erstellen">
-    <template #right>
-      <UButton
-        color="rose"
-        @click="router.push(`/calendar/${route.query.source}`)"
-      >
-        Abbrechen
-      </UButton>
-
-      <UButton
-        @click="dataStore.createNewItem('events',itemInfo)"
-      >
-        Erstellen
-      </UButton>
-    </template>
-  </UDashboardNavbar>
-<!--  <UDashboardToolbar>
-
-  </UDashboardToolbar>-->
-
-  <UForm class="p-5">
-    <UFormGroup
-        label="Resource:"
-    >
-      <USelectMenu
-          v-model="itemInfo.resources"
-          :options="dataStore.getResourcesList"
-          option-attribute="title"
-          value-attribute="id"
-          multiple
-          onChange="mapResources"
-      >
-        <template #label>
-          <span v-if="itemInfo.resources.length == 0">Keine Ressourcen ausgewählt</span>
-          <span v-else >{{ itemInfo.resources.length }} ausgewählt</span>
-        </template>
-      </USelectMenu>
-      {{dataStore.getResourcesList}}
-    </UFormGroup>
-    <UFormGroup
-        label="Titel:"
-    >
-      <UInput
-          v-model="itemInfo.title"
-      />
-    </UFormGroup>
-    <UFormGroup
-        label="Projekt:"
-    >
-      <USelectMenu
-          v-model="itemInfo.project"
-          :options="dataStore.projects"
-          option-attribute="name"
-          value-attribute="id"
-          searchable
-          searchable-placeholder="Suche..."
-          :search-attributes="['name']"
-      >
-        <template #label>
-          {{dataStore.getProjectById(itemInfo.project) ? dataStore.getProjectById(itemInfo.project).name : "Kein Projekt ausgewählt"}}
-        </template>
-
-      </USelectMenu>
-    </UFormGroup>
-    <UFormGroup
-        label="Typ:"
-    >
-      <USelectMenu
-          v-model="itemInfo.type"
-          :options="dataStore.getEventTypes"
-          option-attribute="label"
-          value-attribute="label"
-      >
-
-      </USelectMenu>
-    </UFormGroup>
-    <UFormGroup
-        label="Start:"
-    >
-      <UInput
-          v-model="itemInfo.start"
-      />
-    </UFormGroup>
-    <UFormGroup
-        label="Ende:"
-    >
-      <UInput
-          v-model="itemInfo.end"
-      />
-    </UFormGroup>
-  </UForm>
-</template>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/spaces/pages/events/[mode]/[[id]].vue b/spaces/pages/events/[mode]/[[id]].vue
new file mode 100644
index 0000000..b2fce27
--- /dev/null
+++ b/spaces/pages/events/[mode]/[[id]].vue
@@ -0,0 +1,226 @@
+<script setup>
+import dayjs from "dayjs";
+
+const route = useRoute()
+const router = useRouter()
+const dataStore = useDataStore()
+
+const mode = ref(route.params.mode || "show")
+
+
+const itemInfo = ref({
+  resources: []
+})
+
+const resourceToAdd = ref(dataStore.activeProfile.id)
+const mapResources = () => {
+  console.log(itemInfo.value.resources)
+  itemInfo.value.resources.map(resource => {
+    console.log(resource)
+    return {
+      id: resource.id,
+      type: resource.type
+    }
+  })
+}
+
+
+const setupPage = () => {
+
+  if(mode.value === "show" || mode.value === "edit"){
+    itemInfo.value = dataStore.getEventById(Number(useRoute().params.id)) || {resources: [], start: new Date(), end: new Date(), type: dataStore.getEventTypes[0].label}
+  }
+
+  if(route.query.start) itemInfo.value.start = new Date(route.query.start.replace(" ", "+"))
+  if(route.query.end) itemInfo.value.end = new Date(route.query.end.replace(" ", "+"))
+  if(route.query.resources) {
+    itemInfo.value.resources = JSON.parse(route.query.resources).map(resource => {
+      return dataStore.getResourcesList.find(i => i.id === resource)
+    })
+  }
+  if(route.query.project) itemInfo.value.project = route.query.project
+
+
+
+}
+
+setupPage()
+</script>
+
+<template>
+  <UDashboardNavbar :title="mode === 'show' ? 'Termin: ' + itemInfo.title : 'Neuen Termin erstellen'">
+    <template #right>
+      <UButton
+        color="rose"
+        @click="router.push(route.params.id ? `/events/show/${route.params.id}` : `/events`)"
+        v-if="mode === 'edit'"
+      >
+        Abbrechen
+      </UButton>
+
+      <UButton
+        @click="dataStore.createNewItem('events',itemInfo)"
+        v-if="mode === 'edit' && !route.params.id"
+      >
+        Erstellen
+      </UButton>
+      <UButton
+        @click="dataStore.updateItem('events',itemInfo)"
+        v-else-if="mode === 'edit' && route.params.id"
+      >
+        Speichern
+      </UButton>
+      <UButton
+        v-if="mode === 'show'"
+        @click="router.push(`/events/edit/${itemInfo.id}`)"
+      >
+          Bearbeiten
+      </UButton>
+    </template>
+  </UDashboardNavbar>
+<!--  <UDashboardToolbar>
+
+  </UDashboardToolbar>-->
+  <UTabs
+      v-if="mode === 'show'"
+      :items="[{label:'Informationen'},{label:'Logbuch'}]"
+      class="p-5"
+  >
+    <template #item="{item}">
+      <UCard class="mt-5">
+          <div v-if="item.label === 'Informationen'">
+            {{itemInfo}}
+          </div>
+          <div v-if="item.label === 'Logbuch'">
+
+          </div>
+      </UCard>
+    </template>
+  </UTabs>
+  <UForm class="p-5" v-if="mode === 'edit'">
+    <UFormGroup
+        label="Titel:"
+    >
+      <UInput
+          v-model="itemInfo.title"
+      />
+    </UFormGroup>
+    <UFormGroup
+        label="Projekt:"
+    >
+      <USelectMenu
+          v-model="itemInfo.project"
+          :options="dataStore.projects"
+          option-attribute="name"
+          value-attribute="id"
+          searchable
+          searchable-placeholder="Suche..."
+          :search-attributes="['name']"
+      >
+        <template #label>
+          {{dataStore.getProjectById(itemInfo.project) ? dataStore.getProjectById(itemInfo.project).name : "Kein Projekt ausgewählt"}}
+        </template>
+
+      </USelectMenu>
+    </UFormGroup>
+    <UFormGroup
+        label="Typ:"
+    >
+      <USelectMenu
+          v-model="itemInfo.type"
+          :options="dataStore.getEventTypes"
+          option-attribute="label"
+          value-attribute="label"
+      >
+
+      </USelectMenu>
+    </UFormGroup>
+    <UFormGroup
+        label="Start:"
+    >
+      <UPopover :popper="{ placement: 'bottom-start' }">
+        <UButton
+            variant="outline"
+            icon="i-heroicons-calendar-days-20-solid"
+            :label="itemInfo.start ? dayjs(itemInfo.start).format('DD.MM.YYYY HH:mm') : 'Datum auswählen'"
+        />
+
+        <template #panel="{ close }">
+          <LazyDatePicker
+              v-model="itemInfo.start"
+              mode="dateTime"
+          />
+        </template>
+      </UPopover>
+    </UFormGroup>
+    <UFormGroup
+        label="Ende:"
+    >
+      <UPopover :popper="{ placement: 'bottom-start' }">
+        <UButton
+            variant="outline"
+            icon="i-heroicons-calendar-days-20-solid"
+            :label="itemInfo.end ? dayjs(itemInfo.end).format('DD.MM.YYYY HH:mm') : 'Datum auswählen'"
+        />
+
+        <template #panel="{ close }">
+          <LazyDatePicker
+              v-model="itemInfo.end"
+              mode="dateTime"
+          />
+        </template>
+      </UPopover>
+    </UFormGroup>
+    <UFormGroup
+        label="Resource:"
+        class="w-full"
+    >
+      <InputGroup class="w-full">
+        <USelectMenu
+            v-model="resourceToAdd"
+            :options="dataStore.getResourcesList"
+            option-attribute="title"
+            value-attribute="id"
+            class="w-full"
+        ></USelectMenu>
+        <UButton
+            @click="itemInfo.resources.push(dataStore.getResourcesList.find(i => i.id === resourceToAdd))"
+          :disabled="itemInfo.resources.find(i => i.id === resourceToAdd)"
+        >
+          + Hinzufügen
+        </UButton>
+      </InputGroup>
+    </UFormGroup>
+    <UTable
+        v-if="itemInfo.resources.length > 0"
+      :rows="itemInfo.resources"
+      :columns="[
+          {
+            key:'type',
+            label: 'Type'
+          }, {
+            key: 'title',
+            label: 'Name'
+          }, {
+            key: 'remove'
+          }
+      ]"
+    >
+      <template #remove-data="{row}">
+        <UButton
+          color="rose"
+          variant="outline"
+          @click="itemInfo.resources = itemInfo.resources.filter(i => i.id !== row.id)"
+        >
+          Entfernen
+        </UButton>
+      </template>
+    </UTable>
+
+
+  </UForm>
+</template>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/spaces/pages/events/index.vue b/spaces/pages/events/index.vue
new file mode 100644
index 0000000..b1200cd
--- /dev/null
+++ b/spaces/pages/events/index.vue
@@ -0,0 +1,124 @@
+<template>
+  <UDashboardNavbar title="Termine" :badge="filteredRows.length">
+    <template #right>
+      <UInput
+          id="searchinput"
+          v-model="searchString"
+          icon="i-heroicons-funnel"
+          autocomplete="off"
+          placeholder="Suche..."
+          class="hidden lg:block"
+          @keydown.esc="$event.target.blur()"
+      >
+        <template #trailing>
+          <UKbd value="/" />
+        </template>
+      </UInput>
+
+      <UButton @click="router.push(`/events/edit`)">+ Termin</UButton>
+    </template>
+  </UDashboardNavbar>
+
+  <UDashboardToolbar>
+    <template #right>
+      <USelectMenu
+          v-model="selectedColumns"
+          icon="i-heroicons-adjustments-horizontal-solid"
+          :options="templateColumns"
+          multiple
+          class="hidden lg:block"
+          by="key"
+      >
+        <template #label>
+          Spalten
+        </template>
+      </USelectMenu>
+    </template>
+  </UDashboardToolbar>
+
+  <UTable
+      :rows="filteredRows"
+      :columns="columns"
+      class="w-full"
+      :ui="{ divide: 'divide-gray-200 dark:divide-gray-800' }"
+      @select="(i) => router.push(`/events/show/${i.id}`) "
+      :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Termine anzuzeigen' }"
+  >
+    <template #start-data="{row}">
+      {{dayjs(row.start).format("DD.MM.YY HH:mm")}}
+    </template>
+    <template #end-data="{row}">
+      {{dayjs(row.end).format("DD.MM.YY HH:mm")}}
+    </template>
+    <template #project-data="{row}">
+      {{row.project ? dataStore.getProjectById(row.project).name: ""}}
+    </template>
+  </UTable>
+</template>
+
+<script setup>
+import dayjs from "dayjs";
+
+definePageMeta({
+  middleware: "auth"
+})
+
+defineShortcuts({
+  '/': () => {
+    //console.log(searchinput)
+    //searchinput.value.focus()
+    document.getElementById("searchinput").focus()
+  },
+  '+': () => {
+    router.push("/events/edit")
+  }
+})
+
+const dataStore = useDataStore()
+const router = useRouter()
+
+const templateColumns = [
+  {
+    key: 'title',
+    label: "Titel:",
+    sortable: true
+  },
+  {
+    key: "start",
+    label: "Start",
+    sortable: true
+  },
+  {
+    key: "end",
+    label: "Ende"
+  },
+  {
+    key: "resources",
+    label: "Resourcen"
+  },
+  {
+    key: "project",
+    label: "Projekt"
+  }
+]
+const selectedColumns = ref(templateColumns)
+const columns = computed(() => templateColumns.filter((column) => selectedColumns.value.includes(column)))
+
+
+const searchString = ref('')
+const filteredRows = computed(() => {
+  if(!searchString.value) {
+    return dataStore.events
+  }
+
+  return dataStore.events.filter(item => {
+    return Object.values(item).some((value) => {
+      return String(value).toLowerCase().includes(searchString.value.toLowerCase())
+    })
+  })
+})
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/spaces/stores/data.js b/spaces/stores/data.js
index 53cfd3e..d7f8c58 100644
--- a/spaces/stores/data.js
+++ b/spaces/stores/data.js
@@ -1121,6 +1121,10 @@ export const useDataStore = defineStore('data', () => {
         return bankAccounts.value.find(item => item.id === itemId)
     })
 
+    const getEventById = computed(() => (itemId) => {
+        return events.value.find(item => item.id === itemId)
+    })
+
     const getProjectById = computed(() => (itemId) => {
         if(projects.value.find(i => i.id === itemId)) {
             let project = projects.value.find(project => project.id === itemId)
@@ -1289,6 +1293,7 @@ export const useDataStore = defineStore('data', () => {
         getCreatedDocumentById,
         getInventoryItemById,
         getBankAccountById,
+        getEventById
     }