diff --git a/BeWo/View/Detail/AI/AiPromptbausteinDetailView.xaml b/BeWo/View/Detail/AI/AiPromptbausteinDetailView.xaml
index bd0ea8f60..26db106b8 100644
--- a/BeWo/View/Detail/AI/AiPromptbausteinDetailView.xaml
+++ b/BeWo/View/Detail/AI/AiPromptbausteinDetailView.xaml
@@ -16,7 +16,7 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="..\..\Styles\ModernOrangeBlack.xaml" />
+                <ResourceDictionary Source="..\..\..\Styles\ModernOrangeBlack.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>
@@ -32,12 +32,12 @@
                 <ColumnDefinition Width="3*" MinWidth="100" />
             </Grid.ColumnDefinitions>
             <Grid.RowDefinitions>
-                <RowDefinition Height="auto" />
-                <RowDefinition Height="auto" />
-                <RowDefinition Height="auto" />
                 <RowDefinition Height="auto" />
                 <RowDefinition Height="*" />
                 <RowDefinition Height="auto" />
+                <RowDefinition Height="auto" />
+                <RowDefinition Height="auto" />
+                <RowDefinition Height="auto" />
             </Grid.RowDefinitions>
             <Label Grid.Row="0" Grid.Column="0">Name</Label>
             <TextBox
@@ -58,7 +58,6 @@
                 Style="{StaticResource TextBoxNoticeLarge}"
                 Text="{Binding Node.Prompt, UpdateSourceTrigger=PropertyChanged}"
                 TextWrapping="Wrap" />
-
             <Label
                 Grid.Row="2"
                 Grid.Column="0"
diff --git a/BeWo/ViewModel/View/Administration/AiPromptbausteinTreeViewModel.cs b/BeWo/ViewModel/View/Administration/AiPromptbausteinTreeViewModel.cs
index cc454ee82..fcdfafd38 100644
--- a/BeWo/ViewModel/View/Administration/AiPromptbausteinTreeViewModel.cs
+++ b/BeWo/ViewModel/View/Administration/AiPromptbausteinTreeViewModel.cs
@@ -36,6 +36,7 @@ namespace BeWo.ViewModel.View.Administration
 			PastePromptbausteinCommand = new DelegateCommand(PastePromptbaustein, canCopy);
 			DeletePromptbausteinCommand = new DelegateCommand(DeletePromptbaustein, isObject);
 		}
+
 		public AiPromptbausteinTreeViewModel(IWindowService windowService) : this()
 		{
 			WindowService = windowService;
@@ -58,7 +59,9 @@ namespace BeWo.ViewModel.View.Administration
 		public ICommand PastePromptbausteinCommand { get; set; }
 		public ICommand DeletePromptbausteinCommand { get; set; }
 
-		public void UpdateVMList(AiPromptbausteinTreeListVM new_list)
+		public bool IsDirty => ListVM.IsDirty; 
+
+        public void UpdateVMList(AiPromptbausteinTreeListVM new_list)
 		{
 			ListVM = new_list;
 			FirePropertyChanged(nameof(ListVM));
diff --git a/Service/DCEntityMapper/AiPromptbausteinTreeDC_AiPromptbaustein.cs b/Service/DCEntityMapper/AiPromptbausteinTreeDC_AiPromptbaustein.cs
new file mode 100644
index 000000000..7a8c19d14
--- /dev/null
+++ b/Service/DCEntityMapper/AiPromptbausteinTreeDC_AiPromptbaustein.cs
@@ -0,0 +1,50 @@
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+
+using BS.Shared.DataContracts.Feature.AI;
+
+namespace BeWo.Service.DCEntityMapper
+{
+    public class AiPromptbausteinTreeDC_AiPromptbaustein : AbstractIDCEntityMapper<AiPromptbaustein, AiPromptbausteinTreeDC>
+    {
+        public override AiPromptbausteinTreeDC MergeWithDC(AiPromptbaustein from, AiPromptbausteinTreeDC to)
+        {
+            //dataContract.Position = entity.Position;
+            to.Version = from.Version.Value;
+            to.Oid = from.Oid.Value;
+            to.Prompt = from.Text;
+            to.Name = from.Name;
+            //dataContract.IsOnlyForEmployee = entity.IsOnlyForEmployee;
+            to.ActivationType = from.IsActive;
+
+            if (from.Employee != null)
+                to.Creator = MapperFactory.CompactEmployeeDC_Employee.MapToNewDC(from.Employee);
+
+            return to;
+        }
+
+        public override AiPromptbaustein MergeWithEntity(AiPromptbausteinTreeDC from, AiPromptbaustein to)
+        {
+            ConcurrencyCheck(from.Version, to);
+
+            //entity.Position = dataContract.Position;
+            to.Oid = from.Oid;
+            to.Text = from.Prompt;
+            to.Name = from.Name;
+            //to.IsOnlyForEmployee = from.IsOnlyForEmployee;
+            to.IsActive = from.ActivationType;
+
+            if (from.Creator != null)
+            {
+                to.Employee = DAOFactory.GenericDAO.LoadByID<Employee>(from.Creator.EmployeeOid);
+            }
+
+            return to;
+        }
+
+        protected override bool AreDCAndEntityEqual(AiPromptbausteinTreeDC dc, AiPromptbaustein entity)
+        {
+            return dc.Oid == entity.Oid;
+        }
+    }
+}
diff --git a/Service/DCEntityMapper/MapperFactory.cs b/Service/DCEntityMapper/MapperFactory.cs
index 011500351..77f490dad 100644
--- a/Service/DCEntityMapper/MapperFactory.cs
+++ b/Service/DCEntityMapper/MapperFactory.cs
@@ -817,6 +817,7 @@ namespace BeWo.Service.DCEntityMapper
 		public static AiConversationMessageDC_AiConversationMessage AiConversationMessage { get; } = new AiConversationMessageDC_AiConversationMessage();
 		public static AiModelDC_AiModel AiModel { get; } = new AiModelDC_AiModel();
 		public static AiConfigDC_AiConfig AiConfig { get; } = new AiConfigDC_AiConfig();
+		public static AiPromptbausteinTreeDC_AiPromptbaustein AiPromptbausteinTree { get; } = new AiPromptbausteinTreeDC_AiPromptbaustein();
 		public static AddressDC_Address Address { get; } = new AddressDC_Address();
 		public static GkvAbrechnungLightDC_GkvAbrechnungLight GkvAbrechnungLight { get; } = new GkvAbrechnungLightDC_GkvAbrechnungLight();
 		public static GkvTransferProtokollLightDC_GkvTransferprotokollLight GkvTransferprotokollLight { get; } = new GkvTransferProtokollLightDC_GkvTransferprotokollLight();
diff --git a/Service/Plugins/AiPromptbausteineService.cs b/Service/Plugins/AiPromptbausteineService.cs
index 37bc98ee3..9b034ca4d 100644
--- a/Service/Plugins/AiPromptbausteineService.cs
+++ b/Service/Plugins/AiPromptbausteineService.cs
@@ -1,4 +1,7 @@
-using BS.Shared.DataContracts.Feature.AI;
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+using BeWo.Service.DCEntityMapper;
+using BS.Shared.DataContracts.Feature.AI;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -11,6 +14,9 @@ namespace BeWo.Service.Plugins
 	{
 		public IEnumerable<AiPromptbausteinTreeDC> GetAiPromptbausteine()
 		{
+			var allAiPromptbausteine = DAOFactory.GenericDAO.GetAll<AiPromptbaustein>();
+			MapperFactory.AiPromptbausteinDC_AiPromptbaustein.CreateDcList(allAiPromptbausteine);
+
 			//var dc = new AiPromptbausteinTreeDC();
 
 			//dc.Oid = 1;
@@ -23,9 +29,13 @@ namespace BeWo.Service.Plugins
 			return predefined.GetFullPromptbausteineTree();
 		}
 
-		public IEnumerable<AiPromptbausteinTreeDC> CreateAiPromptbausteine(IEnumerable<AiPromptbausteinTreeDC> aiPromptbausteinDC)
+		public IEnumerable<AiPromptbausteinTreeDC> CreateAiPromptbausteine(IEnumerable<AiPromptbausteinTreeDC> aiPromptbausteinDcs)
 		{
-			throw new System.NotImplementedException();
+			var aiPromptbausteine = MapperFactory.AiPromptbausteinTree.MapToNewEntities(aiPromptbausteinDcs);
+
+			DAOFactory.GenericDAO.Insert(aiPromptbausteine);
+
+			return MapperFactory.AiPromptbausteinTree.MapToNewDCs(aiPromptbausteine);
 		}
 
 		public Dictionary<long, long> UpdateAiPromptbausteine(IEnumerable<AiPromptbausteinTreeDC> aiPromptbausteinDCs)
diff --git a/Service/Service.csproj b/Service/Service.csproj
index e7bff9a75..2eed2a96b 100644
--- a/Service/Service.csproj
+++ b/Service/Service.csproj
@@ -241,6 +241,7 @@
     <Compile Include="DCEntityMapper\AiConversationDC_AiConversation.cs" />
     <Compile Include="DCEntityMapper\AiConfigDC_AiConfig.cs" />
     <Compile Include="DCEntityMapper\AiModelDC_AiModel.cs" />
+    <Compile Include="DCEntityMapper\AiPromptbausteinTreeDC_AiPromptbaustein.cs" />
     <Compile Include="DCEntityMapper\BankAccountDC_BankAccount.cs" />
     <Compile Include="DCEntityMapper\BargeldtransaktionshistoryDC_Bargeldtransaktionshistory.cs" />
     <Compile Include="DCEntityMapper\BeWoDataContract_BeWoEntityBase.cs" />