diff --git a/BeWo/Core/TextModuleTreeItem.cs b/BeWo/Core/TextModuleTreeItem.cs
new file mode 100644
index 000000000..d69e6e935
--- /dev/null
+++ b/BeWo/Core/TextModuleTreeItem.cs
@@ -0,0 +1,80 @@
+using System.ComponentModel;
+using BeWo.ViewModel;
+using BS.Shared.DataContracts;
+
+namespace BeWo.Core
+{
+	public class TextModuleTreeItem : INotifyPropertyChanged
+	{
+		public TextModuleTreeItem(TextModuleVM pVM)
+		{
+			TextModuleVM = pVM;
+		}
+
+		private BindingList<TextModuleTreeItem> _Children;
+
+		private bool _IsExpanded;
+
+
+		public TextModuleVM TextModuleVM { get; set; }
+
+		public string ItemName
+		{
+			get
+			{
+				return TextModuleVM != null ? TextModuleVM.Name : null;
+			}
+
+			set
+			{
+				if(TextModuleVM != null)
+				{
+					TextModuleVM.Name = value;
+				}
+			}
+		}
+
+		public bool IsExpanded
+		{
+			get { return _IsExpanded; }
+
+			set
+			{
+				_IsExpanded = value;
+				RaisePropertyChanged("IsExpanded");
+			}
+		}
+
+		public bool IsCaption
+		{
+			get { return TextModuleVM != null && TextModuleVM.Parent != null; }
+		}
+
+		public BindingList<TextModuleTreeItem> Items
+		{
+			get { return _Children ?? (_Children = new BindingList<TextModuleTreeItem>()); }
+
+			set { _Children = value; }
+		}
+
+		public int Position
+		{
+			get { return TextModuleVM != null ? TextModuleVM.Position : 0; }
+		}
+
+		public ServiceCategoryDC ServiceCategory
+		{
+			get { return TextModuleVM != null ? TextModuleVM.ServiceCategory : null; }
+		}
+
+		public event PropertyChangedEventHandler PropertyChanged;
+
+		protected void RaisePropertyChanged(string propertyName)
+		{
+			if(PropertyChanged != null)
+			{
+				PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/BeWo/View/Detail/TextModuleView.xaml b/BeWo/View/Detail/TextModuleView.xaml
new file mode 100644
index 000000000..714787b15
--- /dev/null
+++ b/BeWo/View/Detail/TextModuleView.xaml
@@ -0,0 +1,178 @@
+<view:BeWoView x:Class="BeWo.View.Detail.TextModuleView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:view="clr-namespace:BeWo.View"
+             xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
+             xmlns:validation="clr-namespace:BeWo.Validation"
+             xmlns:detail="clr-namespace:BeWo.View.Detail"
+             xmlns:controls="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
+             xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
+             Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
+			 VerticalAlignment="Stretch" Focusable="True">
+    <view:BeWoView.Resources>
+        <detail:IsOnlyForEmployeeRightsConverter x:Key="IsOnlyForEmployeeRightsConverter" />
+		<detail:TextModuleEditConverter x:Key="TextModuleEditConverter" />
+    </view:BeWoView.Resources>
+    <GroupBox Name="root" Style="{StaticResource ObjectEditGroupBox}">
+        <Grid VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid Grid.Column="0" Grid.Row="0" IsEnabled="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=detail:TextModuleView}, Path=AreUserControlsEnabled}">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <Label Grid.Column="0" Grid.Row="0" Content="Name" />
+				<TextBox xml:space="preserve" Grid.Column="1" Grid.Row="0" MinWidth="125" Text="{validation:ValidationBinding Path=NewVM.Name, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+				
+                <Label Grid.Column="2" Grid.Row="0" Content="Position" />
+                <dxe:SpinEdit Grid.Column="3" Grid.Row="0" Width="100" Height="23" MinValue="0" IsFloatValue="False" 
+							  Value="{Binding Path=NewVM.Position, Mode=TwoWay, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}"
+							  IsEnabled="{Binding Path=NewVM.IsParent, Converter={StaticResource BoolReverseConverter}, UpdateSourceTrigger=PropertyChanged}" />
+				
+                <Label Grid.Column="4" Grid.Row="0" Content="Leistungskategorie" />
+				<controls:NullItemComboBox Grid.Column="5" Grid.Row="0" Width="150" Height="23" ItemsSource="{Binding Path=PossibleCategories, Mode=OneWay}" SelectedItem="{Binding Path=NewVM.ServiceCategory}"
+										   IsEnabled="{Binding Path=NewVM.IsParent, Converter={StaticResource BoolReverseConverter}, UpdateSourceTrigger=PropertyChanged}" />
+				
+				<Label Grid.Column="6" Grid.Row="0" Content="Textbausteinkategorie" />
+				<controls:NullItemComboBox Grid.Column="7" Grid.Row="0" Width="150" x:Name="Box" Height="23" ItemsSource="{Binding Path=PossibleTextModuleParents, Mode=OneWay, UpdateSourceTrigger=Explicit}" SelectedItem="{Binding Path=NewVM.Parent}" />
+				
+				<CheckBox Grid.Column="1" Grid.Row="2" Content="Als Textbausteinkategorie speichern" Margin="0,3,3,0" 
+						  IsChecked="{Binding Path=NewVM.IsParent, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Grid.ColumnSpan="3" Checked="SaveAsTextModuleCategory_OnChecked" />
+				
+                <Label Grid.Column="0" Grid.Row="3" Content="Text" />
+                <TextBox Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="7" AcceptsReturn="True" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" TextWrapping="Wrap" Height="100" Margin="0,3,0,0" 
+						  xml:space="preserve" Text="{Binding Path=NewVM.Text, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding Path=NewVM.IsParent, Converter={StaticResource BoolReverseConverter}, UpdateSourceTrigger=PropertyChanged}" />
+				
+                <Button Grid.Column="4" Grid.Row="4" x:Name="AddTextModuleButton" Margin="0,3,0,0" HorizontalAlignment="Right" Grid.ColumnSpan="4" Click="ButtonAddTextModule_Click" Content="Hinzufügen" />
+            </Grid>
+
+			<dxg:TreeListControl Name="TreeListControl" Grid.Column="0" Grid.Row="1" ItemsSource="{Binding Path=VMList}" Margin="0,15,0,0">
+				<dxg:TreeListControl.Columns>
+					<dxg:TreeListColumn FieldName="IsDeleteable" Header="" FixedWidth="True" Width="24" ReadOnly="True">
+						<dxg:TreeListColumn.CellTemplate>
+							<DataTemplate>
+								<Button Content="r" Click="DeleteButton_Click" FontFamily="Webdings" Width="18" Height="18" VerticalAlignment="Center">
+									<Button.IsEnabled>
+										<MultiBinding Converter="{StaticResource TextModuleEditConverter}">
+											<Binding />
+											<Binding Path="DataContext.RowData.Row" RelativeSource="{RelativeSource TemplatedParent}" />
+										</MultiBinding>
+									</Button.IsEnabled>
+								</Button>
+							</DataTemplate>
+						</dxg:TreeListColumn.CellTemplate>
+					</dxg:TreeListColumn>
+					<dxg:TreeListColumn FieldName="Name">
+						<dxg:TreeListColumn.DisplayTemplate>
+							<ControlTemplate>
+								<dxe:TextEdit EditMode="InplaceInactive" FontWeight="{Binding Path=DataContext.RowData.Row.FontWeight, RelativeSource={RelativeSource TemplatedParent}}" Text="{Binding Path=DataContext.RowData.Row.Name, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, UpdateSourceTrigger=PropertyChanged}">
+								<dxe:TextEdit.IsEnabled>
+									<MultiBinding Converter="{StaticResource TextModuleEditConverter}">
+										<Binding />
+										<Binding Path="DataContext.RowData.Row" RelativeSource="{RelativeSource TemplatedParent}" />
+									</MultiBinding>
+								</dxe:TextEdit.IsEnabled>
+							</dxe:TextEdit>
+							</ControlTemplate>
+						</dxg:TreeListColumn.DisplayTemplate>
+						<dxg:TreeListColumn.EditTemplate>
+							<ControlTemplate>
+								<dxe:TextEdit x:Name="PART_Editor" EditMode="InplaceActive" FontWeight="{Binding Path=DataContext.RowData.Row.FontWeight, RelativeSource={RelativeSource TemplatedParent}}" Text="{Binding Path=DataContext.RowData.Row.Name, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, UpdateSourceTrigger=PropertyChanged}">
+									<dxe:TextEdit.IsEnabled>
+										<MultiBinding Converter="{StaticResource TextModuleEditConverter}">
+											<Binding />
+											<Binding Path="DataContext.RowData.Row" RelativeSource="{RelativeSource TemplatedParent}" />
+										</MultiBinding>
+									</dxe:TextEdit.IsEnabled>
+							</dxe:TextEdit>
+							</ControlTemplate>
+						</dxg:TreeListColumn.EditTemplate>
+					</dxg:TreeListColumn>
+					<dxg:TreeListColumn FieldName="Position">
+						<dxg:TreeListColumn.DisplayTemplate>
+							<ControlTemplate>
+								<dxe:SpinEdit EditMode="InplaceInactive" MinValue="0" IsFloatValue="False"
+                                              Value="{Binding Path=DataContext.RowData.Row.Position, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                              IsEnabled="{Binding Path=DataContext.RowData.Row, Converter={StaticResource IsOnlyForEmployeeRightsConverter}, RelativeSource={RelativeSource TemplatedParent}}" />
+							</ControlTemplate>
+						</dxg:TreeListColumn.DisplayTemplate>
+						<dxg:TreeListColumn.EditTemplate>
+							<ControlTemplate>
+								<dxe:SpinEdit x:Name="PART_Editor" EditMode="InplaceActive" MinValue="0" IsFloatValue="False"
+                                              Value="{Binding Path=DataContext.RowData.Row.Position, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                              IsEnabled="{Binding Path=DataContext.RowData.Row, Converter={StaticResource IsOnlyForEmployeeRightsConverter}, RelativeSource={RelativeSource TemplatedParent}}" />
+							</ControlTemplate>
+						</dxg:TreeListColumn.EditTemplate>
+					</dxg:TreeListColumn>
+					<dxg:TreeListColumn FieldName="Text">
+						<dxg:TreeListColumn.DisplayTemplate>
+							<ControlTemplate>
+								<dxe:TextEdit EditMode="InplaceInactive" Text="{Binding Path=DataContext.RowData.Row.Text, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, UpdateSourceTrigger=PropertyChanged}"
+											  IsEnabled="{Binding Path=DataContext.RowData.Row, Converter={StaticResource IsOnlyForEmployeeRightsConverter}, RelativeSource={RelativeSource TemplatedParent}}" />
+							</ControlTemplate>
+						</dxg:TreeListColumn.DisplayTemplate>
+						<dxg:TreeListColumn.EditTemplate>
+							<ControlTemplate>
+								<dxe:TextEdit x:Name="PART_Editor" EditMode="InplaceActive" Text="{Binding Path=DataContext.RowData.Row.Text, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, UpdateSourceTrigger=PropertyChanged}"
+                                    IsEnabled="{Binding Path=DataContext.RowData.Row, Converter={StaticResource IsOnlyForEmployeeRightsConverter}, RelativeSource={RelativeSource TemplatedParent}}" />
+							</ControlTemplate>
+						</dxg:TreeListColumn.EditTemplate>
+					</dxg:TreeListColumn>
+					<dxg:TreeListColumn FieldName="ServiceCategory" Header="Leistungskategorie" AllowEditing="{Binding Path=DataContext.RowData.Row, Converter={StaticResource BoolReverseConverter}, RelativeSource={RelativeSource TemplatedParent}}">
+						<dxg:TreeListColumn.DisplayTemplate>
+							<ControlTemplate>
+								<dxe:ComboBoxEdit EditMode="InplaceActive" IsEnabled="{Binding Path=DataContext.RowData.Row.IsParent, Converter={StaticResource BoolReverseConverter}, RelativeSource={RelativeSource TemplatedParent}}"
+												  ItemsSource="{Binding Path=DataContext.PossibleCategories, RelativeSource={RelativeSource FindAncestor, AncestorType=dxg:TreeListControl}}"
+												  SelectedItem="{Binding Path=DataContext.RowData.Row.ServiceCategory, RelativeSource={RelativeSource TemplatedParent}}" />
+							</ControlTemplate>
+						</dxg:TreeListColumn.DisplayTemplate>
+						<dxg:TreeListColumn.EditTemplate>
+							<ControlTemplate>
+								<dxe:ComboBoxEdit x:Name="PART_Editor" EditMode="InplaceActive" IsEnabled="{Binding Path=DataContext.RowData.Row.IsParent, Converter={StaticResource BoolReverseConverter}, RelativeSource={RelativeSource TemplatedParent}}" 
+												  ItemsSource="{Binding Path=DataContext.PossibleCategories, RelativeSource={RelativeSource FindAncestor, AncestorType=dxg:TreeListControl}}"
+												  SelectedItem="{Binding Path=DataContext.RowData.Row.ServiceCategory, RelativeSource={RelativeSource TemplatedParent}}" />
+							</ControlTemplate>
+						</dxg:TreeListColumn.EditTemplate>
+					</dxg:TreeListColumn>
+					<dxg:TreeListColumn FieldName="Parent" Header="Textbausteinkategorie">
+						<dxg:TreeListColumn.EditTemplate>
+							<ControlTemplate>
+								<dxe:ComboBoxEdit x:Name="PART_Editor" EditMode="InplaceActive"
+												  ItemsSource="{Binding Path=DataContext.PossibleTextModuleParents, RelativeSource={RelativeSource FindAncestor, AncestorType=dxg:TreeListControl}}"
+												  SelectedItem="{Binding Path=DataContext.RowData.Row.Parent, RelativeSource={RelativeSource TemplatedParent}}"/>
+							</ControlTemplate>
+						</dxg:TreeListColumn.EditTemplate>
+					</dxg:TreeListColumn>
+				</dxg:TreeListControl.Columns>
+				<dxg:TreeListControl.View>
+					<dxg:TreeListView Name="TreeListView" AutoWidth="True" KeyFieldName="KeyField" ParentFieldName="ParentField" />
+				</dxg:TreeListControl.View>
+			</dxg:TreeListControl>
+            
+			<StackPanel Grid.Column="0" Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right" Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=detail:TextModuleView}, Path=IsInAdministrationView, Converter={StaticResource BoolVisibilityConverter}, ConverterParameter=false}">
+				<Button x:Name="SaveButton" HorizontalAlignment="Right" Margin="3" VerticalAlignment="Center" Content="Speichern" Click="SaveButton_OnClick" />
+				<Button x:Name="CancelButton" HorizontalAlignment="Right" Margin="3" VerticalAlignment="Center" Content="Schließen" />
+			</StackPanel>
+        </Grid>
+    </GroupBox>
+</view:BeWoView>
diff --git a/BeWo/View/Detail/TextModuleView.xaml.cs b/BeWo/View/Detail/TextModuleView.xaml.cs
new file mode 100644
index 000000000..02ba8270a
--- /dev/null
+++ b/BeWo/View/Detail/TextModuleView.xaml.cs
@@ -0,0 +1,201 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Windows;
+using System.Windows.Data;
+
+using BeWo.Core.Service;
+using BeWo.ServiceProxy;
+using BeWo.Validation;
+using BeWo.ViewModel;
+using BeWo.ViewModel.ListViewModel;
+
+using BS.Shared;
+using BS.Shared.Extensions;
+using DevExpress.Xpf.Grid;
+
+namespace BeWo.View.Detail
+{
+    public partial class TextModuleView
+    {
+		private TextModuleListVM _ViewModel;
+
+        public TextModuleListVM ViewModel
+        {
+            get { return _ViewModel; }
+
+            set
+            {
+                _ViewModel = value;
+                root.DataContext = _ViewModel;
+            }
+        }
+
+        public override bool IsDirty => ViewModel != null && ViewModel.IsDirty;
+
+	    internal override DependencyObject ValidationOnSaveRootElement => AddTextModuleButton;
+
+	    public bool IsInAdministrationView { get; }
+
+	    public bool AreUserControlsEnabled => IsInAdministrationView ? BeWoApp.LoggedOnUser.HasRight(UserRightType.TextModulesAlleBearbeiten) : BeWoApp.LoggedOnUser.HasRight(UserRightType.TextModulesNurEigeneBearbeiten);
+
+	    public TextModuleView(TextModuleListVM pViewModel, bool pIsInAdministrationView = false)
+        {
+            InitializeComponent();
+
+            IsInAdministrationView = pIsInAdministrationView;
+
+            ViewModel = pViewModel;
+        }
+
+        public void Save(Action pCallBack)
+        {
+            var lToDos = new List<Action<IOperationsService>>();
+
+            if (ViewModel.AddedCount > 0)
+            {
+	            ViewModel.NewVM.IsOnlyForEmployee = true;
+                lToDos.Add(s => s.InsertNewTextModules(ViewModel.CommitAdded()));
+            }
+
+            if (ViewModel.RemovedCount > 0)
+            {
+                lToDos.Add(s => s.DeleteTextModules(ViewModel.GetRemoved().ToDictionary(dc => dc.TextModuleOid.Value, dc => dc.TextModuleVersion.Value)));
+            }
+
+            if (ViewModel.ChangedCount > 0)
+            {
+                lToDos.Add(s => s.UpdateTextModules(ViewModel.CommitChanged()));
+            }
+
+            ServiceFacade.DoMultipleOperationsServicesAsync(lToDos, pCallBack);
+        }
+
+	    protected override void Save()
+	    {
+		    Save(ReloadViewModel);
+	    }
+
+        private void ReloadViewModel()
+        {
+            Cache.GetInstance().ClearServiceCategoryDescriptions();
+            VMFactory.CreateTextModuleListVMAsync(r => this.Dispatch(delegate
+            {
+                ViewModel = r;
+
+				TreeListControl.UpdateLayout();
+            }), IsInAdministrationView, true);
+        }
+		
+		private void DeleteButton_Click(object sender, RoutedEventArgs e)
+        {
+	        var focusedNode = TreeListView.FocusedNode;
+	        var selectedTextModule = (TextModuleVM) focusedNode.Content;
+
+			childrenToDelete.Add(selectedTextModule);
+
+	        if(selectedTextModule.IsParent)
+	        {
+		        if(ViewModel.VMList.Any(textModule => selectedTextModule.Equals(textModule.Parent)))
+		        {
+			        if(MessageBox.Show("Die Textbausteinkategorie enthält weitere Textbausteine und/oder Textbausteinkategorien. Wenn Sie fortfahren, werden alle Unterelemente von \"" + selectedTextModule.Name + "\" gelöscht.", "Textbausteine löschen", MessageBoxButton.OKCancel, MessageBoxImage.Question) == MessageBoxResult.Cancel)
+			        {
+				        childrenToDelete.Clear();
+						return;
+			        }
+				}
+
+			    RetrieveChildTextModulesFromParent(selectedTextModule);
+	        }
+
+			ViewModel.VMList.RemoveRange(childrenToDelete);
+			childrenToDelete.Clear();
+		}
+
+		private readonly List<TextModuleVM> childrenToDelete = new List<TextModuleVM>();
+	    private void RetrieveChildTextModulesFromParent(TextModuleVM parent)
+	    {
+		    var children = ViewModel.VMList.Where(w => w.Parent != null && w.Parent.Equals(parent));
+
+		    foreach(var child in children)
+		    {
+			    childrenToDelete.Add(child);
+				RetrieveChildTextModulesFromParent(child);
+		    }
+	    }
+
+        private void ButtonAddTextModule_Click(object sender, RoutedEventArgs e)
+        {
+            if (ValidationTrigger.Validate(this))
+            {
+	            ViewModel.NewVM.IsOnlyForEmployee = !IsInAdministrationView;
+                ViewModel.AddNewVMToList();
+				Save(ReloadViewModel);
+            }
+        }
+
+        public static bool CheckEditorRights(TextModuleVM textModuleVM, object parameter)
+        {
+	        if (textModuleVM != null)
+	        {
+                var isOwn = textModuleVM.Employee.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid);
+
+		        var hasRight2EditAll = BeWoApp.LoggedOnUser.HasRight(UserRightType.TextModulesAlleBearbeiten);
+		        var hasRight2EditOwn = BeWoApp.LoggedOnUser.HasRight(UserRightType.TextModulesNurEigeneBearbeiten);
+		        var hasRight2Create4All = BeWoApp.LoggedOnUser.HasRight(UserRightType.TextModulesAlleBearbeiten);
+
+		        if(parameter != null && parameter.ToString().Equals("IsOnlyForEmployeeCheckBox"))
+		        {
+			        return isOwn && hasRight2EditOwn && hasRight2Create4All || hasRight2EditAll;
+		        }
+
+		        return isOwn && hasRight2EditOwn || hasRight2EditAll;
+	        }
+
+	        return false;
+        }
+
+	    private void SaveAsTextModuleCategory_OnChecked(object sender, RoutedEventArgs e)
+	    {
+		    ViewModel.NewVM.Text = string.Empty;
+	    }
+
+	    private void SaveButton_OnClick(object sender, RoutedEventArgs e)
+	    {
+		    Save(ReloadViewModel);
+	    }
+    }
+
+    public class IsOnlyForEmployeeRightsConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            var textModule = (TextModuleVM) value;
+
+            return textModule != null && TextModuleView.CheckEditorRights(textModule, parameter) && !textModule.IsParent;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+	public class TextModuleEditConverter : IMultiValueConverter
+	{
+		public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+		{
+			var fieldname = ((EditGridCellData) values[0]).Column.FieldName;
+			var shuoldBeEditableDespiteBeingFromAParentElement = fieldname.Equals("Name") || fieldname.Equals("IsDeleteable");
+			var textModule = (TextModuleVM) values[1];
+
+			return TextModuleView.CheckEditorRights(textModule, parameter) && shuoldBeEditableDespiteBeingFromAParentElement;
+		}
+
+		public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+		{
+			throw new NotImplementedException();
+		}
+	}
+}
diff --git a/BeWo/View/Search/TextModuleSearchView.cs b/BeWo/View/Search/TextModuleSearchView.cs
new file mode 100644
index 000000000..3947bc7c6
--- /dev/null
+++ b/BeWo/View/Search/TextModuleSearchView.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Windows.Media;
+
+using BeWo.ServiceProxy;
+
+using BS.Shared;
+using BS.Shared.DataContracts;
+using BS.Shared.Extensions;
+
+namespace BeWo.View.Search
+{
+    public class TextModuleSearchView : GenericSearchView<TextModuleDC>
+    {
+        private long serviceCategoryOid;
+
+        public long ServiceCategoryOid
+        {
+            get { return serviceCategoryOid; }
+            set
+            {
+                serviceCategoryOid = value;
+
+                ServiceFacade.DoOperationsServiceAsync(s => s.GetTextModulesByServiceCategory(ServiceCategoryOid), r =>
+                {
+                    r = r.OrderBy(tb => tb.ServiceCategory != null).ThenBy(tb => tb.Position).ThenBy(tb => tb.Name).ToList();
+                    this.Dispatch(() => UpdateObjectList(r));
+                });
+            }
+        }
+
+        public TextModuleSearchView()
+        {
+            if (!DesignerProperties.GetIsInDesignMode(this))
+            {
+                ThemeColor = FindResource("TextModuleBrush") as Brush;
+            }
+        }
+
+        protected override void GetAll(Action<List<TextModuleDC>> pCallBack)
+        {
+            ServiceFacade.DoOperationsServiceAsync(s => s.GetTextModulesByServiceCategory(ServiceCategoryOid), r =>
+            {
+                r = r.OrderBy(tb => tb.ServiceCategory == null).ThenBy(tb => tb.Position).ThenBy(tb => tb.Name).ToList();
+
+                r = !BeWoApp.LoggedOnUser.HasRight(UserRightType.TextModulesAlleAnsehen) ? 
+                    r.Where(w => w.Employee.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid)).ToList() :
+                    r.Where(w => !(w.IsOnlyForEmployee && !w.Employee.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid))).ToList();
+
+                pCallBack(r);
+            });
+        }
+    }
+}
diff --git a/BeWo/ViewModel/ListViewModel/TextModuleListVM.cs b/BeWo/ViewModel/ListViewModel/TextModuleListVM.cs
new file mode 100644
index 000000000..3be4f4763
--- /dev/null
+++ b/BeWo/ViewModel/ListViewModel/TextModuleListVM.cs
@@ -0,0 +1,28 @@
+using System.Collections.Generic;
+using System.Linq;
+using BS.Shared.DataContracts;
+
+namespace BeWo.ViewModel.ListViewModel
+{
+    public class TextModuleListVM : AbstractDCListMapperVM<TextModuleDC, TextModuleVM>
+    {
+		public static string PropertyName_PossibleCategories        = "PossibleCategories";
+	    public static string PropertyName_PossibleTextModuleParents = "PossibleTextModuleParents";
+
+
+		private readonly List<ServiceCategoryDC> _PossibleCategories;
+	    private readonly List<TextModuleVM>      _PossibleTextModuleParents;
+
+
+		public TextModuleListVM(IEnumerable<TextModuleDC> pDataContracts, List<ServiceCategoryDC> pPossibleCategories) : base(pDataContracts)
+        {
+            _PossibleCategories = pPossibleCategories;
+	        _PossibleTextModuleParents = VMList.Where(w => w.IsParent).ToList();
+        }
+
+
+        public IEnumerable<ServiceCategoryDC> PossibleCategories   => _PossibleCategories;
+
+	    public IEnumerable<TextModuleVM> PossibleTextModuleParents => _PossibleTextModuleParents;
+	}
+}
diff --git a/BeWo/ViewModel/TextModuleVM.cs b/BeWo/ViewModel/TextModuleVM.cs
new file mode 100644
index 000000000..89aa68dee
--- /dev/null
+++ b/BeWo/ViewModel/TextModuleVM.cs
@@ -0,0 +1,239 @@
+using System.Windows;
+
+using BeWo.ServiceProxy;
+using BeWo.Validation;
+
+using BS.Shared;
+using BS.Shared.DataContracts;
+using BS.Shared.DataContracts.Compact;
+
+namespace BeWo.ViewModel
+{
+    public class TextModuleVM : AbstractDCMapperVM<TextModuleDC>
+    {
+        private int _Position;
+
+        private string _Text;
+
+        private string _Name;
+
+        private CompactEmployeeDC _Employee;
+
+        private ServiceCategoryDC _ServiceCategory;
+
+        private bool _IsOnlyForEmployee;
+
+	    private bool _IsParent;
+
+	    private TextModuleVM _Parent;
+		
+
+		public TextModuleVM(TextModuleDC pDataContract) : base(pDataContract, pDataContract.TextModuleOid == null) {}
+
+
+        public ServiceCategoryDC ServiceCategory
+        {
+            get { return _ServiceCategory; }
+
+            set
+            {
+                if (AreDifferent(_ServiceCategory, value))
+                {
+                    _ServiceCategory = value;
+                    StoreDirtyInformation(AreDifferent(DataContract.ServiceCategory, value), nameof(ServiceCategory));
+                    FirePropertyChanged(nameof(ServiceCategory));
+                }
+            }
+        }
+
+        public CompactEmployeeDC Employee
+        {
+            get { return _Employee; }
+
+            set
+            {
+                if (AreDifferent(_Employee, value))
+                {
+                    _Employee = value;
+                    StoreDirtyInformation(AreDifferent(DataContract.Employee, value), nameof(Employee));
+                    FirePropertyChanged(nameof(Employee));
+                }
+            }
+        }
+
+        public int Position
+        {
+            get { return _Position; }
+
+            set
+            {
+                if (AreDifferent(_Position, value))
+                {
+                    _Position = value;
+                    StoreDirtyInformation(AreDifferent(DataContract.Position, value), nameof(Position));
+                    FirePropertyChanged(nameof(Position));
+                }
+            }
+        }
+
+        public string Text
+        {
+            get { return _Text; }
+
+            set
+            {
+                if (AreDifferent(_Text, value))
+                {
+                    _Text = value;
+                    StoreDirtyInformation(AreDifferent(DataContract.Text, value), nameof(Text));
+                    FirePropertyChanged(nameof(Text));
+                }
+            }
+        }
+
+        public bool IsOnlyForEmployee
+        {
+            get { return _IsOnlyForEmployee; }
+
+            set
+            {
+                if (AreDifferent(_IsOnlyForEmployee, value))
+                {
+                    _IsOnlyForEmployee = value;
+                    StoreDirtyInformation(AreDifferent(DataContract.IsOnlyForEmployee, value), nameof(IsOnlyForEmployee));
+                    FirePropertyChanged(nameof(IsOnlyForEmployee));
+                }
+            }
+        }
+
+	    public bool IsParent
+	    {
+		    get { return _IsParent; }
+
+		    set
+		    {
+			    if(AreDifferent(_IsParent, value))
+			    {
+				    _IsParent = value;
+					StoreDirtyInformation(AreDifferent(DataContract.IsParent, value), nameof(IsParent));
+					FirePropertyChanged(nameof(IsParent));
+			    }
+		    }
+	    }
+
+		public TextModuleVM Parent
+		{
+			get { return _Parent; }
+
+			set
+			{
+				if(AreDifferent(_Parent, value) && AreDifferent(value, this))
+				{
+					_Parent = value;
+					StoreDirtyInformation(AreDifferent(DataContract.Parent, value), nameof(Parent));
+					FirePropertyChanged(nameof(Parent));
+				}
+			}
+		}
+
+	    public FontWeight FontWeight => _IsParent ? FontWeights.Bold : FontWeights.Normal;
+
+	    public long? KeyField => DataContract?.TextModuleOid;
+
+	    public long? ParentField => Parent?.DataContract?.TextModuleOid;
+
+		[Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
+        public string Name
+        {
+            get { return _Name; }
+
+            set
+            {
+                if (AreDifferent(_Name, value))
+                {
+                    _Name = value;
+                    StoreDirtyInformation(AreDifferent(DataContract.Name, value), nameof(Name));
+                    FirePropertyChanged(nameof(Name));
+                }
+            }
+        }
+
+        protected override void InitByDataContract(TextModuleDC pDataContract)
+        {
+            if (!IsNew)
+            {
+                _ServiceCategory   = pDataContract.ServiceCategory;
+                _Text              = pDataContract.Text;
+                _Position          = pDataContract.Position;
+                _Name              = pDataContract.Name;
+                _Employee          = pDataContract.Employee;
+                _IsOnlyForEmployee = pDataContract.IsOnlyForEmployee;
+	            _IsParent          = pDataContract.IsParent;
+	            _Parent            = pDataContract.Parent != null ? new TextModuleVM(pDataContract.Parent) : null;
+            }
+            else
+            {
+                ServiceFacade.DoEmployeeServiceSync(s => _Employee = s.LoadCompactEmployee(BeWoApp.LoggedOnEmployee.EmployeeOid.Value));
+
+                if (BeWoApp.LoggedOnUser.HasRight(UserRightType.TextModulesNurEigeneBearbeiten) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.TextModulesAlleBearbeiten))
+                {
+                    _IsOnlyForEmployee = true;
+                }
+            }
+        }
+
+        protected override TextModuleDC MapToDataContract(TextModuleDC pDataContract, bool doCommit)
+        {
+            pDataContract.Text     = _Text;
+            pDataContract.Position = _Position;
+            pDataContract.Name     = _Name;
+	        pDataContract.IsParent = _IsParent;
+
+            pDataContract.IsOnlyForEmployee = _IsOnlyForEmployee;
+
+	        if(_Parent != null)
+	        {
+				pDataContract.Parent = _Parent.CommitToDataContract();
+			}
+
+            if(_Employee != null)
+            {
+                pDataContract.Employee = _Employee;
+            }
+
+            if (_ServiceCategory != null)
+            {
+                pDataContract.ServiceCategory = _ServiceCategory;
+            }
+
+            return pDataContract;
+        }
+
+	    public override bool Equals(object pObj)
+	    {
+			if (!(pObj is TextModuleVM))
+	        {
+	            return false;
+	        }
+
+	        var obj = (TextModuleVM) pObj;
+			
+			return
+				Equals(IsNew, obj.IsNew) &&
+				Equals(ServiceCategory, obj.ServiceCategory) &&
+				Equals(Text, obj.Text) &&
+				Equals(Position, obj.Position) &&
+				Equals(Parent, obj.Parent) &&
+				Equals(Name, obj.Name) &&
+				Equals(Employee, obj.Employee) &&
+				Equals(IsOnlyForEmployee, obj.IsOnlyForEmployee) &&
+				Equals(IsParent, obj.IsParent) &&
+				Equals(IsDirty, obj.IsDirty);
+	    }
+
+	    public override string ToString()
+	    {
+		    return _Name;
+	    }
+	}
+}
diff --git a/Data/Entities/TextModule.cs b/Data/Entities/TextModule.cs
new file mode 100644
index 000000000..0151dcad0
--- /dev/null
+++ b/Data/Entities/TextModule.cs
@@ -0,0 +1,149 @@
+using BS.Shared;
+
+namespace BeWo.Data.Entities
+{
+    public class TextModule : BeWoEntityBase
+    {
+        public static string PropertyName_Text              = "Text";
+        public static string PropertyName_Position          = "Position";
+        public static string PropertyName_ServiceCategory   = "ServiceCategory";
+        public static string PropertyName_Name              = "Name";
+        public static string PropertyName_Employee          = "Employee";
+        public static string PropertyName_IsOnlyForEmployee = "IsOnlyForEmployee";
+	    public static string PropertyName_ParentOid         = "ParentOid";
+	    public static string PropertyName_IsParent          = "IsParent";
+
+
+		private string          _Text;
+        private string          _Name;
+        private int             _Position;
+        private ServiceCategory _ServiceCategory;
+        private Employee        _Employee;
+        private bool            _IsOnlyForEmployee;
+	    private TextModule      _Parent;
+	    private bool            _IsParent;
+
+
+		public TextModule()
+        {
+            _Tid = TableID.Textbaustein;
+        }
+
+
+        public virtual ServiceCategory ServiceCategory
+        {
+            get { return _ServiceCategory; }
+
+            set
+            {
+                if (AreDifferent(_ServiceCategory, value))
+                {
+                    _ServiceCategory = value;
+                }
+            }
+        }
+
+        public virtual Employee Employee
+        {
+            get { return _Employee; }
+
+            set
+            {
+                if (AreDifferent(_Employee, value))
+                {
+                    _Employee = value;
+                }
+            }
+        }
+
+        public virtual bool IsOnlyForEmployee
+        {
+            get { return _IsOnlyForEmployee; }
+
+            set
+            {
+                if (AreDifferent(_IsOnlyForEmployee, value))
+                {
+                    _IsOnlyForEmployee = value;
+                }
+            }
+        }
+
+		public virtual bool IsParent
+		{
+			get { return _IsParent; }
+
+			set
+			{
+				if(AreDifferent(_IsParent, value))
+				{
+					_IsParent = value;
+				}
+			}
+		}
+
+		public virtual string Text
+        {
+            get
+            {
+                return _Text;
+            }
+
+            set
+            {
+                if (AreDifferent(_Text, value))
+                {
+                    _Text = value;
+                }
+            }
+        }
+
+        public virtual string Name
+        {
+            get
+            {
+                return _Name;
+            }
+
+            set
+            {
+                if (AreDifferent(_Name, value))
+                {
+                    _Name = value;
+                }
+            }
+        }
+
+        public virtual int Position
+        {
+            get
+            {
+                return _Position;
+            }
+
+            set
+            {
+                if (AreDifferent(_Position, value))
+                {
+                    _Position = value;
+                }
+            }
+        }
+
+	    public virtual TextModule Parent
+	    {
+		    get
+		    {
+			    return _Parent;
+		    }
+
+		    set
+		    {
+			    if(AreDifferent(_Parent, value))
+			    {
+					_Parent = value;
+			    }
+		    }
+	    }
+	}
+}
diff --git a/Data/Mappings/TextModule.hbm.xml b/Data/Mappings/TextModule.hbm.xml
new file mode 100644
index 000000000..b4c515658
--- /dev/null
+++ b/Data/Mappings/TextModule.hbm.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
+	<class name="BeWo.Data.Entities.TextModule, BeWo.Data" table="Textbaustein">
+		<id name="Oid" column="Oid" type="Int64" unsaved-value="null">
+			<generator class="identity" />
+		</id>
+		
+		<version type="Int64" column="Version" name="Version" />
+		
+		<property column="Tid" type="BS.Shared.TableID, BS.Shared" name="_Tid" access="field" />
+		<property column="InsTs" type="DateTime" name="InsTs" />
+		<property column="InsUser" type="String" name="InsUser" length="256" />
+		<property column="IsActive" type="BS.Shared.ActivationTypeId, BS.Shared" name="IsActive" />
+		<property column="SystemEntryID" type="BS.Shared.SystemEntryID, BS.Shared" name="SystemEntryID" />
+		<property column="UdpUser" type="String" name="UdpUser" length="256" />
+		<property column="Notice" type="String" name="Notice" length="1024" />
+		<property column="Text" type="String" name="Text" length="1024" />
+		<property column="Position" name="Position" type="Int32" />
+		<property column="Name" type="String" name="Name" length="1024" />
+		<property column="IsOnlyForEmployee" type="Boolean" name="IsOnlyForEmployee" />
+		<property column="IsParent" type="Boolean" name="IsParent" />
+    
+		<many-to-one name="ServiceCategory" column="ServiceCategoryOid" class="BeWo.Data.Entities.ServiceCategory, BeWo.Data" cascade="none" fetch="join" />
+		<many-to-one name="Employee" column="EmployeeOid" class="BeWo.Data.Entities.Employee, BeWo.Data" cascade="none" fetch="join" />
+		<many-to-one name="Parent" column="ParentOid" class="BeWo.Data.Entities.TextModule, BeWo.Data" cascade="none" fetch="join" />
+	</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/Service/DCEntityMapper/TextModuleDC_TextModule.cs b/Service/DCEntityMapper/TextModuleDC_TextModule.cs
new file mode 100644
index 000000000..aecc786b6
--- /dev/null
+++ b/Service/DCEntityMapper/TextModuleDC_TextModule.cs
@@ -0,0 +1,75 @@
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+
+using BS.Shared.DataContracts;
+
+namespace BeWo.Service.DCEntityMapper
+{
+    public class TextModuleDC_TextModule : AbstractIDCEntityMapper<TextModule, TextModuleDC>
+    {
+        public override TextModuleDC MergeWithDC(TextModule pEntity, TextModuleDC pDataContract)
+        {
+            pDataContract.Position            = pEntity.Position;
+            pDataContract.TextModuleVersion   = pEntity.Version.Value;
+            pDataContract.TextModuleOid       = pEntity.Oid.Value;
+            pDataContract.Text                = pEntity.Text;
+            pDataContract.Name                = pEntity.Name;
+            pDataContract.IsOnlyForEmployee   = pEntity.IsOnlyForEmployee;
+	        pDataContract.IsParent            = pEntity.IsParent;
+
+	        if(pEntity.Parent != null)
+	        {
+		        pDataContract.Parent = MapperFactory.TextModuleDC_TextModule.MapToNewDC(pEntity.Parent);
+	        }
+
+            if(pEntity.ServiceCategory != null)
+            {
+	            pDataContract.ServiceCategory = MapperFactory.ServiceCategoryDC_ServiceCategory.MapToNewDC(pEntity.ServiceCategory);
+            }
+
+            if (pEntity.Employee != null)
+            {
+	            pDataContract.Employee = MapperFactory.CompactEmployeeDC_Employee.MapToNewDC(pEntity.Employee);
+            }
+
+            return pDataContract;
+        }
+
+        public override TextModule MergeWithEntity(TextModuleDC pDataContract, TextModule pEntity)
+        {
+            ConcurrencyCheck(pDataContract.TextModuleVersion, pEntity);
+
+            pEntity.Position          = pDataContract.Position;
+            pEntity.Oid               = pDataContract.TextModuleOid;
+            pEntity.Text              = pDataContract.Text;
+            pEntity.Name              = pDataContract.Name;
+            pEntity.IsOnlyForEmployee = pDataContract.IsOnlyForEmployee;
+	        pEntity.IsParent          = pDataContract.IsParent;
+
+			if(pDataContract.Parent != null)
+	        {
+		        pEntity.Parent = DAOFactory.GenericDAO.LoadByID<TextModule>(pDataContract.Parent.TextModuleOid.Value);
+
+	        }
+
+			if (pDataContract.ServiceCategory != null)
+            {
+                pEntity.ServiceCategory = pDataContract.ServiceCategory.ServiceCategoryOid.HasValue ?
+                    DAOFactory.GenericDAO.LoadByID<ServiceCategory>(pDataContract.ServiceCategory.ServiceCategoryOid.Value) :
+                    MapperFactory.ServiceCategoryDC_ServiceCategory.MapToNewEntity(pDataContract.ServiceCategory);
+            }
+
+            if (pDataContract.Employee != null)
+            {
+                pEntity.Employee = DAOFactory.GenericDAO.LoadByID<Employee>(pDataContract.Employee.EmployeeOid);
+            }
+
+            return pEntity;
+        }
+
+        protected override bool AreDCAndEntityEqual(TextModuleDC pDC, TextModule pEntity)
+        {
+            return pDC.TextModuleOid == pEntity.Oid;
+        }
+    }
+}
diff --git a/Shared/DataContracts/ClientPartials/TextModuleDC.cs b/Shared/DataContracts/ClientPartials/TextModuleDC.cs
new file mode 100644
index 000000000..380c81085
--- /dev/null
+++ b/Shared/DataContracts/ClientPartials/TextModuleDC.cs
@@ -0,0 +1,51 @@
+using System.Windows.Media;
+
+namespace BS.Shared.DataContracts
+{
+    public partial class TextModuleDC : IFilterableDC
+    {
+        public override bool Equals(object obj)
+        {
+            if (obj is TextModuleDC)
+            {
+                var y = (TextModuleDC) obj;
+                if (TextModuleOid == null && y.TextModuleOid == null)
+                {
+                    return GetHashCode() == y.GetHashCode();
+                }
+
+                if (TextModuleOid != null && y.TextModuleOid != null)
+                {
+                    return TextModuleOid == y.TextModuleOid;
+                }
+            }
+
+            return false;
+        }
+
+        public override int GetHashCode()
+        {
+            return GetType().Name.GetHashCode() ^ TextModuleOid.GetHashCode();
+        }
+
+        public override string ToString()
+        {
+            return Name;
+        }
+
+        public ActivationTypeId ActivationType { get; set; }
+        public string DetailDescription { get { return Text; } }
+        public string FilterRelevants { get { return Name + Text; } }
+        public string IconPath { get; private set; }
+        public string SimpleDescription { get { return Name; } }
+        public bool SupportsActivationType { get; private set; }
+
+        public long Version
+        {
+            get { return TextModuleVersion == null ? 0 : TextModuleVersion.Value; }
+            set { TextModuleVersion = value; }
+        }
+
+        public SolidColorBrush FilterableBrush { get { return new SolidColorBrush(Colors.Transparent); } }
+    }
+}
\ No newline at end of file
diff --git a/Shared/DataContracts/TextModuleDC.cs b/Shared/DataContracts/TextModuleDC.cs
new file mode 100644
index 000000000..58357daa5
--- /dev/null
+++ b/Shared/DataContracts/TextModuleDC.cs
@@ -0,0 +1,40 @@
+using System.Runtime.Serialization;
+
+using BS.Shared.DataContracts.Compact;
+
+namespace BS.Shared.DataContracts
+{
+    [DataContract]
+    public partial class TextModuleDC : IDataContract
+    {
+        [DataMember]
+        public long? TextModuleOid { get; set; }
+
+        [DataMember]
+        public long? TextModuleVersion { get; set; }
+
+        [DataMember]
+        public string Text { get; set; }
+
+        [DataMember]
+        public ServiceCategoryDC ServiceCategory { get; set; }
+
+        [DataMember]
+        public int Position { get; set; }
+
+        [DataMember]
+        public string Name { get; set; }
+
+        [DataMember]
+        public CompactEmployeeDC Employee { get; set; }
+
+        [DataMember]
+        public bool IsOnlyForEmployee { get; set; }
+
+		[DataMember]
+		public bool IsParent { get; set; }
+
+		[DataMember]
+		public TextModuleDC Parent { get; set; }
+	}
+}