diff --git a/BeWo/DebugConfig.cs b/BeWo/DebugConfig.cs
index 0d637ee22..22f5cfec0 100644
--- a/BeWo/DebugConfig.cs
+++ b/BeWo/DebugConfig.cs
@@ -147,7 +147,7 @@ namespace BeWo
 						{
 							DebugConfigMode = DebugConfigMode.FeatureAiModule,
 							AutoLogin = true,
-							SelectView = UIContext.ServiceRecord,
+							SelectView = UIContext.Administration,
 							//SelectIndex = 8,
 							//DefaultLoginUsername = "m1",
 							//DefaultLoginPassword = "bewobewo",
diff --git a/BeWo/View/Detail/AI/AiPromptbausteinDetailView.xaml b/BeWo/View/Detail/AI/AiPromptbausteinDetailView.xaml
index 26db106b8..248e2673b 100644
--- a/BeWo/View/Detail/AI/AiPromptbausteinDetailView.xaml
+++ b/BeWo/View/Detail/AI/AiPromptbausteinDetailView.xaml
@@ -44,7 +44,7 @@
                 Grid.Row="0"
                 Grid.Column="2"
                 IsEnabled="{Binding IsEditingMode}"
-                Text="{Binding Node.Name, UpdateSourceTrigger=PropertyChanged}"/>
+                Text="{Binding Node.Displayname, UpdateSourceTrigger=PropertyChanged}" />
 
             <Label
                 Grid.Row="1"
@@ -56,7 +56,7 @@
                 IsEnabled="{Binding IsEditingMode}"
                 MaxLength="1024"
                 Style="{StaticResource TextBoxNoticeLarge}"
-                Text="{Binding Node.Prompt, UpdateSourceTrigger=PropertyChanged}"
+                Text="{Binding Node.Content, UpdateSourceTrigger=PropertyChanged}"
                 TextWrapping="Wrap" />
             <Label
                 Grid.Row="2"
@@ -83,8 +83,8 @@
                 Width="100"
                 Margin="3,19,10,3"
                 HorizontalAlignment="Right"
-                Visibility="{Binding IsAdd, Converter={StaticResource BoolVisibilityConverter}}"
-                Command="{Binding AddCommand}">
+                Command="{Binding AddCommand}"
+                Visibility="{Binding IsAdd, Converter={StaticResource BoolVisibilityConverter}}">
                 Speichern
             </Button>
         </Grid>
diff --git a/BeWo/View/Detail/AI/AiPromptbausteinTreeView.xaml b/BeWo/View/Detail/AI/AiPromptbausteinTreeView.xaml
index 2be86af2c..9f28c6c70 100644
--- a/BeWo/View/Detail/AI/AiPromptbausteinTreeView.xaml
+++ b/BeWo/View/Detail/AI/AiPromptbausteinTreeView.xaml
@@ -18,7 +18,6 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="..\..\..\Styles\ModernOrangeBlack.xaml" />
             </ResourceDictionary.MergedDictionaries>
-            <local1:BoolToFontWeightConverter x:Key="BoolToFontWeightConverter" />
         </ResourceDictionary>
     </view:BeWoView.Resources>
     <GroupBox Style="{StaticResource ObjectEditGroupBox}">
@@ -117,11 +116,11 @@
                                     Focusable="False"
                                     FontWeight="{Binding Path=FontWeight}"
                                     IsReadOnly="True"
-                                    Text="{Binding Path=Name, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}"
+                                    Text="{Binding Path=Displayname, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}"
                                     ToolTipService.ShowDuration="100000">
                                     <TextBox.ToolTip>
                                         <StackPanel Orientation="Vertical">
-                                            <Label Content="{Binding Path=Name, Mode=OneWay}" FontWeight="Bold" />
+                                            <Label Content="{Binding Path=Displayname, Mode=OneWay}" FontWeight="Bold" />
                                             <TextBox
                                                 MaxWidth="500"
                                                 Padding="3,1,0,0"
@@ -130,7 +129,7 @@
                                                 Background="Transparent"
                                                 BorderThickness="0"
                                                 IsReadOnly="True"
-                                                Text="{Binding Path=Prompt}"
+                                                Text="{Binding Path=Content}"
                                                 TextWrapping="Wrap" />
                                         </StackPanel>
                                     </TextBox.ToolTip>
@@ -152,7 +151,12 @@
                                     <Image Source="..\..\..\Ressources\Icons\Add24.png" />
                                 </MenuItem.Icon>
                             </MenuItem>
-                            <MenuItem Command="{Binding AddKategorieCommand}" Header="Neue Kategorie">
+                            <MenuItem Command="{Binding AddOrdnerCommand}" Header="Neuer Ordner">
+                                <MenuItem.Icon>
+                                    <Image Source="..\..\..\Ressources\Icons\Add24.png" />
+                                </MenuItem.Icon>
+                            </MenuItem>
+                            <MenuItem Command="{Binding AddKetteCommand}" Header="Neue Routine">
                                 <MenuItem.Icon>
                                     <Image Source="..\..\..\Ressources\Icons\Add24.png" />
                                 </MenuItem.Icon>
diff --git a/BeWo/View/Detail/AI/AiPromptbausteinTreeView.xaml.cs b/BeWo/View/Detail/AI/AiPromptbausteinTreeView.xaml.cs
index 84cb4b418..ec7207474 100644
--- a/BeWo/View/Detail/AI/AiPromptbausteinTreeView.xaml.cs
+++ b/BeWo/View/Detail/AI/AiPromptbausteinTreeView.xaml.cs
@@ -1,5 +1,6 @@
 using BeWo.ViewModel;
 using BeWo.ViewModel.View.Administration;
+using DevExpress.Xpf.Accordion;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -35,6 +36,10 @@ namespace BeWo.View.Detail.AI
 
 		public AiPromptbausteinTreeViewModel ViewModel { get; set; }
 
+		public override bool IsDirty => ViewModel is object && ViewModel.IsDirty;
+
+		protected override void Save() => ViewModel.SaveVMList();
+
 		private void OnPreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e)
 		{
 			TreeViewItem treeViewItem = VisualUpwardSearch(e.OriginalSource as DependencyObject);
@@ -94,19 +99,4 @@ namespace BeWo.View.Detail.AI
 			_LastTreeViewItem = e.OriginalSource as TreeViewItem;
 		}
 	}
-
-	public class BoolToFontWeightConverter : IValueConverter
-	{
-		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-		{
-			var val = (bool)value;
-
-			return val ? FontWeights.Normal : FontWeights.Bold;
-		}
-
-		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-		{
-			throw new NotImplementedException();
-		}
-	}
 }
diff --git a/BeWo/ViewModel/AiPromptbausteinTreeVM.cs b/BeWo/ViewModel/AiPromptbausteinTreeVM.cs
index c5dfdf0b0..cd68bdadf 100644
--- a/BeWo/ViewModel/AiPromptbausteinTreeVM.cs
+++ b/BeWo/ViewModel/AiPromptbausteinTreeVM.cs
@@ -11,11 +11,12 @@ using BS.Shared.DataContracts;
 using BS.Shared.DataContracts.Compact;
 using BS.Shared.DataContracts.Feature.AI;
 using BS.Shared.Extensions;
+using BS.Shared.Interface;
 
 namespace BeWo.ViewModel
 {
-    public class AiPromptbausteinTreeVM : AbstractDCMapperVM<AiPromptbausteinTreeDC>
-    {
+    public class AiPromptbausteinTreeVM : AbstractDCMapperVM<AiPromptbausteinTreeDC>, IAiPromptbaustein
+	{
 		private string _Displayname;
 		private string _Content;
 		private ActivationTypeId _ActivationType;
@@ -104,7 +105,7 @@ namespace BeWo.ViewModel
 		public bool IsExpanded
 		{
 			get => _IsExpanded;
-			set => SetProperty(ref _IsExpanded, value, nameof(IsExpanded), () => DataContract.IsExpanded);
+			set => SetProperty(ref _IsExpanded, value, nameof(IsExpanded));
 		}
 
 		public AiPromptbausteinTreeListVM Children
diff --git a/BeWo/ViewModel/ListViewModel/AiPromptbausteinTreeListVM.cs b/BeWo/ViewModel/ListViewModel/AiPromptbausteinTreeListVM.cs
index 5bb7a0b2f..8686e0656 100644
--- a/BeWo/ViewModel/ListViewModel/AiPromptbausteinTreeListVM.cs
+++ b/BeWo/ViewModel/ListViewModel/AiPromptbausteinTreeListVM.cs
@@ -4,8 +4,8 @@ using BS.Shared.DataContracts.Feature.AI;
 
 namespace BeWo.ViewModel.ListViewModel
 {
-    public class AiPromptbausteinTreeListVM : AbstractDCListMapperVM<AiPromptbausteinTreeDC, AiPromptbausteinTreeVM>
-    {
+	public class AiPromptbausteinTreeListVM : AbstractDCListMapperVM<AiPromptbausteinTreeDC, AiPromptbausteinTreeVM>
+	{
 		public AiPromptbausteinTreeListVM() : this(null)
 		{
 			if (BeWoApp.IsInDesignMode)
@@ -15,13 +15,62 @@ namespace BeWo.ViewModel.ListViewModel
 		}
 
 		public AiPromptbausteinTreeListVM(IEnumerable<AiPromptbausteinTreeDC> pDataContracts = null, AiPromptbausteinTreeVM aiPromptbausteinTreeVM = null) : base(pDataContracts)
-        {
+		{
 			foreach (var vm in VMList)
 			{
 				vm.Parent = aiPromptbausteinTreeVM;
 			}
 		}
 
+		public override int AddedCount
+		{
+			get
+			{
+				var base_value = base.AddedCount;
+
+				foreach (var vm in VMList)
+				{
+					if (vm.Children is object)
+						base_value += vm.Children.AddedCount;
+				}
+
+				return base_value;
+			}
+		}
+
+		public override int ChangedCount
+		{
+			get
+			{
+				var base_value = base.ChangedCount;
+
+				foreach (var vm in VMList)
+				{
+					if (vm.Children is object)
+						base_value += vm.Children.ChangedCount;
+				}
+
+				return base_value;
+			}
+		}
+
+		public override int RemovedCount
+		{
+			get
+			{
+				var base_value = base.RemovedCount;
+
+				foreach (var vm in VMList)
+				{
+					if(vm.Children is object)
+						base_value += vm.Children.RemovedCount;
+				}
+
+				return base_value;
+			}
+		}
+
+
 		#region Designer
 		private void InitDesigner()
 		{
diff --git a/BeWo/ViewModel/View/AI/AiPromptbausteinSelectionViewModel.cs b/BeWo/ViewModel/View/AI/AiPromptbausteinSelectionViewModel.cs
index f0106ae86..51ca87080 100644
--- a/BeWo/ViewModel/View/AI/AiPromptbausteinSelectionViewModel.cs
+++ b/BeWo/ViewModel/View/AI/AiPromptbausteinSelectionViewModel.cs
@@ -2,6 +2,7 @@
 using BeWo.Services;
 using BeWo.ViewModel.ListViewModel;
 using BeWo.ViewModel.View.Dialogs;
+using BS.Shared.Extensions.CustomInterfaces;
 using DevExpress.Mvvm;
 using System;
 using System.Collections.Generic;
@@ -18,9 +19,9 @@ namespace BeWo.ViewModel.View.AI
 
 		public AiPromptbausteinSelectionViewModel()
 		{
-			//Func<bool> isPrompt = () => SelectedNode is object && !SelectedNode.IsKategorie;
+			Func<bool> isPrompt = () => SelectedNode is object && SelectedNode.IsExecutable();
 
-			//SendCommand = new DelegateCommand(Send, isPrompt);
+			SendCommand = new DelegateCommand(Send, isPrompt);
 
 			if (BeWoApp.IsInDesignMode)
 			{
diff --git a/BeWo/ViewModel/View/Administration/AiPromptbausteinTreeViewModel.cs b/BeWo/ViewModel/View/Administration/AiPromptbausteinTreeViewModel.cs
index 1cd311300..57a405cc6 100644
--- a/BeWo/ViewModel/View/Administration/AiPromptbausteinTreeViewModel.cs
+++ b/BeWo/ViewModel/View/Administration/AiPromptbausteinTreeViewModel.cs
@@ -1,5 +1,7 @@
 using BeWo.Services;
 using BeWo.ViewModel.ListViewModel;
+using BS.Shared;
+using BS.Shared.Extensions.CustomInterfaces;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -21,20 +23,26 @@ namespace BeWo.ViewModel.View.Administration
 				ListVM = new AiPromptbausteinTreeListVM();
 			}
 
-			//Func<bool> isObject = () => SelectedNode is object;
-			//Func<bool> isKategorie = () => SelectedNode?.IsKategorie ?? false;
-			//Func<bool> canAdd = () => !isObject() || isKategorie();
-			//Func<bool> isNoLeaf = () => isObject() && isKategorie();
-			//Func<bool> isNotSame = () => !Contains(CopyTreeNode, SelectedNode);
-			//Func<bool> canCopy = () => HasCopiedTreeNode && canAdd() && isNotSame();
+			Func<bool> canAddPrompt = () => SelectedNode.IsOrdner() || SelectedNode.IsKette();
+			Func<bool> canAddOrdner = () => SelectedNode.IsOrdner();
+			Func<bool> canAddKette = () => SelectedNode.IsOrdner() && false;
+			Func<bool> canEdit = () => SelectedNode is object;
+			Func<bool> canCopy = () => SelectedNode.IsKette() || SelectedNode.IsOrdner();
+			Func<bool> canCopySingle = () => SelectedNode is object;
+			Func<bool> canPaste = () => HasCopiedTreeNode && !Contains(CopyTreeNode, SelectedNode) &&
+								(!CopyTreeNode.IsOrdner() || canAddOrdner()) &&
+								(!CopyTreeNode.IsKette() || canAddKette()) &&
+								(!CopyTreeNode.IsPrompt() || canAddPrompt());
+			Func<bool> canDelete = () => SelectedNode is object;
 
-			//AddPromptCommand = new DelegateCommand(() => Add(false), canAdd);
-			//AddKategorieCommand = new DelegateCommand(() => Add(true), canAdd);
-			//EditPromptbausteinCommand = new DelegateCommand(EditPromptbaustein, isObject);
-			//CopyPromptbausteinCommand = new DelegateCommand(CopyPromptbaustein, isNoLeaf);
-			//CopySinglePromptbausteinCommand = new DelegateCommand(CopySinglePromptbaustein, isObject);
-			//PastePromptbausteinCommand = new DelegateCommand(PastePromptbaustein, canCopy);
-			//DeletePromptbausteinCommand = new DelegateCommand(DeletePromptbaustein, isObject);
+			AddPromptCommand = new DelegateCommand(() => Add(AiPromptbausteinType.Prompt), canAddPrompt);
+			AddOrdnerCommand = new DelegateCommand(() => Add(AiPromptbausteinType.Ordner), canAddOrdner);
+			AddKetteCommand = new DelegateCommand(() => Add(AiPromptbausteinType.Kette), canAddKette);
+			EditPromptbausteinCommand = new DelegateCommand(EditPromptbaustein, canEdit);
+			CopyPromptbausteinCommand = new DelegateCommand(CopyPromptbaustein, canCopy);
+			CopySinglePromptbausteinCommand = new DelegateCommand(CopySinglePromptbaustein, canCopySingle);
+			PastePromptbausteinCommand = new DelegateCommand(PastePromptbaustein, canPaste);
+			DeletePromptbausteinCommand = new DelegateCommand(DeletePromptbaustein, canDelete);
 		}
 
 		public AiPromptbausteinTreeViewModel(IWindowService windowService) : this()
@@ -52,14 +60,20 @@ namespace BeWo.ViewModel.View.Administration
 		public bool IsEditingMode { get; set; }
 
 		public ICommand AddPromptCommand { get; set; }
-		public ICommand AddKategorieCommand { get; set; }
+		public ICommand AddOrdnerCommand { get; set; }
+		public ICommand AddKetteCommand { get; set; }
 		public ICommand EditPromptbausteinCommand { get; set; }
 		public ICommand CopyPromptbausteinCommand { get; set; }
 		public ICommand CopySinglePromptbausteinCommand { get; set; }
 		public ICommand PastePromptbausteinCommand { get; set; }
 		public ICommand DeletePromptbausteinCommand { get; set; }
 
-		public bool IsDirty => ListVM.IsDirty; 
+		public override bool IsDirty => ListVM is object && ListVM.IsDirty;
+
+		public void SaveVMList ()
+		{
+
+		}
 
         public void UpdateVMList(AiPromptbausteinTreeListVM new_list)
 		{
@@ -67,11 +81,12 @@ namespace BeWo.ViewModel.View.Administration
 			FirePropertyChanged(nameof(ListVM));
 		}
 
-		public void Add(bool isKategorie)
+		public void Add(AiPromptbausteinType type)
 		{
 			var parent = SelectedNode?.Children ?? ListVM;
 			parent.NewVM = null;
-			//parent.NewVM.IsKategorie = isKategorie;
+			parent.NewVM.PromptbausteinType = type;
+			parent.NewVM.Parent = SelectedNode;
 
 			WindowService.ShowAiPromptbausteinDetailWindow(AiPromptbausteinDetailViewModel.CreateAdd(this, parent.NewVM, parent));
 		}
diff --git a/Shared/Extensions/CustomInterfaces/IAiPromptbausteinTreeExtension.cs b/Shared/Extensions/CustomInterfaces/IAiPromptbausteinTreeExtension.cs
new file mode 100644
index 000000000..54bd8fb65
--- /dev/null
+++ b/Shared/Extensions/CustomInterfaces/IAiPromptbausteinTreeExtension.cs
@@ -0,0 +1,36 @@
+using BS.Shared.Interface;
+using DevExpress.DataAccess.DataFederation;
+using DevExpress.Xpf.Bars.Native;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BS.Shared.Extensions.CustomInterfaces
+{
+	public static class IAiPromptbausteinTreeExtension
+	{
+		public static bool IsExecutable(this IAiPromptbaustein aiPromptbaustein)
+			=> aiPromptbaustein.IsPrompt() || aiPromptbaustein.IsKette();
+
+
+		public static bool IsOrdner(this IAiPromptbaustein aiPromptbaustein)
+			=> aiPromptbaustein.hasPrompttype(AiPromptbausteinType.Ordner);
+
+		public static bool IsKette(this IAiPromptbaustein aiPromptbaustein)
+			=> aiPromptbaustein.hasPrompttype(AiPromptbausteinType.Kette);
+
+		public static bool IsPrompt(this IAiPromptbaustein aiPromptbaustein)
+			=> aiPromptbaustein.hasPrompttype(AiPromptbausteinType.Prompt);
+
+
+
+		private static bool hasPrompttype(this IAiPromptbaustein aiPromptbaustein, AiPromptbausteinType aiPromptbausteinType)
+			=> aiPromptbaustein.isObject() && aiPromptbaustein.PromptbausteinType == aiPromptbausteinType;
+
+		private static bool isObject(this IAiPromptbaustein aiPromptbaustein)
+			=> aiPromptbaustein != null;
+
+	}
+}
diff --git a/Shared/Interface/IAiPromptbaustein.cs b/Shared/Interface/IAiPromptbaustein.cs
new file mode 100644
index 000000000..6feb82832
--- /dev/null
+++ b/Shared/Interface/IAiPromptbaustein.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BS.Shared.Interface
+{
+	public interface IAiPromptbaustein
+	{
+		AiPromptbausteinType PromptbausteinType { get; }
+	}
+}
diff --git a/Shared/Shared.csproj b/Shared/Shared.csproj
index 026976987..04b609a28 100644
--- a/Shared/Shared.csproj
+++ b/Shared/Shared.csproj
@@ -408,6 +408,7 @@
     <Compile Include="Extensions\ApiResponseExtension.cs" />
     <Compile Include="Extensions\BoolExtensions.cs" />
     <Compile Include="Extensions\ContactExtensions.cs" />
+    <Compile Include="Extensions\CustomInterfaces\IAiPromptbausteinTreeExtension.cs" />
     <Compile Include="Extensions\EnumExtensions.cs" />
     <Compile Include="Extensions\GkvAbrechnungExtensions.cs" />
     <Compile Include="Extensions\GridExtensions.cs" />
@@ -418,6 +419,7 @@
     <Compile Include="Extensions\TimeIntervalExtensions.cs" />
     <Compile Include="Interface\Abstract\IAddressable.cs" />
     <Compile Include="Interface\Feature\AICore\IAiConversationMessage.cs" />
+    <Compile Include="Interface\IAiPromptbaustein.cs" />
     <Compile Include="Interface\IApiErrorExtractor.cs" />
     <Compile Include="Interface\IContact.cs" />
     <Compile Include="Interface\IFileStorageDAO.cs" />