diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index 25e82a4ef..53c36d97a 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -269,6 +269,70 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Styles\Colors\Colors.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\ControlStyles\ButtonStyles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\ControlStyles\CheckBoxStyles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\ControlStyles\ComboBoxStyles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\ControlStyles\CustomControlsStyles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\ControlStyles\DateEditStyles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\ControlStyles\LabelStyles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\ControlStyles\ListBoxStyles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\ControlStyles\NullItemComboBoxStyles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\ControlStyles\RadioButtonStyles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\ControlStyles\TextBoxStyles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\ControlStyles\TextEditStyles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\ControlStyles\ToggleButtonStyles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\DataTemplates\ControlTemplates.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\DataTemplates\DataTemplates.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\ModernOrangeBlack.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Styles\PrototypeStyles.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -367,6 +431,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="View\Detail\Wohneinheit\WohneinheitGrundrissControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="View\Detail\Wohneinheit\WohneinheitGrundrissModalPopup.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -1260,6 +1328,9 @@
     <Compile Include="View\Detail\Wohneinheit\WohneinheitBelegungWindow.xaml.cs">
       <DependentUpon>WohneinheitBelegungWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="View\Detail\Wohneinheit\WohneinheitGrundrissControl.xaml.cs">
+      <DependentUpon>WohneinheitGrundrissControl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="View\Detail\Wohneinheit\WohneinheitGrundrissModalPopup.xaml.cs">
       <DependentUpon>WohneinheitGrundrissModalPopup.xaml</DependentUpon>
     </Compile>
diff --git a/BeWo/DebugConfig.cs b/BeWo/DebugConfig.cs
index e5cb9cf9f..fcf3a8142 100644
--- a/BeWo/DebugConfig.cs
+++ b/BeWo/DebugConfig.cs
@@ -22,7 +22,7 @@ namespace BeWo
             {
                 #if DEBUG
 
-                return _CurrentConfig ?? (_CurrentConfig = FeatureCustomerWohnhilfe);
+                return _CurrentConfig ?? (_CurrentConfig = Feature_Customer_Wohnhilfe);
 
                 #endif
 
@@ -42,14 +42,14 @@ namespace BeWo
             AutoLogin = true
         };
 
-        public static DebugConfig FeatureCustomerWohnhilfe => new DebugConfig()
+        public static DebugConfig Feature_Customer_Wohnhilfe => new DebugConfig()
         {
             DebugConfigMode = DebugConfigMode.FeatureCustomerWohnhilfe,
             AutoLogin = true,
             SelectView = UIContext.Customer
         };
 
-        public static DebugConfig FeatureWohnheimWohneinheit => new DebugConfig()
+        public static DebugConfig Feature_Wohnheim_Wohneinheit => new DebugConfig()
         {
             DebugConfigMode = DebugConfigMode.FeatureWohnheimWohneinheit,
             AutoLogin = true,
diff --git a/BeWo/Styles/Colors/Colors.xaml b/BeWo/Styles/Colors/Colors.xaml
new file mode 100644
index 000000000..87e38a3b3
--- /dev/null
+++ b/BeWo/Styles/Colors/Colors.xaml
@@ -0,0 +1,4 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="TextBoxBorderBrush" Color="#FF86878F" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/ControlStyles/ButtonStyles.xaml b/BeWo/Styles/ControlStyles/ButtonStyles.xaml
new file mode 100644
index 000000000..abe9b7e68
--- /dev/null
+++ b/BeWo/Styles/ControlStyles/ButtonStyles.xaml
@@ -0,0 +1,139 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--Base-->
+    <Style x:Key="BaseButton" TargetType="{x:Type Button}">
+        <Setter Property="Margin" Value="3" />
+        <Setter Property="Height" Value="25" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="Foreground" Value="#FFFFFFFF" />
+        <Setter Property="FontFamily" Value="Microsoft Sans Serif" />
+        <Setter Property="FontSize" Value="12" />
+    </Style>
+
+    <Style
+        x:Key="PrimaryButton"
+        BasedOn="{StaticResource BaseButton}"
+        TargetType="{x:Type Button}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <ControlTemplate.Resources>
+                        <Storyboard x:Key="Timeline1">
+                            <DoubleAnimationUsingKeyFrames
+                                BeginTime="00:00:00"
+                                Storyboard.TargetName="glow"
+                                Storyboard.TargetProperty="(UIElement.Opacity)">
+                                <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="1" />
+                            </DoubleAnimationUsingKeyFrames>
+                        </Storyboard>
+                        <Storyboard x:Key="Timeline2">
+                            <DoubleAnimationUsingKeyFrames
+                                BeginTime="00:00:00"
+                                Storyboard.TargetName="glow"
+                                Storyboard.TargetProperty="(UIElement.Opacity)">
+                                <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="0" />
+                            </DoubleAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </ControlTemplate.Resources>
+                    <Border
+                        x:Name="border"
+                        Padding="0,0,0,0"
+                        BorderBrush="#FF000000"
+                        BorderThickness="1,1,1,1"
+                        CornerRadius="4,4,4,4">
+                        <Border.Background>
+                            <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
+                                <GradientStop Offset="0" Color="#FF000000" />
+                                <GradientStop Offset="1" Color="#FF262626" />
+                            </LinearGradientBrush>
+                        </Border.Background>
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="0.5*" />
+                                <RowDefinition Height="0.5*" />
+                            </Grid.RowDefinitions>
+                            <Border
+                                x:Name="glow"
+                                Grid.RowSpan="2"
+                                Width="Auto"
+                                HorizontalAlignment="Stretch"
+                                CornerRadius="4,4,4,4"
+                                Opacity="0">
+                                <Border.Background>
+                                    <RadialGradientBrush>
+                                        <RadialGradientBrush.RelativeTransform>
+                                            <TransformGroup>
+                                                <ScaleTransform ScaleX="1.702" ScaleY="2.243" />
+                                                <SkewTransform AngleX="0" AngleY="0" />
+                                                <RotateTransform Angle="0" />
+                                                <TranslateTransform X="-0.368" Y="-0.152" />
+                                            </TransformGroup>
+                                        </RadialGradientBrush.RelativeTransform>
+                                        <GradientStop Offset="0" Color="#B28DBDFF" />
+                                        <GradientStop Offset="1" Color="#008DBDFF" />
+                                    </RadialGradientBrush>
+                                </Border.Background>
+                            </Border>
+                            <Border
+                                x:Name="shine"
+                                Grid.Row="0"
+                                Width="Auto"
+                                Margin="0,0,0,0"
+                                HorizontalAlignment="Stretch"
+                                CornerRadius="4,4,0,0">
+                                <Border.Background>
+                                    <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
+                                        <GradientStop Offset="0" Color="#99FFFFFF" />
+                                        <GradientStop Offset="1" Color="#33FFFFFF" />
+                                    </LinearGradientBrush>
+                                </Border.Background>
+                            </Border>
+                            <Border
+                                Grid.Row="0"
+                                Grid.RowSpan="2"
+                                Margin="0,0,0,0">
+                                <ContentPresenter
+                                    Width="Auto"
+                                    Margin="3,0,3,0"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center" />
+                            </Border>
+                        </Grid>
+                    </Border>
+
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="shine" Property="Opacity" Value="0.4" />
+                            <Setter TargetName="border" Property="Background" Value="#998DBDFF" />
+                            <Setter TargetName="glow" Property="Visibility" Value="Hidden" />
+                            <Setter TargetName="border" Property="BorderBrush" Value="#FF0C0C0C" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard Storyboard="{StaticResource Timeline1}" />
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <BeginStoryboard x:Name="Timeline2_BeginStoryboard" Storyboard="{StaticResource Timeline2}" />
+                            </Trigger.ExitActions>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="border" Property="Background" Value="#FF808080" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style
+        x:Key="HideDisabledButton"
+        BasedOn="{StaticResource PrimaryButton}"
+        TargetType="{x:Type Button}">
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsEnabled}" Value="False">
+                <Setter Property="Visibility" Value="Collapsed" />
+            </DataTrigger>
+        </Style.Triggers>
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/ControlStyles/CheckBoxStyles.xaml b/BeWo/Styles/ControlStyles/CheckBoxStyles.xaml
new file mode 100644
index 000000000..9a8a06781
--- /dev/null
+++ b/BeWo/Styles/ControlStyles/CheckBoxStyles.xaml
@@ -0,0 +1,7 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Style x:Key="CheckBoxBase" TargetType="{x:Type CheckBox}">
+        <Setter Property="Margin" Value="5" />
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/ControlStyles/ComboBoxStyles.xaml b/BeWo/Styles/ControlStyles/ComboBoxStyles.xaml
new file mode 100644
index 000000000..d6b503b32
--- /dev/null
+++ b/BeWo/Styles/ControlStyles/ComboBoxStyles.xaml
@@ -0,0 +1,145 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:conv="clr-namespace:BeWo.Converter"
+    xmlns:Microsoft_Windows_Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero">
+
+    <!--  ComboBox  -->
+    <Style x:Key="PrimaryComboBox" TargetType="ComboBox">
+        <Setter Property="Margin" Value="3" />
+        <Setter Property="Height" Value="23" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource ComboBoxFocusVisual}" />
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource TextBoxBorderBrush}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Padding" Value="1" />
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+        <Setter Property="ScrollViewer.CanContentScroll" Value="true" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ComboBox}">
+                    <Grid SnapsToDevicePixels="true">
+                        <Border
+                            x:Name="Bd"
+                            Padding="1"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                            <Grid Grid.IsSharedSizeScope="true">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="1" />
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" SharedSizeGroup="ComboBoxButton" />
+                                </Grid.ColumnDefinitions>
+                                <Border
+                                    x:Name="SelectedItemBorder"
+                                    Grid.ColumnSpan="2"
+                                    Margin="2,1,20,1">
+                                    <ContentPresenter
+                                        Margin="3,0"
+                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                        Content="{TemplateBinding SelectionBoxItem}"
+                                        ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
+                                        ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
+                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                </Border>
+                                <ToggleButton
+                                    Grid.Column="0"
+                                    Grid.ColumnSpan="3"
+                                    IsChecked="{Binding Path=IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                    Style="{DynamicResource ComboBoxTransparentButtonStyle}" />
+                            </Grid>
+                        </Border>
+                        <Popup
+                            x:Name="PART_Popup"
+                            AllowsTransparency="true"
+                            Focusable="false"
+                            IsOpen="{Binding Path=IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                            Placement="Bottom"
+                            PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}">
+                            <Microsoft_Windows_Themes:SystemDropShadowChrome
+                                x:Name="Shdw"
+                                MinWidth="{TemplateBinding ActualWidth}"
+                                MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                                Color="Transparent">
+                                <Border
+                                    x:Name="DropDownBorder"
+                                    Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
+                                    BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}"
+                                    BorderThickness="1">
+                                    <ScrollViewer>
+                                        <ItemsPresenter KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                    </ScrollViewer>
+                                </Border>
+                            </Microsoft_Windows_Themes:SystemDropShadowChrome>
+                        </Popup>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsSelectionBoxHighlighted" Value="true" />
+                                <Condition Property="IsDropDownOpen" Value="false" />
+                            </MultiTrigger.Conditions>
+                            <Setter Property="Foreground" Value="#FF000000" />
+                        </MultiTrigger>
+                        <Trigger Property="IsSelectionBoxHighlighted" Value="true">
+                            <Setter TargetName="SelectedItemBorder" Property="Background" Value="#FF8AC5FF" />
+                        </Trigger>
+                        <Trigger SourceName="PART_Popup" Property="HasDropShadow" Value="true">
+                            <Setter TargetName="Shdw" Property="Margin" Value="0,0,5,5" />
+                            <Setter TargetName="Shdw" Property="Color" Value="#71000000" />
+                        </Trigger>
+                        <Trigger Property="HasItems" Value="false">
+                            <Setter TargetName="DropDownBorder" Property="MinHeight" Value="95" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsGrouping" Value="true">
+                            <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsEditable" Value="true">
+                <Setter Property="IsTabStop" Value="false" />
+                <Setter Property="Padding" Value="0,1" />
+                <Setter Property="Template" Value="{DynamicResource ComboBoxEditableTemplate}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style
+        x:Key="NoWrapComboBox"
+        BasedOn="{StaticResource PrimaryComboBox}"
+        TargetType="ComboBox">
+        <Setter Property="ItemTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <TextBlock Text="{Binding _name}" TextWrapping="NoWrap" />
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    
+    <conv:EnumTranslationConverter x:Key="EnumTranslationConverter" />
+    <DataTemplate x:Key="ListItemView">
+        <TextBlock
+            Text="{Binding Path=., Converter={StaticResource EnumTranslationConverter}}"
+            ToolTip="{Binding Path=Text, RelativeSource={RelativeSource Self}}" />
+    </DataTemplate>
+    <Style
+        x:Key="EnumTranslationComboBox"
+        BasedOn="{StaticResource PrimaryComboBox}"
+        TargetType="ComboBox">
+        <Setter Property="ItemTemplate" Value="{StaticResource ListItemView}" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/ControlStyles/CustomControlsStyles.xaml b/BeWo/Styles/ControlStyles/CustomControlsStyles.xaml
new file mode 100644
index 000000000..2ec4715c5
--- /dev/null
+++ b/BeWo/Styles/ControlStyles/CustomControlsStyles.xaml
@@ -0,0 +1,9 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:uc="clr-namespace:BeWo.View.Controls">
+    <Style x:Key="BaseCustomerSelectionControl" TargetType="{x:Type uc:CustomerSelectionControl}">
+        <Setter Property="Margin" Value="3" />
+        <Setter Property="Height" Value="32" />
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/ControlStyles/DateEditStyles.xaml b/BeWo/Styles/ControlStyles/DateEditStyles.xaml
new file mode 100644
index 000000000..be8854fb6
--- /dev/null
+++ b/BeWo/Styles/ControlStyles/DateEditStyles.xaml
@@ -0,0 +1,42 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
+    xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
+    xmlns:dxei="http://schemas.devexpress.com/winfx/2008/xaml/editors/internal"
+    xmlns:dxet="http://schemas.devexpress.com/winfx/2008/xaml/editors/themekeys">
+    <Style
+        x:Key="BaseDateEdit"
+        BasedOn="{StaticResource {x:Type dxe:DateEdit}}"
+        TargetType="{x:Type dxe:DateEdit}">
+        <Setter Property="Margin" Value="3" />
+        <Setter Property="Padding" Value="1" />
+        <Setter Property="Height" Value="23" />
+        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+        <Setter Property="BorderBrush" Value="{StaticResource TextBoxBorderBrush}" />
+        <Setter Property="BorderThickness" Value="1" />
+    </Style>
+    <Style
+        x:Key="PrimaryDateEdit"
+        BasedOn="{StaticResource BaseDateEdit}"
+        TargetType="{x:Type dxe:DateEdit}">
+        <Style.Resources>
+            <DataTemplate x:Key="{dxet:ButtonsThemeKey ResourceKey=ToggleButtonInfoTemplate, IsThemeIndependent=True}">
+                <dx:ToggleStateButton
+                    x:Name="PART_Item"
+                    Margin="2"
+                    dxei:SetIsCheckedToButtonInfoBehavior.IsEnabled="True"
+                    IsChecked="{Binding Path=IsChecked, Mode=TwoWay}"
+                    Style="{StaticResource ComboBoxTransparentButtonStyle}" />
+                <DataTemplate.Triggers>
+                    <DataTrigger Binding="{Binding Path=IsDefaultButton}" Value="True">
+                        <Setter TargetName="PART_Item" Property="IsChecked" Value="{Binding Path=(dxe:BaseEdit.OwnerEdit).IsPopupOpen, RelativeSource={RelativeSource Self}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                    </DataTrigger>
+                    <DataTrigger Binding="{Binding Path=IsDefaultButton}" Value="False">
+                        <Setter TargetName="PART_Item" Property="HandleToggle" Value="False" />
+                    </DataTrigger>
+                </DataTemplate.Triggers>
+            </DataTemplate>
+        </Style.Resources>
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/ControlStyles/LabelStyles.xaml b/BeWo/Styles/ControlStyles/LabelStyles.xaml
new file mode 100644
index 000000000..3b69cc776
--- /dev/null
+++ b/BeWo/Styles/ControlStyles/LabelStyles.xaml
@@ -0,0 +1,18 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Style x:Key="BaseLabel" TargetType="Label">
+        <Setter Property="IsEnabled" Value="True" />
+        <Setter Property="Margin" Value="3" />
+        <Setter Property="Padding" Value="3" />
+        <Setter Property="VerticalAlignment" Value="Top" />
+    </Style>
+
+    <Style x:Key="Header1" TargetType="Label">
+        <Setter Property="TextElement.FontSize" Value="16" />
+        <Setter Property="TextElement.Foreground" Value="{StaticResource TabItemHotTextBrush}" />
+        <Setter Property="TextElement.FontFamily" Value="Microsoft Sans Serif" />
+        <Setter Property="Padding" Value="3,0,3,0" />
+        <Setter Property="MinHeight" Value="20" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="Margin" Value="3,-6,3,6" />
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/ControlStyles/ListBoxStyles.xaml b/BeWo/Styles/ControlStyles/ListBoxStyles.xaml
new file mode 100644
index 000000000..db8eee48f
--- /dev/null
+++ b/BeWo/Styles/ControlStyles/ListBoxStyles.xaml
@@ -0,0 +1,27 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  ListBoxItems  -->
+    <Style x:Key="PhotoListBoxItem" TargetType="ListBoxItem">
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Style.Resources>
+            <SolidColorBrush
+                x:Key="{x:Static SystemColors.HighlightBrushKey}"
+                Opacity="0.4"
+                Color="AliceBlue" />
+            <SolidColorBrush
+                x:Key="{x:Static SystemColors.InactiveSelectionHighlightBrushKey}"
+                Opacity="0.4"
+                Color="AliceBlue" />
+        </Style.Resources>
+    </Style>
+
+    <!--  ListBox  -->
+    <Style x:Key="PhotoListBox" TargetType="{x:Type ListBox}">
+        <Setter Property="Foreground" Value="Black" />
+        <Setter Property="Margin" Value="5" />
+        <Setter Property="MinHeight" Value="100" />
+        <Setter Property="MaxHeight" Value="800" />
+        <Setter Property="IsSynchronizedWithCurrentItem" Value="True" />
+        <Setter Property="SelectionMode" Value="Single" />
+        <Setter Property="ItemContainerStyle" Value="{StaticResource PhotoListBoxItem}" />
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/ControlStyles/NullItemComboBoxStyles.xaml b/BeWo/Styles/ControlStyles/NullItemComboBoxStyles.xaml
new file mode 100644
index 000000000..4d3cbe084
--- /dev/null
+++ b/BeWo/Styles/ControlStyles/NullItemComboBoxStyles.xaml
@@ -0,0 +1,146 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:Microsoft_Windows_Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero"
+    xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls">
+
+    <!--  NullItemComboBox  -->
+    <Style x:Key="PrimaryNullItemComboBox" TargetType="uc:NullItemComboBox">
+        <Setter Property="Margin" Value="3" />
+        <Setter Property="Height" Value="23" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource ComboBoxFocusVisual}" />
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource TextBoxBorderBrush}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Padding" Value="1" />
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+        <Setter Property="ScrollViewer.CanContentScroll" Value="true" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="ItemTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <TextBlock Text="{Binding _name}" TextWrapping="NoWrap" />
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type uc:NullItemComboBox}">
+                    <Grid SnapsToDevicePixels="true">
+                        <Border
+                            x:Name="Bd"
+                            Padding="1"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                            <Grid Grid.IsSharedSizeScope="true">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="1" />
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" SharedSizeGroup="ComboBoxButton" />
+                                </Grid.ColumnDefinitions>
+                                <Border
+                                    x:Name="SelectedItemBorder"
+                                    Grid.ColumnSpan="2"
+                                    Margin="2,1,20,1">
+                                    <ContentPresenter
+                                        Margin="3,0"
+                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                        Content="{TemplateBinding SelectionBoxItem}"
+                                        ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
+                                        ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
+                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                </Border>
+                                <ToggleButton
+                                    Grid.Column="0"
+                                    Grid.ColumnSpan="3"
+                                    IsChecked="{Binding Path=IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                    Style="{DynamicResource ComboBoxTransparentButtonStyle}" />
+                                <Label
+                                    x:Name="label_nullText"
+                                    Grid.Column="0"
+                                    Grid.ColumnSpan="2"
+                                    Margin="5,3,20,3"
+                                    Padding="0"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Center"
+                                    Content="{TemplateBinding NullText}"
+                                    IsHitTestVisible="False"
+                                    Visibility="Hidden" />
+                            </Grid>
+                        </Border>
+                        <Popup
+                            x:Name="PART_Popup"
+                            AllowsTransparency="true"
+                            Focusable="false"
+                            IsOpen="{Binding Path=IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                            Placement="Bottom"
+                            PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}">
+                            <Microsoft_Windows_Themes:SystemDropShadowChrome
+                                x:Name="Shdw"
+                                MinWidth="{TemplateBinding ActualWidth}"
+                                MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                                Color="Transparent">
+                                <Border
+                                    x:Name="DropDownBorder"
+                                    Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
+                                    BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}"
+                                    BorderThickness="1">
+                                    <ScrollViewer>
+                                        <ItemsPresenter KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                    </ScrollViewer>
+                                </Border>
+                            </Microsoft_Windows_Themes:SystemDropShadowChrome>
+                        </Popup>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsSelectionBoxHighlighted" Value="true" />
+                                <Condition Property="IsDropDownOpen" Value="false" />
+                            </MultiTrigger.Conditions>
+                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
+                        </MultiTrigger>
+                        <Trigger Property="IsSelectionBoxHighlighted" Value="true">
+                            <Setter TargetName="SelectedItemBorder" Property="Background" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
+                        </Trigger>
+                        <Trigger SourceName="PART_Popup" Property="HasDropShadow" Value="true">
+                            <Setter TargetName="Shdw" Property="Margin" Value="0,0,5,5" />
+                            <Setter TargetName="Shdw" Property="Color" Value="#71000000" />
+                        </Trigger>
+                        <Trigger Property="HasItems" Value="false">
+                            <Setter TargetName="DropDownBorder" Property="MinHeight" Value="95" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsGrouping" Value="true">
+                            <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+                        </Trigger>
+                        <Trigger Property="SelectedItem" Value="{x:Null}">
+                            <Setter TargetName="label_nullText" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsEditable" Value="true">
+                <Setter Property="IsTabStop" Value="false" />
+                <Setter Property="Padding" Value="0,1" />
+                <Setter Property="Template" Value="{DynamicResource ComboBoxEditableTemplate}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style
+        x:Key="EnumTranslationNullItemComboBox"
+        BasedOn="{StaticResource PrimaryNullItemComboBox}"
+        TargetType="{x:Type uc:NullItemComboBox}">
+        <Setter Property="ItemTemplate" Value="{DynamicResource ListItemView}" />
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/ControlStyles/RadioButtonStyles.xaml b/BeWo/Styles/ControlStyles/RadioButtonStyles.xaml
new file mode 100644
index 000000000..0227101bb
--- /dev/null
+++ b/BeWo/Styles/ControlStyles/RadioButtonStyles.xaml
@@ -0,0 +1,7 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--Base-->
+    <Style x:Key="BaseRadioButton" TargetType="RadioButton">
+        <Setter Property="Margin" Value="3" />
+        <Setter Property="VerticalAlignment" Value="Top" />
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/ControlStyles/TextBoxStyles.xaml b/BeWo/Styles/ControlStyles/TextBoxStyles.xaml
new file mode 100644
index 000000000..03f97a58e
--- /dev/null
+++ b/BeWo/Styles/ControlStyles/TextBoxStyles.xaml
@@ -0,0 +1,67 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Style x:Key="TextBoxBase" TargetType="{x:Type TextBox}">
+        <Setter Property="Margin" Value="3" />
+        <Setter Property="Padding" Value="3" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+    </Style>
+
+    <Style
+        x:Key="TextBoxNoticeBase"
+        BasedOn="{StaticResource TextBoxBase}"
+        TargetType="{x:Type TextBox}">
+        <Setter Property="MinHeight" Value="23" />
+        <Setter Property="VerticalContentAlignment" Value="Stretch" />
+        <Setter Property="VerticalAlignment" Value="Stretch" />
+        <Setter Property="AcceptsReturn" Value="True" />
+        <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
+    </Style>
+    <Style
+        x:Key="TextBoxNotice"
+        BasedOn="{StaticResource TextBoxNoticeBase}"
+        TargetType="{x:Type TextBox}">
+        <Setter Property="MaxHeight" Value="150" />
+    </Style>
+    <Style
+        x:Key="TextBoxNoticeLarge"
+        BasedOn="{StaticResource TextBoxNoticeBase}"
+        TargetType="{x:Type TextBox}">
+        <Setter Property="MaxHeight" Value="300" />
+    </Style>
+    <Style
+        x:Key="TextBoxNoticeExtended"
+        BasedOn="{StaticResource TextBoxNoticeBase}"
+        TargetType="{x:Type TextBox}">
+        <Setter Property="MinHeight" Value="150" />
+        <Setter Property="Height" Value="150" />
+        <Setter Property="MaxHeight" Value="150" />
+    </Style>
+    <Style
+        x:Key="TextBoxNoticeSmallExtended"
+        BasedOn="{StaticResource TextBoxNoticeBase}"
+        TargetType="{x:Type TextBox}">
+        <Setter Property="MinHeight" Value="75" />
+        <Setter Property="MaxHeight" Value="75" />
+    </Style>
+
+    <Style x:Key="ComboBoxEditableTextBox" TargetType="{x:Type TextBox}">
+        <Setter Property="OverridesDefaultStyle" Value="true" />
+        <Setter Property="AllowDrop" Value="true" />
+        <Setter Property="MinWidth" Value="0" />
+        <Setter Property="MinHeight" Value="0" />
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type TextBox}">
+                    <ScrollViewer
+                        x:Name="PART_ContentHost"
+                        Background="Transparent"
+                        Focusable="false"
+                        HorizontalScrollBarVisibility="Hidden"
+                        VerticalScrollBarVisibility="Hidden" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/ControlStyles/TextEditStyles.xaml b/BeWo/Styles/ControlStyles/TextEditStyles.xaml
new file mode 100644
index 000000000..149f315ae
--- /dev/null
+++ b/BeWo/Styles/ControlStyles/TextEditStyles.xaml
@@ -0,0 +1,34 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
+                    xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors">
+    <Style x:Key="BaseTextEdit" TargetType="{x:Type dxe:TextEdit}">
+        <Setter Property="Margin" Value="3" />
+        <Setter Property="Height" Value="23" />
+    </Style>
+    <Style
+        x:Key="TextEditYear"
+        BasedOn="{StaticResource BaseTextEdit}"
+        TargetType="{x:Type dxe:TextEdit}">
+        <Setter Property="Mask" Value="0000" />
+        <Setter Property="MaskType" Value="Numeric" />
+        <Setter Property="MaskUseAsDisplayFormat" Value="True" />
+    </Style>
+    <Style
+        x:Key="TextEditQm"
+        BasedOn="{StaticResource BaseTextEdit}"
+        TargetType="{x:Type dxe:TextEdit}">
+        <Setter Property="Mask" Value="######0.00 qm" />
+        <Setter Property="MaskType" Value="Numeric" />
+        <Setter Property="MaskUseAsDisplayFormat" Value="True" />
+    </Style>
+    <Style
+        x:Key="TextEditCurrency"
+        BasedOn="{StaticResource BaseTextEdit}"
+        TargetType="{x:Type dxe:TextEdit}">
+        <Setter Property="Mask" Value="######0.## $" />
+        <Setter Property="MaskType" Value="Numeric" />
+        <Setter Property="MaskUseAsDisplayFormat" Value="True" />
+        <Setter Property="dxe:NumericMaskOptions.AlwaysShowDecimalSeparator" Value="False" />
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/ControlStyles/ToggleButtonStyles.xaml b/BeWo/Styles/ControlStyles/ToggleButtonStyles.xaml
new file mode 100644
index 000000000..1829f1fff
--- /dev/null
+++ b/BeWo/Styles/ControlStyles/ToggleButtonStyles.xaml
@@ -0,0 +1,149 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Style x:Key="ComboBoxTransparentButtonStyle" TargetType="{x:Type ToggleButton}">
+        <Setter Property="MinWidth" Value="0" />
+        <Setter Property="MinHeight" Value="0" />
+        <Setter Property="Width" Value="Auto" />
+        <Setter Property="Height" Value="Auto" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Focusable" Value="false" />
+        <Setter Property="ClickMode" Value="Press" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ToggleButton}">
+                    <ControlTemplate.Resources>
+                        <Storyboard x:Key="Timeline1">
+                            <DoubleAnimationUsingKeyFrames
+                                BeginTime="00:00:00"
+                                Storyboard.TargetName="glow"
+                                Storyboard.TargetProperty="(UIElement.Opacity)">
+                                <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="1" />
+                            </DoubleAnimationUsingKeyFrames>
+                            <DoubleAnimation
+                                Storyboard.TargetName="border"
+                                Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleX)"
+                                To="1.3"
+                                Duration="0:0:0.2" />
+                            <DoubleAnimation
+                                Storyboard.TargetName="border"
+                                Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)"
+                                To="1.3"
+                                Duration="0:0:0.2" />
+                        </Storyboard>
+                        <Storyboard x:Key="Timeline2">
+                            <DoubleAnimationUsingKeyFrames
+                                BeginTime="00:00:00"
+                                Storyboard.TargetName="glow"
+                                Storyboard.TargetProperty="(UIElement.Opacity)">
+                                <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="0" />
+                            </DoubleAnimationUsingKeyFrames>
+                            <DoubleAnimation
+                                Storyboard.TargetName="border"
+                                Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleX)"
+                                Duration="0:0:0.2" />
+                            <DoubleAnimation
+                                Storyboard.TargetName="border"
+                                Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)"
+                                Duration="0:0:0.2" />
+                        </Storyboard>
+                    </ControlTemplate.Resources>
+                    <Grid SnapsToDevicePixels="true">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <Border
+                            x:Name="border"
+                            Grid.Column="1"
+                            Width="{DynamicResource {x:Static SystemParameters.ScrollWidthKey}}"
+                            Margin="0,0,0,0"
+                            Padding="0,0,0,0"
+                            BorderBrush="#FF000000"
+                            BorderThickness="1,1,1,1"
+                            CornerRadius="4,4,4,4">
+                            <Border.Background>
+                                <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
+                                    <GradientStop Offset="0" Color="#FF000000" />
+                                    <GradientStop Offset="1" Color="#FF262626" />
+                                </LinearGradientBrush>
+                            </Border.Background>
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="0.5*" />
+                                    <RowDefinition Height="0.5*" />
+                                </Grid.RowDefinitions>
+                                <Border
+                                    x:Name="glow"
+                                    Grid.RowSpan="2"
+                                    Width="Auto"
+                                    HorizontalAlignment="Stretch"
+                                    CornerRadius="3,3,3,3"
+                                    Opacity="0">
+                                    <Border.Background>
+                                        <RadialGradientBrush>
+                                            <RadialGradientBrush.RelativeTransform>
+                                                <TransformGroup>
+                                                    <ScaleTransform ScaleX="1.702" ScaleY="2.243" />
+                                                    <SkewTransform AngleX="0" AngleY="0" />
+                                                    <RotateTransform Angle="0" />
+                                                    <TranslateTransform X="-0.368" Y="-0.152" />
+                                                </TransformGroup>
+                                            </RadialGradientBrush.RelativeTransform>
+                                            <GradientStop Offset="0" Color="#B28DBDFF" />
+                                            <GradientStop Offset="1" Color="#008DBDFF" />
+                                        </RadialGradientBrush>
+                                    </Border.Background>
+                                </Border>
+                                <Border
+                                    x:Name="shine"
+                                    Grid.Row="0"
+                                    Width="Auto"
+                                    Margin="0,0,0,0"
+                                    HorizontalAlignment="Stretch"
+                                    CornerRadius="3,3,0,0">
+                                    <Border.Background>
+                                        <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
+                                            <GradientStop Offset="0" Color="#99FFFFFF" />
+                                            <GradientStop Offset="1" Color="#33FFFFFF" />
+                                        </LinearGradientBrush>
+                                    </Border.Background>
+                                </Border>
+                                <TextBlock
+                                    Grid.Row="0"
+                                    Grid.RowSpan="2"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    FontFamily="Webdings"
+                                    FontSize="9"
+                                    Text="6"
+                                    TextWrapping="Wrap">
+                                    <TextBlock.Foreground>
+                                        <SolidColorBrush Color="{DynamicResource {x:Static SystemColors.ControlColorKey}}" />
+                                    </TextBlock.Foreground>
+                                </TextBlock>
+                            </Grid>
+                        </Border>
+
+                        <!-- <ToggleButton x:Name="Chrome" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" Style="{StaticResource ComboBoxReadonlyToggleButton}" Grid.ColumnSpan="2" IsChecked="{Binding Path=IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"/>-->
+
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter TargetName="shine" Property="Opacity" Value="0.4" />
+                            <Setter TargetName="border" Property="Background" Value="#99FFA500" />
+                            <Setter TargetName="glow" Property="Visibility" Value="Hidden" />
+                            <Setter TargetName="border" Property="BorderBrush" Value="#FF0C0C0C" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard Storyboard="{StaticResource Timeline1}" />
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <BeginStoryboard x:Name="Timeline2_BeginStoryboard" Storyboard="{StaticResource Timeline2}" />
+                            </Trigger.ExitActions>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/DataTemplates/ControlTemplates.xaml b/BeWo/Styles/DataTemplates/ControlTemplates.xaml
new file mode 100644
index 000000000..c80f0ce16
--- /dev/null
+++ b/BeWo/Styles/DataTemplates/ControlTemplates.xaml
@@ -0,0 +1,92 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:Microsoft_Windows_Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero">
+    <Style x:Key="ComboBoxFocusVisual">
+        <Setter Property="Control.Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Rectangle
+                        Margin="4,4,21,4"
+                        SnapsToDevicePixels="true"
+                        Stroke="Black"
+                        StrokeDashArray="1 2"
+                        StrokeThickness="1" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!--  Control Templates  -->
+    <ControlTemplate x:Key="ComboBoxEditableTemplate" TargetType="{x:Type ComboBox}">
+        <Grid SnapsToDevicePixels="true">
+            <Border
+                x:Name="Bd"
+                Padding="1"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}">
+                <Grid Grid.IsSharedSizeScope="true">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" SharedSizeGroup="ComboBoxButton" />
+                    </Grid.ColumnDefinitions>
+                    <TextBox
+                        x:Name="PART_EditableTextBox"
+                        Grid.Column="1"
+                        Margin="{TemplateBinding Padding}"
+                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                        IsReadOnly="{Binding Path=IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
+                        Style="{DynamicResource ComboBoxEditableTextBox}" />
+                    <ToggleButton
+                        Grid.Column="0"
+                        Grid.ColumnSpan="3"
+                        Background="{x:Null}"
+                        IsChecked="{Binding Path=IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                        Style="{DynamicResource ComboBoxTransparentButtonStyle}" />
+                </Grid>
+            </Border>
+            <Popup
+                x:Name="PART_Popup"
+                AllowsTransparency="true"
+                Focusable="false"
+                IsOpen="{Binding Path=IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                Placement="Bottom"
+                PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}">
+                <Microsoft_Windows_Themes:SystemDropShadowChrome
+                    x:Name="Shdw"
+                    MinWidth="{TemplateBinding ActualWidth}"
+                    MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                    Color="Transparent">
+                    <Border
+                        x:Name="DropDownBorder"
+                        Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
+                        BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}"
+                        BorderThickness="1">
+                        <ScrollViewer>
+                            <ItemsPresenter KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        </ScrollViewer>
+                    </Border>
+                </Microsoft_Windows_Themes:SystemDropShadowChrome>
+            </Popup>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="HasItems" Value="false">
+                <Setter TargetName="DropDownBorder" Property="MinHeight" Value="95" />
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="false">
+                <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                <Setter TargetName="Bd" Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
+            </Trigger>
+            <Trigger Property="IsGrouping" Value="true">
+                <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+            </Trigger>
+            <Trigger SourceName="PART_Popup" Property="HasDropShadow" Value="true">
+                <Setter TargetName="Shdw" Property="Margin" Value="0,0,5,5" />
+                <Setter TargetName="Shdw" Property="Color" Value="#71000000" />
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/DataTemplates/DataTemplates.xaml b/BeWo/Styles/DataTemplates/DataTemplates.xaml
new file mode 100644
index 000000000..2e8f8179a
--- /dev/null
+++ b/BeWo/Styles/DataTemplates/DataTemplates.xaml
@@ -0,0 +1,6 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:conv="clr-namespace:BeWo.Converter">
+    
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/ModernOrangeBlack.xaml b/BeWo/Styles/ModernOrangeBlack.xaml
new file mode 100644
index 000000000..945963d94
--- /dev/null
+++ b/BeWo/Styles/ModernOrangeBlack.xaml
@@ -0,0 +1,43 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
+    xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
+    xmlns:uc="clr-namespace:BeWo.View.Controls">
+    <ResourceDictionary.MergedDictionaries>
+
+        <ResourceDictionary Source="Colors\Colors.xaml" />
+
+        <ResourceDictionary Source="DataTemplates\ControlTemplates.xaml" />
+        <ResourceDictionary Source="DataTemplates\DataTemplates.xaml" />
+
+        <ResourceDictionary Source="ControlStyles\ButtonStyles.xaml" />
+        <ResourceDictionary Source="ControlStyles\CheckBoxStyles.xaml" />
+        <ResourceDictionary Source="ControlStyles\ComboBoxStyles.xaml" />
+        <ResourceDictionary Source="ControlStyles\CustomControlsStyles.xaml" />
+        <ResourceDictionary Source="ControlStyles\DateEditStyles.xaml" />
+        <ResourceDictionary Source="ControlStyles\LabelStyles.xaml" />
+        <ResourceDictionary Source="ControlStyles\ListBoxStyles.xaml" />
+        <ResourceDictionary Source="ControlStyles\RadioButtonStyles.xaml" />
+        <ResourceDictionary Source="ControlStyles\TextBoxStyles.xaml" />
+        <ResourceDictionary Source="ControlStyles\TextEditStyles.xaml" />
+        <ResourceDictionary Source="ControlStyles\ToggleButtonStyles.xaml" />
+
+        <!--  Benötigt TextBoxStyles + ToggleButtonStyles  -->
+        <ResourceDictionary Source="ControlStyles\NullItemComboBoxStyles.xaml" />
+
+    </ResourceDictionary.MergedDictionaries>
+
+    <!--  Default Styles  -->
+    <Style BasedOn="{StaticResource HideDisabledButton}" TargetType="Button" />
+    <Style BasedOn="{StaticResource CheckBoxBase}" TargetType="CheckBox" />
+    <Style BasedOn="{StaticResource NoWrapComboBox}" TargetType="ComboBox" />
+    <Style BasedOn="{StaticResource BaseCustomerSelectionControl}" TargetType="uc:CustomerSelectionControl" />
+    <Style BasedOn="{StaticResource PrimaryDateEdit}" TargetType="dxe:DateEdit" />
+    <Style BasedOn="{StaticResource BaseLabel}" TargetType="Label" />
+    <Style BasedOn="{StaticResource PrimaryNullItemComboBox}" TargetType="controls:NullItemComboBox" />
+    <Style BasedOn="{StaticResource BaseRadioButton}" TargetType="RadioButton" />
+    <Style BasedOn="{StaticResource TextBoxBase}" TargetType="TextBox" />
+    <Style BasedOn="{StaticResource BaseTextEdit}" TargetType="dxe:TextEdit" />
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/OrangeBlack.xaml b/BeWo/Styles/OrangeBlack.xaml
index e7eff565a..8830a0f09 100644
--- a/BeWo/Styles/OrangeBlack.xaml
+++ b/BeWo/Styles/OrangeBlack.xaml
@@ -1367,13 +1367,13 @@
                         HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                         VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                         IsReadOnly="{Binding Path=IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
-                        Style="{StaticResource ComboBoxEditableTextBox}" />
+                        Style="{DynamicResource ComboBoxEditableTextBox}" />
                     <ToggleButton
                         Grid.Column="0"
                         Grid.ColumnSpan="3"
                         Background="{x:Null}"
                         IsChecked="{Binding Path=IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                        Style="{StaticResource ComboBoxTransparentButtonStyle}" />
+                        Style="{DynamicResource ComboBoxTransparentButtonStyle}" />
                 </Grid>
             </Border>
             <Popup
diff --git a/BeWo/Styles/PrototypeStyles.xaml b/BeWo/Styles/PrototypeStyles.xaml
index 23c6122e9..4d80e9a27 100644
--- a/BeWo/Styles/PrototypeStyles.xaml
+++ b/BeWo/Styles/PrototypeStyles.xaml
@@ -9,321 +9,4 @@
     xmlns:dxet="http://schemas.devexpress.com/winfx/2008/xaml/editors/themekeys"
     xmlns:dxmvvm="http://schemas.devexpress.com/winfx/2008/xaml/mvvm"
     xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls">
-
-    <Style x:Key="ButtonGrayDisabledStyle" TargetType="{x:Type Button}">
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="Height" Value="25" />
-        <Setter Property="HorizontalAlignment" Value="Center" />
-        <Setter Property="Foreground" Value="#FFFFFFFF" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Button}">
-                    <ControlTemplate.Resources>
-                        <Storyboard x:Key="Timeline1">
-                            <DoubleAnimationUsingKeyFrames
-                                BeginTime="00:00:00"
-                                Storyboard.TargetName="glow"
-                                Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="1" />
-                            </DoubleAnimationUsingKeyFrames>
-                        </Storyboard>
-                        <Storyboard x:Key="Timeline2">
-                            <DoubleAnimationUsingKeyFrames
-                                BeginTime="00:00:00"
-                                Storyboard.TargetName="glow"
-                                Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="0" />
-                            </DoubleAnimationUsingKeyFrames>
-                        </Storyboard>
-                    </ControlTemplate.Resources>
-                    <Border
-                        x:Name="border"
-                        Padding="0,0,0,0"
-                        BorderBrush="#FF000000"
-                        BorderThickness="1,1,1,1"
-                        CornerRadius="4,4,4,4">
-                        <Border.Background>
-                            <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
-                                <GradientStop Offset="0" Color="#FF000000" />
-                                <GradientStop Offset="1" Color="#FF262626" />
-                            </LinearGradientBrush>
-                        </Border.Background>
-                        <Grid>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="0.5*" />
-                                <RowDefinition Height="0.5*" />
-                            </Grid.RowDefinitions>
-                            <Border
-                                x:Name="glow"
-                                Grid.RowSpan="2"
-                                Width="Auto"
-                                HorizontalAlignment="Stretch"
-                                CornerRadius="4,4,4,4"
-                                Opacity="0">
-                                <Border.Background>
-                                    <RadialGradientBrush>
-                                        <RadialGradientBrush.RelativeTransform>
-                                            <TransformGroup>
-                                                <ScaleTransform ScaleX="1.702" ScaleY="2.243" />
-                                                <SkewTransform AngleX="0" AngleY="0" />
-                                                <RotateTransform Angle="0" />
-                                                <TranslateTransform X="-0.368" Y="-0.152" />
-                                            </TransformGroup>
-                                        </RadialGradientBrush.RelativeTransform>
-                                        <GradientStop Offset="0" Color="#B28DBDFF" />
-                                        <GradientStop Offset="1" Color="#008DBDFF" />
-                                    </RadialGradientBrush>
-                                </Border.Background>
-                            </Border>
-                            <Border
-                                x:Name="shine"
-                                Grid.Row="0"
-                                Width="Auto"
-                                Margin="0,0,0,0"
-                                HorizontalAlignment="Stretch"
-                                CornerRadius="4,4,0,0">
-                                <Border.Background>
-                                    <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
-                                        <GradientStop Offset="0" Color="#99FFFFFF" />
-                                        <GradientStop Offset="1" Color="#33FFFFFF" />
-                                    </LinearGradientBrush>
-                                </Border.Background>
-                            </Border>
-                            <Border
-                                Grid.Row="0"
-                                Grid.RowSpan="2"
-                                Margin="0,0,0,0">
-                                <ContentPresenter
-                                    Width="Auto"
-                                    Margin="3,0,3,0"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center" />
-                            </Border>
-                        </Grid>
-                    </Border>
-
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsPressed" Value="True">
-                            <Setter TargetName="shine" Property="Opacity" Value="0.4" />
-                            <Setter TargetName="border" Property="Background" Value="#998DBDFF" />
-                            <Setter TargetName="glow" Property="Visibility" Value="Hidden" />
-                            <Setter TargetName="border" Property="BorderBrush" Value="#FF0C0C0C" />
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Trigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource Timeline1}" />
-                            </Trigger.EnterActions>
-                            <Trigger.ExitActions>
-                                <BeginStoryboard x:Name="Timeline2_BeginStoryboard" Storyboard="{StaticResource Timeline2}" />
-                            </Trigger.ExitActions>
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="border" Property="Background" Value="#FF808080" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="FontFamily" Value="Microsoft Sans Serif" />
-        <Setter Property="FontSize" Value="12" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="Margin" Value="3" />
-    </Style>
-
-    <Style x:Key="TitleLabel" TargetType="Label">
-        <Setter Property="TextElement.FontSize" Value="16" />
-        <Setter Property="TextElement.Foreground" Value="{StaticResource TabItemHotTextBrush}" />
-        <Setter Property="TextElement.FontFamily" Value="Microsoft Sans Serif" />
-        <Setter Property="Padding" Value="3,0,3,0" />
-        <Setter Property="MinHeight" Value="20" />
-        <Setter Property="HorizontalAlignment" Value="Center" />
-        <Setter Property="Margin" Value="3,-6,3,6" />
-    </Style>
-    <Style BasedOn="{StaticResource {x:Type uc:NullItemComboBox}}" TargetType="uc:NullItemComboBox">
-        <Setter Property="Margin" Value="3" />
-        <Setter Property="ItemTemplate">
-            <Setter.Value>
-                <DataTemplate>
-                    <TextBlock Text="{Binding _name}" TextWrapping="NoWrap" />
-                </DataTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-    <Style BasedOn="{StaticResource {x:Type ComboBox}}" TargetType="ComboBox">
-        <Setter Property="Margin" Value="3" />
-        <Setter Property="Height" Value="23" />
-        <Setter Property="ItemTemplate">
-            <Setter.Value>
-                <DataTemplate>
-                    <TextBlock Text="{Binding _name}" TextWrapping="NoWrap" />
-                </DataTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="{x:Type CheckBox}">
-        <Setter Property="Margin" Value="5" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-    </Style>
-
-    <!--<Style TargetType="dxe:DateEdit" BasedOn="{StaticResource {x:Type dxe:DateEdit}}" x:Shared="False">
-            <Setter Property="Margin" Value="3"/>
-            <Setter Property="Height" Value="23"/>
-            <Setter Property="AllowDefaultButton" Value="False"/>
-            <Setter Property="Buttons">
-                <Setter.Value>
-                    <dxe:ButtonInfoCollection >
-                        <dxe:ButtonInfo IsDefaultButton="True" x:Shared="False">
-                            <dxe:ButtonInfo.Template>
-                                <DataTemplate>
-                                    <ToggleButton x:Name="PART_Item" Style="{StaticResource ComboBoxTransparentButtonStyle}"/>
-                                </DataTemplate>
-                            </dxe:ButtonInfo.Template>
-                        </dxe:ButtonInfo>
-                    </dxe:ButtonInfoCollection>
-                </Setter.Value>
-            </Setter>
-        </Style>-->
-    <Style BasedOn="{StaticResource {x:Type dxe:DateEdit}}" TargetType="{x:Type dxe:DateEdit}">
-        <Setter Property="Margin" Value="3" />
-        <Setter Property="Padding" Value="1" />
-        <Setter Property="Height" Value="23" />
-        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-        <Setter Property="BorderBrush" Value="{StaticResource TextBoxBorderBrush}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Style.Resources>
-            <DataTemplate x:Key="{dxet:ButtonsThemeKey ResourceKey=ToggleButtonInfoTemplate, IsThemeIndependent=True}">
-                <dx:ToggleStateButton
-                    x:Name="PART_Item"
-                    Margin="2"
-                    dxei:SetIsCheckedToButtonInfoBehavior.IsEnabled="True"
-                    IsChecked="{Binding Path=IsChecked, Mode=TwoWay}"
-                    Style="{StaticResource ComboBoxTransparentButtonStyle}" />
-                <DataTemplate.Triggers>
-                    <DataTrigger Binding="{Binding Path=IsDefaultButton}" Value="True">
-                        <Setter TargetName="PART_Item" Property="IsChecked" Value="{Binding Path=(dxe:BaseEdit.OwnerEdit).IsPopupOpen, RelativeSource={RelativeSource Self}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-                    </DataTrigger>
-                    <DataTrigger Binding="{Binding Path=IsDefaultButton}" Value="False">
-                        <Setter TargetName="PART_Item" Property="HandleToggle" Value="False" />
-                    </DataTrigger>
-                </DataTemplate.Triggers>
-            </DataTemplate>
-        </Style.Resources>
-    </Style>
-    <Style BasedOn="{StaticResource {x:Type dxe:TextEdit}}" TargetType="{x:Type dxe:TextEdit}">
-        <Setter Property="Margin" Value="3" />
-        <Setter Property="Height" Value="23" />
-    </Style>
-    <Style BasedOn="{StaticResource {x:Type Button}}" TargetType="{x:Type Button}">
-        <Setter Property="Margin" Value="3" />
-        <Setter Property="Visibility" Value="Visible" />
-        <Style.Triggers>
-            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsEnabled}" Value="False">
-                <Setter Property="Visibility" Value="Collapsed" />
-            </DataTrigger>
-        </Style.Triggers>
-    </Style>
-    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="{x:Type Label}">
-        <Setter Property="IsEnabled" Value="True" />
-        <Setter Property="Margin" Value="3" />
-        <Setter Property="Padding" Value="3" />
-        <Setter Property="VerticalAlignment" Value="Top" />
-    </Style>
-    <Style BasedOn="{StaticResource {x:Type TextBox}}" TargetType="{x:Type TextBox}">
-        <Setter Property="Margin" Value="3" />
-        <Setter Property="Padding" Value="3" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-    </Style>
-    <Style TargetType="RadioButton">
-        <Setter Property="Margin" Value="3" />
-        <Setter Property="VerticalAlignment" Value="Top" />
-    </Style>
-
-    <DataTemplate x:Key="ListItemView">
-        <TextBlock
-            Text="{Binding Path=., Converter={StaticResource EnumTranslationConverter}}"
-            TextWrapping="NoWrap"
-            ToolTip="{Binding Path=Text, RelativeSource={RelativeSource Self}}" />
-    </DataTemplate>
-    <Style
-        x:Key="EnumTranslationNullItemComboBox"
-        BasedOn="{StaticResource {x:Type uc:NullItemComboBox}}"
-        TargetType="{x:Type uc:NullItemComboBox}">
-        <Setter Property="ItemTemplate" Value="{StaticResource ListItemView}" />
-    </Style>
-    <Style
-        x:Key="EnumTranslationComboBox"
-        BasedOn="{StaticResource {x:Type ComboBox}}"
-        TargetType="{x:Type ComboBox}">
-        <Setter Property="ItemTemplate" Value="{StaticResource ListItemView}" />
-    </Style>
-
-    <Style
-        x:Key="TextEditYearStyle"
-        BasedOn="{StaticResource {x:Type dxe:TextEdit}}"
-        TargetType="{x:Type dxe:TextEdit}">
-        <Setter Property="Mask" Value="0000" />
-        <Setter Property="MaskType" Value="Numeric" />
-        <Setter Property="MaskUseAsDisplayFormat" Value="True" />
-    </Style>
-    <Style
-        x:Key="TextEditQmStyle"
-        BasedOn="{StaticResource {x:Type dxe:TextEdit}}"
-        TargetType="{x:Type dxe:TextEdit}">
-        <Setter Property="Mask" Value="######0.00 qm" />
-        <Setter Property="MaskType" Value="Numeric" />
-        <Setter Property="MaskUseAsDisplayFormat" Value="True" />
-    </Style>
-    <Style
-        x:Key="TextEditCurrencyStyle"
-        BasedOn="{StaticResource {x:Type dxe:TextEdit}}"
-        TargetType="{x:Type dxe:TextEdit}">
-        <Setter Property="Mask" Value="######0.## $" />
-        <Setter Property="MaskType" Value="Numeric" />
-        <Setter Property="MaskUseAsDisplayFormat" Value="True" />
-        <Setter Property="dxe:NumericMaskOptions.AlwaysShowDecimalSeparator" Value="False" />
-    </Style>
-    <Style
-        x:Key="TextBoxNoticeBaseStyle"
-        BasedOn="{StaticResource {x:Type TextBox}}"
-        TargetType="{x:Type TextBox}">
-        <Setter Property="MinHeight" Value="23" />
-        <Setter Property="VerticalContentAlignment" Value="Stretch" />
-        <Setter Property="VerticalAlignment" Value="Stretch" />
-        <Setter Property="AcceptsReturn" Value="True" />
-        <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
-    </Style>
-    <Style
-        x:Key="TextBoxNoticeStyle"
-        BasedOn="{StaticResource TextBoxNoticeBaseStyle}"
-        TargetType="{x:Type TextBox}">
-        <Setter Property="MaxHeight" Value="150" />
-    </Style>
-    <Style
-        x:Key="TextBoxNoticeLargeStyle"
-        BasedOn="{StaticResource TextBoxNoticeBaseStyle}"
-        TargetType="{x:Type TextBox}">
-        <Setter Property="MaxHeight" Value="300" />
-    </Style>
-    <Style
-        x:Key="TextBoxNoticeExtendedStyle"
-        BasedOn="{StaticResource TextBoxNoticeBaseStyle}"
-        TargetType="{x:Type TextBox}">
-        <Setter Property="MinHeight" Value="150" />
-        <Setter Property="Height" Value="150" />
-        <Setter Property="MaxHeight" Value="150" />
-    </Style>
-    <Style
-        x:Key="TextBoxNoticeSmallExtendedStyle"
-        BasedOn="{StaticResource TextBoxNoticeBaseStyle}"
-        TargetType="{x:Type TextBox}">
-        <Setter Property="MinHeight" Value="75" />
-        <Setter Property="MaxHeight" Value="75" />
-    </Style>
-
-    <Style TargetType="{x:Type control:CustomerSelectionControl}">
-        <Setter Property="Margin" Value="3" />
-        <Setter Property="Height" Value="32" />
-    </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml b/BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml
index 968f03f22..61488d697 100644
--- a/BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml
+++ b/BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml
@@ -20,7 +20,7 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="..\..\Styles\PrototypeStyles.xaml" />
+                <ResourceDictionary Source="..\..\Styles\ModernOrangeBlack.xaml" />
             </ResourceDictionary.MergedDictionaries>
             <Style BasedOn="{StaticResource ObjectEditGroupBox}" TargetType="{x:Type GroupBox}">
                 <Setter Property="Margin" Value="15" />
diff --git a/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml b/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml
index c1d1b434d..64be906c8 100644
--- a/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml
+++ b/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml
@@ -15,15 +15,15 @@
     xmlns:viewmodel="clr-namespace:BeWo.ViewModel"
     xmlns:wohnhilfe="clr-namespace:BeWo.View.Controls.Wohnhilfe"
     x:Name="root_usercontrol"
+    HorizontalAlignment="Stretch"
     d:DataContext="{d:DesignInstance d:Type=viewmodel:CustomerWohnhilfeVM,
                                      IsDesignTimeCreatable=True}"
     SizeChanged="UserControl_SizeChanged"
-    HorizontalAlignment="Stretch"
     mc:Ignorable="d cs">
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="..\..\..\Styles\PrototypeStyles.xaml" />
+                <ResourceDictionary Source="..\..\..\Styles\ModernOrangeBlack.xaml" />
             </ResourceDictionary.MergedDictionaries>
             <Style BasedOn="{StaticResource ObjectEditGroupBox}" TargetType="{x:Type GroupBox}">
                 <Setter Property="Margin" Value="15" />
@@ -35,7 +35,6 @@
             </Style>
             <Style BasedOn="{StaticResource EnumTranslationNullItemComboBox}" TargetType="{x:Type uc:NullItemComboBox}" />
             <Style BasedOn="{StaticResource EnumTranslationComboBox}" TargetType="{x:Type ComboBox}" />
-
         </ResourceDictionary>
     </UserControl.Resources>
     <ScrollViewer
@@ -67,7 +66,10 @@
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="auto" />
-                        <ColumnDefinition Width="*" MinWidth="100" MaxWidth="400" />
+                        <ColumnDefinition
+                            Width="*"
+                            MinWidth="100"
+                            MaxWidth="400" />
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="auto" />
@@ -176,10 +178,16 @@
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="auto" />
-                        <ColumnDefinition Width="*" MinWidth="100" MaxWidth="400" />
+                        <ColumnDefinition
+                            Width="*"
+                            MinWidth="100"
+                            MaxWidth="400" />
                         <ColumnDefinition Width="auto" />
                         <ColumnDefinition Width="auto" />
-                        <ColumnDefinition Width="*" MinWidth="100" MaxWidth="400"/>
+                        <ColumnDefinition
+                            Width="*"
+                            MinWidth="100"
+                            MaxWidth="400" />
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="auto" />
@@ -197,7 +205,7 @@
                         Grid.Row="0"
                         Grid.Column="0"
                         Grid.ColumnSpan="2"
-                        Style="{StaticResource TitleLabel}">
+                        Style="{StaticResource Header1}">
                         zu Beginn
                     </Label>
                     <Rectangle
@@ -212,7 +220,7 @@
                         Grid.Row="0"
                         Grid.Column="3"
                         Grid.ColumnSpan="2"
-                        Style="{StaticResource TitleLabel}">
+                        Style="{StaticResource Header1}">
                         am Ende
                     </Label>
 
@@ -308,7 +316,10 @@
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="auto" />
-                        <ColumnDefinition Width="*" MinWidth="100" MaxWidth="400"/>
+                        <ColumnDefinition
+                            Width="*"
+                            MinWidth="100"
+                            MaxWidth="400" />
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="auto" />
@@ -466,10 +477,16 @@
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="auto" />
-                        <ColumnDefinition  Width="*" MinWidth="100" MaxWidth="400" />
+                        <ColumnDefinition
+                            Width="*"
+                            MinWidth="100"
+                            MaxWidth="400" />
                         <ColumnDefinition Width="auto" />
                         <ColumnDefinition Width="auto" />
-                        <ColumnDefinition  Width="*" MinWidth="100" MaxWidth="400" />
+                        <ColumnDefinition
+                            Width="*"
+                            MinWidth="100"
+                            MaxWidth="400" />
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="auto" />
@@ -483,7 +500,7 @@
                         Grid.Row="0"
                         Grid.Column="0"
                         Grid.ColumnSpan="2"
-                        Style="{StaticResource TitleLabel}">
+                        Style="{StaticResource Header1}">
                         zu Beginn
                     </Label>
                     <Rectangle
@@ -498,7 +515,7 @@
                         Grid.Row="0"
                         Grid.Column="3"
                         Grid.ColumnSpan="2"
-                        Style="{StaticResource TitleLabel}">
+                        Style="{StaticResource Header1}">
                         am Ende
                     </Label>
 
diff --git a/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml b/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml
index 033f8d46b..bea38e4af 100644
--- a/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml
+++ b/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml
@@ -12,7 +12,7 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="..\..\Styles\PrototypeStyles.xaml" />
+                <ResourceDictionary Source="..\..\Styles\ModernOrangeBlack.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>
diff --git a/BeWo/View/Detail/CustomerWohnhilfeView.xaml b/BeWo/View/Detail/CustomerWohnhilfeView.xaml
index 8d83cd123..f3c2a873d 100644
--- a/BeWo/View/Detail/CustomerWohnhilfeView.xaml
+++ b/BeWo/View/Detail/CustomerWohnhilfeView.xaml
@@ -17,7 +17,7 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="..\..\Styles\PrototypeStyles.xaml" />
+                <ResourceDictionary Source="..\..\Styles\ModernOrangeBlack.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>
diff --git a/BeWo/View/Detail/Wohneinheit/WohneinheitBelegungEditControl.xaml b/BeWo/View/Detail/Wohneinheit/WohneinheitBelegungEditControl.xaml
index b902c3659..2de4d58cd 100644
--- a/BeWo/View/Detail/Wohneinheit/WohneinheitBelegungEditControl.xaml
+++ b/BeWo/View/Detail/Wohneinheit/WohneinheitBelegungEditControl.xaml
@@ -17,7 +17,7 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="..\..\..\Styles\PrototypeStyles.xaml" />
+                <ResourceDictionary Source="..\..\..\Styles\ModernOrangeBlack.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>
@@ -91,7 +91,7 @@
                 Grid.Row="5"
                 Grid.Column="2"
                 Grid.ColumnSpan="5"
-                Style="{StaticResource TextBoxNoticeLargeStyle}"
+                Style="{StaticResource TextBoxNoticeLarge}"
                 Text="{Binding Path=WohneinheitBelegungListVM.CurrentVM.Kommentar, UpdateSourceTrigger=PropertyChanged}" />
             <StackPanel
                 x:Name="stackpanel_buttons"
@@ -105,7 +105,7 @@
                     Margin="3"
                     Click="Save_Button_Click"
                     IsEnabled="{Binding Path=WohneinheitBelegungListVM.CurrentVM.CanSave, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-                    Style="{StaticResource ButtonGrayDisabledStyle}">
+                    Style="{StaticResource PrimaryButton}">
                     Hinzufügen
                 </Button>
                 <Button
diff --git a/BeWo/View/Detail/Wohneinheit/WohneinheitBelegungEditPopup.xaml b/BeWo/View/Detail/Wohneinheit/WohneinheitBelegungEditPopup.xaml
index 6fe8cada8..25fb91a3e 100644
--- a/BeWo/View/Detail/Wohneinheit/WohneinheitBelegungEditPopup.xaml
+++ b/BeWo/View/Detail/Wohneinheit/WohneinheitBelegungEditPopup.xaml
@@ -14,7 +14,7 @@
     <Popup.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="..\..\..\Styles\PrototypeStyles.xaml" />
+                <ResourceDictionary Source="..\..\..\Styles\ModernOrangeBlack.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Popup.Resources>
@@ -89,7 +89,7 @@
                 Grid.Row="5"
                 Grid.Column="2"
                 Grid.ColumnSpan="5"
-                Style="{StaticResource TextBoxNoticeLargeStyle}"
+                Style="{StaticResource TextBoxNoticeLarge}"
                 Text="{Binding Path=WohneinheitBelegungListVM.CurrentVM.Kommentar, UpdateSourceTrigger=PropertyChanged}" />
                 <StackPanel
                 Grid.Row="7"
diff --git a/BeWo/View/Detail/Wohneinheit/WohneinheitBelegungWindow.xaml b/BeWo/View/Detail/Wohneinheit/WohneinheitBelegungWindow.xaml
index 012dd0db6..63b1300f6 100644
--- a/BeWo/View/Detail/Wohneinheit/WohneinheitBelegungWindow.xaml
+++ b/BeWo/View/Detail/Wohneinheit/WohneinheitBelegungWindow.xaml
@@ -1,20 +1,20 @@
-<dx:ThemedWindow x:Class="BeWo.View.Detail.Wohneinheit.WohneinheitBelegungWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:dxmvvm="http://schemas.devexpress.com/winfx/2008/xaml/mvvm"
-        xmlns:local="clr-namespace:BeWo.View.Detail.Wohneinheit"
-        mc:Ignorable="d"
-        Title="WohneinheitBelegungWindow" SizeToContent="WidthAndHeight"
-                 Height="400">
+<dx:ThemedWindow
+    x:Class="BeWo.View.Detail.Wohneinheit.WohneinheitBelegungWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
+    xmlns:dxmvvm="http://schemas.devexpress.com/winfx/2008/xaml/mvvm"
+    xmlns:local="clr-namespace:BeWo.View.Detail.Wohneinheit"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="WohneinheitBelegungWindow"
+    Height="400"
+    SizeToContent="WidthAndHeight"
+    mc:Ignorable="d">
     <dxmvvm:Interaction.Behaviors>
         <dxmvvm:CurrentWindowService ClosingCommand="{Binding WindowClosingCommand}" />
     </dxmvvm:Interaction.Behaviors>
-    <Grid
-                HorizontalAlignment="Stretch"
-        VerticalAlignment="Stretch">
-        <local:WohneinheitBelegungEditControl DataContext="{Binding}"/>
+    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+        <local:WohneinheitBelegungEditControl DataContext="{Binding}" />
     </Grid>
 </dx:ThemedWindow>
diff --git a/BeWo/View/Detail/Wohneinheit/WohneinheitEditPopup.xaml b/BeWo/View/Detail/Wohneinheit/WohneinheitEditPopup.xaml
index 263162751..76dc67ae7 100644
--- a/BeWo/View/Detail/Wohneinheit/WohneinheitEditPopup.xaml
+++ b/BeWo/View/Detail/Wohneinheit/WohneinheitEditPopup.xaml
@@ -5,7 +5,8 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
     xmlns:local="clr-namespace:BeWo.View.Controls"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:viewmodel="clr-namespace:BeWo.ViewModel.ListViewModel" 
+    d:DataContext="{d:DesignInstance Type=viewmodel:WohneinheitListVM}"
     Width="500"
     Closed="Popup_Closed"
     Opened="Popup_Opened"
@@ -15,7 +16,7 @@
     <Popup.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="..\..\..\Styles\PrototypeStyles.xaml" />
+                <ResourceDictionary Source="..\..\..\Styles\ModernOrangeBlack.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Popup.Resources>
@@ -74,7 +75,7 @@
                     Grid.Row="2"
                     Grid.Column="1"
                     EditValue="{Binding Path=Baujahr, UpdateSourceTrigger=PropertyChanged}"
-                    Style="{StaticResource TextEditYearStyle}" />
+                    Style="{StaticResource TextEditYear}" />
 
                 <Label
                     Grid.Row="3"
@@ -92,7 +93,7 @@
                     Grid.Row="4"
                     Grid.Column="1"
                     EditValue="{Binding Path=QM, UpdateSourceTrigger=PropertyChanged}"
-                    Style="{StaticResource TextEditQmStyle}" />
+                    Style="{StaticResource TextEditQm}" />
 
                 <Label Grid.Row="5">
                     Kaution
@@ -101,7 +102,7 @@
                     Grid.Row="5"
                     Grid.Column="1"
                     EditValue="{Binding Path=Kaution, UpdateSourceTrigger=PropertyChanged}"
-                    Style="{StaticResource TextEditCurrencyStyle}" />
+                    Style="{StaticResource TextEditCurrency}" />
 
                 <Grid Grid.Row="6" Grid.ColumnSpan="2">
                     <Grid.RowDefinitions>
@@ -123,7 +124,7 @@
                         Grid.Row="0"
                         Grid.Column="1"
                         EditValue="{Binding Path=Miete, UpdateSourceTrigger=PropertyChanged}"
-                        Style="{StaticResource TextEditCurrencyStyle}" />
+                        Style="{StaticResource TextEditCurrency}" />
 
                     <Label Grid.Row="1">
                         Heizung
@@ -132,7 +133,7 @@
                         Grid.Row="1"
                         Grid.Column="1"
                         EditValue="{Binding Path=Heizung, UpdateSourceTrigger=PropertyChanged}"
-                        Style="{StaticResource TextEditCurrencyStyle}" />
+                        Style="{StaticResource TextEditCurrency}" />
 
                     <Label Grid.Row="2">
                         Strom
@@ -141,7 +142,7 @@
                         Grid.Row="2"
                         Grid.Column="1"
                         EditValue="{Binding Path=Strom, UpdateSourceTrigger=PropertyChanged}"
-                        Style="{StaticResource TextEditCurrencyStyle}" />
+                        Style="{StaticResource TextEditCurrency}" />
 
                     <Label Grid.Row="0" Grid.Column="2">
                         Betriebskosten
@@ -150,7 +151,7 @@
                         Grid.Row="0"
                         Grid.Column="3"
                         EditValue="{Binding Path=Betriebskosten, UpdateSourceTrigger=PropertyChanged}"
-                        Style="{StaticResource TextEditCurrencyStyle}" />
+                        Style="{StaticResource TextEditCurrency}" />
 
                     <Label Grid.Row="1" Grid.Column="2">
                         Sonstige Kosten
@@ -159,7 +160,7 @@
                         Grid.Row="1"
                         Grid.Column="3"
                         EditValue="{Binding Path=SonstigeKosten, UpdateSourceTrigger=PropertyChanged}"
-                        Style="{StaticResource TextEditCurrencyStyle}" />
+                        Style="{StaticResource TextEditCurrency}" />
 
                     <Label Grid.Row="2" Grid.Column="2">
                         Brutto
@@ -169,21 +170,21 @@
                         Grid.Column="3"
                         EditValue="{Binding Path=Brutto, Mode=OneWay}"
                         IsReadOnly="True"
-                        Style="{StaticResource TextEditCurrencyStyle}" />
+                        Style="{StaticResource TextEditCurrency}" />
                 </Grid>
 
                 <Label Grid.Row="7" Content="Möbilierung" />
                 <TextBox
                     Grid.Row="7"
                     Grid.Column="1"
-                    Style="{StaticResource TextBoxNoticeStyle}"
+                    Style="{StaticResource TextBoxNotice}"
                     Text="{Binding Path=Mobilierung, UpdateSourceTrigger=PropertyChanged}" />
 
                 <Label Grid.Row="8" Content="Notiz" />
                 <TextBox
                     Grid.Row="8"
                     Grid.Column="1"
-                    Style="{StaticResource TextBoxNoticeExtendedStyle}"
+                    Style="{StaticResource TextBoxNoticeExtended}"
                     Text="{Binding Path=Zusatznotiz, UpdateSourceTrigger=PropertyChanged}" />
                 <StackPanel
                     Grid.Row="9"
diff --git a/BeWo/View/Detail/Wohneinheit/WohneinheitEditPopup.xaml.cs b/BeWo/View/Detail/Wohneinheit/WohneinheitEditPopup.xaml.cs
index 85d0f902d..a12fe9164 100644
--- a/BeWo/View/Detail/Wohneinheit/WohneinheitEditPopup.xaml.cs
+++ b/BeWo/View/Detail/Wohneinheit/WohneinheitEditPopup.xaml.cs
@@ -24,17 +24,7 @@ namespace BeWo.View.Detail.Wohneinheit
     /// </summary>
     public partial class WohneinheitEditPopup : Popup
     {
-        public static readonly DependencyProperty ViewModelProperty = DependencyProperty.Register(
-            "ViewModel", typeof(WohneinheitListVM),
-                typeof(WohneinheitEditPopup),
-  new PropertyMetadata(null)
-            );
-
-        public WohneinheitListVM ViewModel
-        {
-            get => (WohneinheitListVM)GetValue(ViewModelProperty);
-            set => SetValue(ViewModelProperty, value);
-        }
+        public WohneinheitListVM ViewModel => DataContext as WohneinheitListVM;
 
         public bool AddMode { get; set; }
 
diff --git a/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissControl.xaml b/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissControl.xaml
new file mode 100644
index 000000000..ec437bf02
--- /dev/null
+++ b/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissControl.xaml
@@ -0,0 +1,55 @@
+<UserControl
+    x:Class="BeWo.View.Detail.Wohneinheit.WohneinheitGrundrissControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BeWo.View.Detail.Wohneinheit"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="..\..\..\Styles\ModernOrangeBlack.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
+    <Grid>
+        <GroupBox
+            Margin="10"
+            Header="Grundrissverwaltung"
+            Style="{StaticResource ObjectEditGroupBox}">
+            <ListBox
+                Name="PhotosListBox"
+                ItemsSource="{Binding VMList}"
+                ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                ScrollViewer.VerticalScrollBarVisibility="Auto"
+                SelectedIndex="0"
+                Style="{StaticResource PhotoListBox}">
+                <ListBox.ContextMenu>
+                    <ContextMenu>
+                        <MenuItem Click="MenuItem_Add_Click" Header="Hinzufügen" />
+                        <MenuItem Click="MenuItem_Del_Click" Header="Löschen" />
+                    </ContextMenu>
+                </ListBox.ContextMenu>
+                <ListBox.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <UniformGrid Columns="3" />
+                    </ItemsPanelTemplate>
+                </ListBox.ItemsPanel>
+                <ListBox.ItemTemplate>
+                    <DataTemplate>
+                        <StackPanel MouseDown="StackPanel_MouseDown">
+                            <Image
+                                Height="150"
+                                Source="{Binding Original}"
+                                Stretch="Uniform" />
+                            <Label HorizontalAlignment="Center" Content="{Binding Filename}" />
+                        </StackPanel>
+                    </DataTemplate>
+                </ListBox.ItemTemplate>
+            </ListBox>
+        </GroupBox>
+    </Grid>
+</UserControl>
diff --git a/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissControl.xaml.cs b/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissControl.xaml.cs
new file mode 100644
index 000000000..8125a72a7
--- /dev/null
+++ b/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissControl.xaml.cs
@@ -0,0 +1,87 @@
+using BeWo.Core;
+using BeWo.ViewModel;
+using BeWo.ViewModel.ListViewModel;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BeWo.View.Detail.Wohneinheit
+{
+	/// <summary>
+	/// Interaktionslogik für WohneinheitGrundrissControl.xaml
+	/// </summary>
+	public partial class WohneinheitGrundrissControl : UserControl
+	{
+        public ImageListVM ViewModel => DataContext as ImageListVM;
+
+		public WohneinheitGrundrissControl()
+		{
+			InitializeComponent();
+        }
+
+        private void MenuItem_Add_Click(object sender, RoutedEventArgs e)
+        {
+            var dialog = new Microsoft.Win32.OpenFileDialog();
+            dialog.Title = "Wähle einen Grundriss aus";
+            dialog.Filter = "ALL supported Graphics| *.jpeg; *.jpg;*.png;";
+
+            // Show open file dialog box
+            bool? result = dialog.ShowDialog();
+
+            if (result != true)
+                return;
+
+            var info = new FileInfo(dialog.FileName);
+
+            if (!info.Exists)
+                return;
+
+            var vm = new ImageVM();
+
+            vm.Filename = info.Name;
+            vm.Fullname = info.FullName;
+            vm.Original = File.ReadAllBytes(info.FullName);
+
+            ViewModel.VMList.Add(vm);
+        }
+
+        private void MenuItem_Del_Click(object sender, RoutedEventArgs e)
+        {
+            var t = PhotosListBox.SelectedItem as ImageVM;
+
+            if (t is null)
+                return;
+
+            ViewModel.VMList.Remove(t);
+        }
+
+        private void StackPanel_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            var stackpanel = sender as StackPanel;
+
+            var image = stackpanel?.Children?[0] as Image;
+
+            var image_source = image?.Source;
+
+            if (image_source is object)
+            {
+                if (e.ClickCount >= 2)
+                {
+                    BeWoUtils.ShowImageForm(image_source);
+                }
+            }
+        }
+    }
+}
diff --git a/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissModalPopup.xaml b/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissModalPopup.xaml
index 94381ecfb..c75aeef55 100644
--- a/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissModalPopup.xaml
+++ b/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissModalPopup.xaml
@@ -1,73 +1,39 @@
-<localView:BeWoView x:Class="BeWo.View.Detail.Wohneinheit.WohneinheitGrundrissModalPopup"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:BeWo.View.Detail.Wohneinheit"
-             xmlns:localView="clr-namespace:BeWo.View"
-             mc:Ignorable="d">
+<localView:BeWoView
+    x:Class="BeWo.View.Detail.Wohneinheit.WohneinheitGrundrissModalPopup"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BeWo.View.Detail.Wohneinheit"
+    xmlns:localView="clr-namespace:BeWo.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
     <localView:BeWoView.Resources>
-        <Style TargetType="{x:Type ListBox}" x:Key="PhotoListBoxStyle">
-            <Setter Property="Foreground" Value="Black" />
-            <Setter Property="Margin" Value="5" />
-            <Setter Property="MinHeight" Value="100" />
-            <Setter Property="MaxHeight" Value="800" />
-            <Setter Property="IsSynchronizedWithCurrentItem" Value="True" />
-            <Setter Property="SelectionMode" Value="Single" />
-        </Style>
-        <Style TargetType="ListBoxItem">
-            <Style.Resources>
-                <!--SelectedItem with focus-->
-                <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="LightBlue" Opacity=".4"/>
-                <!--SelectedItem without focus-->
-                <SolidColorBrush x:Key="{x:Static SystemColors.InactiveSelectionHighlightBrushKey }" Color="LightBlue" Opacity=".4"/>
-            </Style.Resources>
-        </Style>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="..\..\..\Styles\PrototypeStyles.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
     </localView:BeWoView.Resources>
     <GroupBox Width="1400" Style="{StaticResource PopUpWindowStyle}">
-    <GroupBox.Header>
-        <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="0,0,0,0">
-            <Image Source="..\..\..\Ressources\Icons\CoinsDisabled.png" Height="28" />
-            <TextBox Margin="10,4,0,0" Background="{x:Null}" Foreground="{DynamicResource MainGroupBoxForegroundBrush}"
-                        FontSize="20" BorderBrush="{x:Null}" VerticalAlignment="Stretch" BorderThickness="0,0,0,0"
-                        Padding="0,0,0,0" />
-        </StackPanel>
-    </GroupBox.Header>
+        <GroupBox.Header>
+            <StackPanel
+                Margin="0,0,0,0"
+                VerticalAlignment="Center"
+                Orientation="Horizontal">
+                <Image Height="28" Source="..\..\..\Ressources\Icons\CoinsDisabled.png" />
+                <TextBox
+                    Margin="10,4,0,0"
+                    Padding="0,0,0,0"
+                    VerticalAlignment="Stretch"
+                    Background="{x:Null}"
+                    BorderBrush="{x:Null}"
+                    BorderThickness="0,0,0,0"
+                    FontSize="20"
+                    Foreground="{DynamicResource MainGroupBoxForegroundBrush}" />
+            </StackPanel>
+        </GroupBox.Header>
         <Grid Background="{StaticResource ObjectEditBackgroundBrush}">
-            <GroupBox Margin="10" Header="Grundrissverwaltung" Style="{StaticResource ObjectEditGroupBox}">
-                <ListBox
-                        Name="PhotosListBox"
-                        ItemsSource="{Binding}"
-                        Style="{StaticResource PhotoListBoxStyle}"
-                        ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                        ScrollViewer.VerticalScrollBarVisibility="Auto"
-                        SelectedIndex="0">
-                    <ListBox.ContextMenu>
-                        <ContextMenu>
-                            <MenuItem Header="Hinzufügen" Click="MenuItem_Add_Click" />
-                            <MenuItem Header="Löschen" Click="MenuItem_Del_Click" />
-                        </ContextMenu>
-                    </ListBox.ContextMenu>
-                    <ListBox.ItemsPanel>
-                        <ItemsPanelTemplate>
-                            <UniformGrid Columns="3"/>
-                        </ItemsPanelTemplate>
-                    </ListBox.ItemsPanel>
-                    <ListBox.ItemTemplate>
-                        <DataTemplate>
-                            <StackPanel MouseDown="StackPanel_MouseDown">
-                                <Image Source="{Binding Original}" Height="150" Stretch="Uniform"></Image>
-                                <Label Content="{Binding Filename}" HorizontalAlignment="Center"/>
-                            </StackPanel>
-                        </DataTemplate>
-                    </ListBox.ItemTemplate>
-                    <ListBox.ItemContainerStyle>
-                        <Style TargetType="ListBoxItem">
-                            <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
-                        </Style>
-                    </ListBox.ItemContainerStyle>
-                </ListBox>
-            </GroupBox>
+            <local:WohneinheitGrundrissControl />
         </Grid>
     </GroupBox>
 </localView:BeWoView>
diff --git a/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissModalPopup.xaml.cs b/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissModalPopup.xaml.cs
index 5fb24859d..921cf2cf9 100644
--- a/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissModalPopup.xaml.cs
+++ b/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissModalPopup.xaml.cs
@@ -26,74 +26,18 @@ namespace BeWo.View.Detail.Wohneinheit
     /// </summary>
     public partial class WohneinheitGrundrissModalPopup : BeWoView
     {
-        public ImageListVM Images { get; set; }
-
-        public WohneinheitGrundrissModalPopup(ImageListVM images)
+        public WohneinheitGrundrissModalPopup()
         {
             InitializeComponent();
 
-            this.CommandBindings.Add(new CommandBinding(ApplicationCommands.Close,
+            CommandBindings.Add(new CommandBinding(ApplicationCommands.Close,
                                                         (s, e) =>
                                                         {
                                                             BeWoApp.MainControl.CloseCurrentPopUp();
+                                                            e.Handled = true;
                                                         }));
-
-            Images = images;
-
-            DataContext = Images.VMList;
         }
 
-        private void MenuItem_Add_Click(object sender, RoutedEventArgs e)
-        {
-            var dialog = new Microsoft.Win32.OpenFileDialog();
-            dialog.Title = "Wähle einen Grundriss aus";
-            dialog.Filter = "ALL supported Graphics| *.jpeg; *.jpg;*.png;";
 
-            // Show open file dialog box
-            bool? result = dialog.ShowDialog();
-
-            if (result != true)
-                return;
-
-            var info = new FileInfo(dialog.FileName);
-
-            if (!info.Exists)
-                return;
-
-            var vm = new ImageVM();
-
-            vm.Filename = info.Name;
-            vm.Fullname = info.FullName;
-            vm.Original = File.ReadAllBytes(info.FullName);
-
-            Images.VMList.Add(vm);
-        }
-
-        private void MenuItem_Del_Click(object sender, RoutedEventArgs e)
-        {
-            var t = PhotosListBox.SelectedItem as ImageVM;
-
-            if (t is null)
-                return;
-
-            Images.VMList.Remove(t);
-        }
-
-        private void StackPanel_MouseDown(object sender, MouseButtonEventArgs e)
-        {
-            var stackpanel = sender as StackPanel;
-
-            var image = stackpanel?.Children?[0] as Image;
-
-            var image_source = image?.Source;
-
-            if (image_source is object)
-            {
-                if(e.ClickCount >= 2)
-                {
-                    BeWoUtils.ShowImageForm(image_source);
-                }
-            }
-        }
     }
 }
diff --git a/BeWo/View/Detail/Wohneinheit/WohneinheitVerwaltungViewV1.xaml b/BeWo/View/Detail/Wohneinheit/WohneinheitVerwaltungViewV1.xaml
index 72813014a..96eb91ee0 100644
--- a/BeWo/View/Detail/Wohneinheit/WohneinheitVerwaltungViewV1.xaml
+++ b/BeWo/View/Detail/Wohneinheit/WohneinheitVerwaltungViewV1.xaml
@@ -18,7 +18,7 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="..\..\..\Styles\PrototypeStyles.xaml" />
+                <ResourceDictionary Source="..\..\..\Styles\ModernOrangeBlack.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>
@@ -219,7 +219,7 @@
                     </dxg:GridControl.View>
                 </dxg:GridControl>
 
-                <local:WohneinheitEditPopup x:Name="popup_newWohneinheit" ViewModel="{Binding}" />
+                <local:WohneinheitEditPopup x:Name="popup_newWohneinheit" />
             </Grid>
         </GroupBox>
     </Grid>
diff --git a/BeWo/View/Detail/Wohneinheit/WohneinheitVerwaltungViewV1.xaml.cs b/BeWo/View/Detail/Wohneinheit/WohneinheitVerwaltungViewV1.xaml.cs
index 4dd47a16e..cff6df0a9 100644
--- a/BeWo/View/Detail/Wohneinheit/WohneinheitVerwaltungViewV1.xaml.cs
+++ b/BeWo/View/Detail/Wohneinheit/WohneinheitVerwaltungViewV1.xaml.cs
@@ -95,7 +95,9 @@ namespace BeWo.View.Detail.Wohneinheit
 
             var vm = datagrid_wohneinheiten.GetCurrentValue<WohneinheitVM>();
 
-            var control = new WohneinheitGrundrissModalPopup(vm.ImageListVM);
+            var control = new WohneinheitGrundrissModalPopup();
+
+            control.DataContext = vm.ImageListVM;
 
             BeWoApp.MainControl.ShowControlAsModalPopup(control);
 
diff --git a/BeWo/View/Detail/Wohneinheit/WohneinheitVerwaltungViewV2.xaml b/BeWo/View/Detail/Wohneinheit/WohneinheitVerwaltungViewV2.xaml
index 69f6f2016..a3c021bd6 100644
--- a/BeWo/View/Detail/Wohneinheit/WohneinheitVerwaltungViewV2.xaml
+++ b/BeWo/View/Detail/Wohneinheit/WohneinheitVerwaltungViewV2.xaml
@@ -16,7 +16,7 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="..\..\..\Styles\PrototypeStyles.xaml" />
+                <ResourceDictionary Source="..\..\..\Styles\ModernOrangeBlack.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>
@@ -28,7 +28,7 @@
                 </Style>
                 <Style
                     x:Key="TextEditCurrencyStyleManage"
-                    BasedOn="{StaticResource TextEditCurrencyStyle}"
+                    BasedOn="{StaticResource TextEditCurrency}"
                     TargetType="{x:Type dxe:TextEdit}">
                     <Setter Property="IsReadOnly" Value="{Binding DataContext.PermissionWohneinheitManage, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}" />
                 </Style>
@@ -83,174 +83,182 @@
                             ToolTip="Wohneinheit entfernen" />
                     </StackPanel>
                 </Grid>
-                <GroupBox
-                    x:Name="groupbox_newWohneinheit"
+                <ScrollViewer
                     Grid.Column="2"
                     Margin="5"
                     DataContext="{Binding SelectedVM}"
-                    Header="Allgemeine Informationen"
-                    Style="{StaticResource ObjectEditGroupBox}"
+                    VerticalScrollBarVisibility="Visible"
+                    Padding="5"
                     Visibility="{Binding Path=., Converter={StaticResource ObjectVisibilityConverter}}">
-                    <Grid>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="2*" />
-                        </Grid.ColumnDefinitions>
+                    <StackPanel Orientation="Vertical">
+                        <GroupBox
+                            x:Name="groupbox_newWohneinheit"
+                            Header="Allgemeine Informationen"
+                            Style="{StaticResource ObjectEditGroupBox}">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                </Grid.RowDefinitions>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="2*" />
+                                </Grid.ColumnDefinitions>
 
-                        <Label Grid.Row="0">
-                            Wohnungsname
-                        </Label>
-                        <TextBox
-                            Grid.Row="0"
-                            Grid.Column="1"
-                            IsReadOnly="{Binding DataContext.PermissionWohneinheitManage, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}"
-                            Text="{Binding Path=Wohnname, UpdateSourceTrigger=PropertyChanged}" />
-                        <Label Grid.Row="1">
-                            Zimmername
-                        </Label>
-                        <TextBox
-                            Grid.Row="1"
-                            Grid.Column="1"
-                            IsReadOnly="{Binding DataContext.PermissionWohneinheitManage, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}"
-                            Text="{Binding Path=Zimmername, UpdateSourceTrigger=PropertyChanged}" />
-                        <Label Grid.Row="2">
-                            Baujahr
-                        </Label>
-                        <dxe:TextEdit
-                            Grid.Row="2"
-                            Grid.Column="1"
-                            EditValue="{Binding Path=Baujahr, UpdateSourceTrigger=PropertyChanged}"
-                            IsReadOnly="{Binding DataContext.PermissionWohneinheitManage, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}"
-                            Style="{StaticResource TextEditYearStyle}" />
+                                <Label Grid.Row="0">
+                                    Wohnungsname
+                                </Label>
+                                <TextBox
+                                    Grid.Row="0"
+                                    Grid.Column="1"
+                                    IsReadOnly="{Binding DataContext.PermissionWohneinheitManage, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}"
+                                    Text="{Binding Path=Wohnname, UpdateSourceTrigger=PropertyChanged}" />
+                                <Label Grid.Row="1">
+                                    Zimmername
+                                </Label>
+                                <TextBox
+                                    Grid.Row="1"
+                                    Grid.Column="1"
+                                    IsReadOnly="{Binding DataContext.PermissionWohneinheitManage, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}"
+                                    Text="{Binding Path=Zimmername, UpdateSourceTrigger=PropertyChanged}" />
+                                <Label Grid.Row="2">
+                                    Baujahr
+                                </Label>
+                                <dxe:TextEdit
+                                    Grid.Row="2"
+                                    Grid.Column="1"
+                                    EditValue="{Binding Path=Baujahr, UpdateSourceTrigger=PropertyChanged}"
+                                    IsReadOnly="{Binding DataContext.PermissionWohneinheitManage, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}"
+                                    Style="{StaticResource TextEditYear}" />
 
-                        <Label
-                            Grid.Row="3"
-                            Grid.Column="0"
-                            Content="Stock" />
-                        <TextBox
-                            Grid.Row="3"
-                            Grid.Column="1"
-                            IsReadOnly="{Binding DataContext.PermissionWohneinheitManage, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}"
-                            Text="{Binding Path=Stock, UpdateSourceTrigger=PropertyChanged}" />
+                                <Label
+                                    Grid.Row="3"
+                                    Grid.Column="0"
+                                    Content="Stock" />
+                                <TextBox
+                                    Grid.Row="3"
+                                    Grid.Column="1"
+                                    IsReadOnly="{Binding DataContext.PermissionWohneinheitManage, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}"
+                                    Text="{Binding Path=Stock, UpdateSourceTrigger=PropertyChanged}" />
 
-                        <Label Grid.Row="4">
-                            Fläche
-                        </Label>
-                        <dxe:TextEdit
-                            Grid.Row="4"
-                            Grid.Column="1"
-                            EditValue="{Binding Path=QM, UpdateSourceTrigger=PropertyChanged}"
-                            IsReadOnly="{Binding DataContext.PermissionWohneinheitManage, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}"
-                            Style="{StaticResource TextEditQmStyle}" />
+                                <Label Grid.Row="4">
+                                    Fläche
+                                </Label>
+                                <dxe:TextEdit
+                                    Grid.Row="4"
+                                    Grid.Column="1"
+                                    EditValue="{Binding Path=QM, UpdateSourceTrigger=PropertyChanged}"
+                                    IsReadOnly="{Binding DataContext.PermissionWohneinheitManage, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}"
+                                    Style="{StaticResource TextEditQm}" />
 
-                        <Label Grid.Row="5">
-                            Kaution
-                        </Label>
-                        <dxe:TextEdit
-                            Grid.Row="5"
-                            Grid.Column="1"
-                            EditValue="{Binding Path=Kaution, UpdateSourceTrigger=PropertyChanged}"
-                            Style="{StaticResource TextEditCurrencyStyleManage}" />
+                                <Label Grid.Row="5">
+                                    Kaution
+                                </Label>
+                                <dxe:TextEdit
+                                    Grid.Row="5"
+                                    Grid.Column="1"
+                                    EditValue="{Binding Path=Kaution, UpdateSourceTrigger=PropertyChanged}"
+                                    Style="{StaticResource TextEditCurrencyStyleManage}" />
 
-                        <Grid Grid.Row="6" Grid.ColumnSpan="2">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                            </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="7*" />
-                                <ColumnDefinition Width="15*" />
-                                <ColumnDefinition Width="12*" />
-                                <ColumnDefinition Width="15*" />
-                            </Grid.ColumnDefinitions>
+                                <Grid Grid.Row="6" Grid.ColumnSpan="2">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="7*" />
+                                        <ColumnDefinition Width="15*" />
+                                        <ColumnDefinition Width="12*" />
+                                        <ColumnDefinition Width="15*" />
+                                    </Grid.ColumnDefinitions>
 
-                            <Label Grid.Row="0">
-                                Miete
-                            </Label>
-                            <dxe:TextEdit
-                                Grid.Row="0"
-                                Grid.Column="1"
-                                EditValue="{Binding Path=Miete, UpdateSourceTrigger=PropertyChanged}"
-                                Style="{StaticResource TextEditCurrencyStyleManage}" />
-                            <Label Grid.Row="1" Grid.Column="0">
-                                Heizung
-                            </Label>
-                            <dxe:TextEdit
-                                Grid.Row="1"
-                                Grid.Column="1"
-                                EditValue="{Binding Path=Heizung, UpdateSourceTrigger=PropertyChanged}"
-                                Style="{StaticResource TextEditCurrencyStyleManage}" />
-                            <Label Grid.Row="2" Grid.Column="0">
-                                Strom
-                            </Label>
-                            <dxe:TextEdit
-                                Grid.Row="2"
-                                Grid.Column="1"
-                                EditValue="{Binding Path=Strom, UpdateSourceTrigger=PropertyChanged}"
-                                Style="{StaticResource TextEditCurrencyStyleManage}" />
-                            <Label Grid.Row="0" Grid.Column="2">
-                                Betriebskosten
-                            </Label>
-                            <dxe:TextEdit
-                                Grid.Row="0"
-                                Grid.Column="3"
-                                EditValue="{Binding Path=Betriebskosten, UpdateSourceTrigger=PropertyChanged}"
-                                Style="{StaticResource TextEditCurrencyStyleManage}" />
-                            <Label Grid.Row="1" Grid.Column="2">
-                                Sonstige Kosten
-                            </Label>
-                            <dxe:TextEdit
-                                Grid.Row="1"
-                                Grid.Column="3"
-                                EditValue="{Binding Path=SonstigeKosten, UpdateSourceTrigger=PropertyChanged}"
-                                Style="{StaticResource TextEditCurrencyStyleManage}" />
-                            <Label Grid.Row="2" Grid.Column="2">
-                                Brutto
-                            </Label>
-                            <dxe:TextEdit
-                                Grid.Row="2"
-                                Grid.Column="3"
-                                EditValue="{Binding Path=Brutto, Mode=OneWay}"
-                                IsReadOnly="True"
-                                Style="{StaticResource TextEditCurrencyStyle}" />
-                        </Grid>
+                                    <Label Grid.Row="0">
+                                        Miete
+                                    </Label>
+                                    <dxe:TextEdit
+                                        Grid.Row="0"
+                                        Grid.Column="1"
+                                        EditValue="{Binding Path=Miete, UpdateSourceTrigger=PropertyChanged}"
+                                        Style="{StaticResource TextEditCurrencyStyleManage}" />
+                                    <Label Grid.Row="1" Grid.Column="0">
+                                        Heizung
+                                    </Label>
+                                    <dxe:TextEdit
+                                        Grid.Row="1"
+                                        Grid.Column="1"
+                                        EditValue="{Binding Path=Heizung, UpdateSourceTrigger=PropertyChanged}"
+                                        Style="{StaticResource TextEditCurrencyStyleManage}" />
+                                    <Label Grid.Row="2" Grid.Column="0">
+                                        Strom
+                                    </Label>
+                                    <dxe:TextEdit
+                                        Grid.Row="2"
+                                        Grid.Column="1"
+                                        EditValue="{Binding Path=Strom, UpdateSourceTrigger=PropertyChanged}"
+                                        Style="{StaticResource TextEditCurrencyStyleManage}" />
+                                    <Label Grid.Row="0" Grid.Column="2">
+                                        Betriebskosten
+                                    </Label>
+                                    <dxe:TextEdit
+                                        Grid.Row="0"
+                                        Grid.Column="3"
+                                        EditValue="{Binding Path=Betriebskosten, UpdateSourceTrigger=PropertyChanged}"
+                                        Style="{StaticResource TextEditCurrencyStyleManage}" />
+                                    <Label Grid.Row="1" Grid.Column="2">
+                                        Sonstige Kosten
+                                    </Label>
+                                    <dxe:TextEdit
+                                        Grid.Row="1"
+                                        Grid.Column="3"
+                                        EditValue="{Binding Path=SonstigeKosten, UpdateSourceTrigger=PropertyChanged}"
+                                        Style="{StaticResource TextEditCurrencyStyleManage}" />
+                                    <Label Grid.Row="2" Grid.Column="2">
+                                        Brutto
+                                    </Label>
+                                    <dxe:TextEdit
+                                        Grid.Row="2"
+                                        Grid.Column="3"
+                                        EditValue="{Binding Path=Brutto, Mode=OneWay}"
+                                        IsReadOnly="True"
+                                        Style="{StaticResource TextEditCurrency}" />
+                                </Grid>
 
-                        <Label
-                            Grid.Row="7"
-                            Grid.Column="0"
-                            Content="Möbilierung" />
-                        <TextBox
-                            Grid.Row="7"
-                            Grid.Column="1"
-                            IsReadOnly="{Binding DataContext.PermissionWohneinheitManage, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}"
-                            Style="{StaticResource TextBoxNoticeStyle}"
-                            Text="{Binding Path=Mobilierung, UpdateSourceTrigger=PropertyChanged}" />
+                                <Label
+                                    Grid.Row="7"
+                                    Grid.Column="0"
+                                    Content="Möbilierung" />
+                                <TextBox
+                                    Grid.Row="7"
+                                    Grid.Column="1"
+                                    IsReadOnly="{Binding DataContext.PermissionWohneinheitManage, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}"
+                                    Style="{StaticResource TextBoxNoticeExtended}"
+                                    Text="{Binding Path=Mobilierung, UpdateSourceTrigger=PropertyChanged}" />
+
+                                <Label
+                                    Grid.Row="8"
+                                    Grid.Column="0"
+                                    Content="Notiz" />
+                                <TextBox
+                                    Grid.Row="8"
+                                    Grid.Column="1"
+                                    IsReadOnly="{Binding DataContext.PermissionWohneinheitManage, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}"
+                                    Style="{StaticResource TextBoxNoticeExtended}"
+                                    Text="{Binding Path=Zusatznotiz, UpdateSourceTrigger=PropertyChanged}" />
+                            </Grid>
+                        </GroupBox>
+                        <local:WohneinheitGrundrissControl DataContext="{Binding ImageListVM}" />
+                    </StackPanel>
+                </ScrollViewer>
 
-                        <Label
-                            Grid.Row="8"
-                            Grid.Column="0"
-                            Content="Notiz" />
-                        <TextBox
-                            Grid.Row="8"
-                            Grid.Column="1"
-                            IsReadOnly="{Binding DataContext.PermissionWohneinheitManage, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}"
-                            Style="{StaticResource TextBoxNoticeExtendedStyle}"
-                            Text="{Binding Path=Zusatznotiz, UpdateSourceTrigger=PropertyChanged}" />
-                    </Grid>
-                </GroupBox>
             </Grid>
         </GroupBox>
     </Grid>
diff --git a/BeWo/ViewModel/ListViewModel/WohneinheitListVM.cs b/BeWo/ViewModel/ListViewModel/WohneinheitListVM.cs
index 8fe39f327..3fcecef65 100644
--- a/BeWo/ViewModel/ListViewModel/WohneinheitListVM.cs
+++ b/BeWo/ViewModel/ListViewModel/WohneinheitListVM.cs
@@ -22,9 +22,12 @@ namespace BeWo.ViewModel.ListViewModel
         public bool PermissionWohneinheitGalleryView { get; } = BeWoApp.HasLoggedOnUserRight(UserRightType.WohnheimView_Wohneinheit_Gallery_View);
         public bool PermissionWohneinheitGalleryManage { get; } = BeWoApp.HasLoggedOnUserRight(UserRightType.WohnheimView_Wohneinheit_Gallery_Manage);
 
+        /// <summary>
+        /// Designer
+        /// </summary>
         public WohneinheitListVM() : base(null)
         {
-
+            VMList.Add(new WohneinheitVM());
         }
 
         public WohneinheitListVM(List<WohneinheitDC> pDCs) : base(pDCs)