diff --git a/components/EntityEdit.vue b/components/EntityEdit.vue
index 937a416..a932fe6 100644
--- a/components/EntityEdit.vue
+++ b/components/EntityEdit.vue
@@ -163,6 +163,7 @@ const contentChanged = (content, datapoint) => {
     </template>
   </UDashboardNavbar>
   <UDashboardPanelContent>
+    {{props.item}}
     <UForm
         class="p-5"
     >
@@ -190,7 +191,7 @@ const contentChanged = (content, datapoint) => {
             </template>
             <div v-if="datapoint.key.includes('.')">
               <UInput
-                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
                   v-if="['text','number'].includes(datapoint.inputType)"
                   v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
                   :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
@@ -198,13 +199,13 @@ const contentChanged = (content, datapoint) => {
                   :placeholder="datapoint.inputIsNumberRange ? 'Leer lassen für automatisch generierte Nummer' : ''"
               />
               <UToggle
-                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
                   v-else-if="datapoint.inputType === 'bool'"
                   v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
                   :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
               />
               <USelectMenu
-                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
                   v-else-if="datapoint.inputType === 'select'"
                   v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
                   :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
@@ -220,7 +221,7 @@ const contentChanged = (content, datapoint) => {
                 </template>
               </USelectMenu>
               <UTextarea
-                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
                   v-else-if="datapoint.inputType === 'textarea'"
                   v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
                   :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
@@ -237,7 +238,7 @@ const contentChanged = (content, datapoint) => {
 
                 <template #panel="{ close }">
                   <LazyDatePicker
-                      @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+                      @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
                       v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]" @close="close"
                       :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
                   />
@@ -252,7 +253,7 @@ const contentChanged = (content, datapoint) => {
             </div>
             <div v-else>
               <UInput
-                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
                   v-if="['text','number'].includes(datapoint.inputType)"
                   v-model="props.item[datapoint.key]"
                   :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
@@ -260,13 +261,13 @@ const contentChanged = (content, datapoint) => {
                   :placeholder="datapoint.inputIsNumberRange ? 'Leer lassen für automatisch generierte Nummer' : ''"
               />
               <UToggle
-                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
                   v-else-if="datapoint.inputType === 'bool'"
                   v-model="props.item[datapoint.key]"
                   :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
               />
               <USelectMenu
-                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
                   v-else-if="datapoint.inputType === 'select'"
                   v-model="props.item[datapoint.key]"
                   :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
@@ -283,7 +284,7 @@ const contentChanged = (content, datapoint) => {
                 </template>
               </USelectMenu>
               <UTextarea
-                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
                   v-else-if="datapoint.inputType === 'textarea'"
                   v-model="props.item[datapoint.key]"
                   :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
@@ -299,7 +300,7 @@ const contentChanged = (content, datapoint) => {
 
                 <template #panel="{ close }">
                   <LazyDatePicker
-                      @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+                      @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
                       v-model="props.item[datapoint.key]" @close="close"
                       :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
                   />
@@ -351,7 +352,7 @@ const contentChanged = (content, datapoint) => {
         </template>
         <div v-if="datapoint.key.includes('.')">
           <UInput
-              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
               v-if="['text','number'].includes(datapoint.inputType)"
               v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
               :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
@@ -359,13 +360,13 @@ const contentChanged = (content, datapoint) => {
               :placeholder="datapoint.inputIsNumberRange ? 'Leer lassen für automatisch generierte Nummer' : ''"
           />
           <UToggle
-              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
               v-else-if="datapoint.inputType === 'bool'"
               v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
               :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
           />
           <USelectMenu
-              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
               v-else-if="datapoint.inputType === 'select'"
               v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
               :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
@@ -381,7 +382,7 @@ const contentChanged = (content, datapoint) => {
             </template>
           </USelectMenu>
           <UTextarea
-              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
               v-else-if="datapoint.inputType === 'textarea'"
               v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
               :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
@@ -398,7 +399,7 @@ const contentChanged = (content, datapoint) => {
 
             <template #panel="{ close }">
               <LazyDatePicker
-                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
                   v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]" @close="close"
                   :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
               />
@@ -413,7 +414,7 @@ const contentChanged = (content, datapoint) => {
         </div>
         <div v-else>
           <UInput
-              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
               v-if="['text','number'].includes(datapoint.inputType)"
               v-model="props.item[datapoint.key]"
               :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
@@ -421,13 +422,13 @@ const contentChanged = (content, datapoint) => {
               :placeholder="datapoint.inputIsNumberRange ? 'Leer lassen für automatisch generierte Nummer' : ''"
           />
           <UToggle
-              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
               v-else-if="datapoint.inputType === 'bool'"
               v-model="props.item[datapoint.key]"
               :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
           />
           <USelectMenu
-              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
               v-else-if="datapoint.inputType === 'select'"
               v-model="props.item[datapoint.key]"
               :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
@@ -444,7 +445,7 @@ const contentChanged = (content, datapoint) => {
             </template>
           </USelectMenu>
           <UTextarea
-              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
               v-else-if="datapoint.inputType === 'textarea'"
               v-model="props.item[datapoint.key]"
               :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
@@ -460,7 +461,7 @@ const contentChanged = (content, datapoint) => {
 
             <template #panel="{ close }">
               <LazyDatePicker
-                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
                   v-model="props.item[datapoint.key]" @close="close"
                   :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
               />
diff --git a/components/EntityList.vue b/components/EntityList.vue
index 3cd3bfb..6763f41 100644
--- a/components/EntityList.vue
+++ b/components/EntityList.vue
@@ -19,12 +19,12 @@ defineShortcuts({
     document.getElementById("searchinput").focus()
   },
   '+': () => {
-    router.push(`/${type}/create`)
+    router.push(`/standardEntity/${type}/create`)
   },
   'Enter': {
     usingInput: true,
     handler: () => {
-      router.push(`/${type}/show/${filteredRows.value[selectedItem.value].id}`)
+      router.push(`/standardEntity/${type}/show/${filteredRows.value[selectedItem.value].id}`)
     }
   },
   'arrowdown': () => {
diff --git a/components/EntityShow.vue b/components/EntityShow.vue
index 41e0c62..8e93082 100644
--- a/components/EntityShow.vue
+++ b/components/EntityShow.vue
@@ -35,6 +35,7 @@ defineShortcuts({
 const router = useRouter()
 const dataStore = useDataStore()
 const profileStore = useProfileStore()
+const supabase = useSupabaseClient()
 
 const dataType = dataStore.dataTypes[type]
 
@@ -52,7 +53,7 @@ setup()
 const openTab = ref(0)
 
 const renderedPhases = computed(() => {
-
+  console.log(props.item.phases)
   if(type === "projects" && props.item.phases) {
     return props.item.phases.map((phase,index,array) => {
 
@@ -81,7 +82,32 @@ const renderedPhases = computed(() => {
   }
 })
 
+const changeActivePhase = async (key) => {
+  let item = await useSupabaseSelectSingle("projects",props.item.id,'*')
 
+  let phaseLabel = ""
+
+  item.phases = item.phases.map(p => {
+    if(p.active) p.active = false
+
+    if(p.key === key) {
+      p.active = true
+      p.activated_at = dayjs().format()
+      p.activated_by = profileStore.activeProfile.id
+      phaseLabel = p.label
+    }
+
+    return p
+  })
+
+  await supabase.from("projects").update({phases: item.phases}).eq("id",item.id)
+  const {error} = await supabase.from("historyitems").insert({
+    createdBy: profileStore.activeProfile.id,
+    tenant: profileStore.currentTenant,
+    text: `Aktive Phase zu "${phaseLabel}" gewechselt`,
+    project: item.id
+  })
+}
 
 </script>
 
@@ -321,7 +347,7 @@ const renderedPhases = computed(() => {
             <template #item="{item, index}">
               <UCard class="mx-5">
                 <template #header>
-                  <span class="text-black">{{item.label}}</span>
+                  <span class="dark:text-white text-black">{{item.label}}</span>
                 </template>
                 <InputGroup>
                   <!-- TODO: Reactive Change Phase                  -->
@@ -341,9 +367,9 @@ const renderedPhases = computed(() => {
                 </InputGroup>
 
                 <div>
-                  <p v-if="item.activated_at" class="text-black">Aktiviert am: {{dayjs(item.activated_at).format("DD.MM.YY HH:mm")}} Uhr</p>
-                  <p v-if="item.activated_by" class="text-black">Aktiviert durch: {{profileStore.getProfileById(item.activated_by).fullName}}</p>
-                  <p v-if="item.description" class="text-black">Beschreibung: {{item.description}}</p>
+                  <p v-if="item.activated_at" class="dark:text-white text-black">Aktiviert am: {{dayjs(item.activated_at).format("DD.MM.YY HH:mm")}} Uhr</p>
+                  <p v-if="item.activated_by" class="dark:text-white text-black">Aktiviert durch: {{profileStore.getProfileById(item.activated_by).fullName}}</p>
+                  <p v-if="item.description" class="dark:text-white text-black">Beschreibung: {{item.description}}</p>
                 </div>
               </UCard>