diff --git a/BeWo/View/Detail/ServiceRecordView2.xaml b/BeWo/View/Detail/ServiceRecordView2.xaml
index 059a20250..dacc8ebed 100644
--- a/BeWo/View/Detail/ServiceRecordView2.xaml
+++ b/BeWo/View/Detail/ServiceRecordView2.xaml
@@ -1273,8 +1273,8 @@
                                                 <dxg:GridColumn FieldName="Notice4" AllowEditing="False" Header="Dokumentation4" Width="200" x:Name="head_Doku4"/>
                                                 <dxg:GridColumn FieldName="Notice5" AllowEditing="False" Header="Dokumentation5" Width="200" x:Name="head_Doku5"/>
 												
-                                                <dxg:GridColumn FieldName="OnlyGoalString" AllowEditing="False" Header="Ziele" />
-                                                <dxg:GridColumn FieldName="MassnahmenString" AllowEditing="False" Header="Maßnahmen" />
+                                                <dxg:GridColumn FieldName="OnlyGoalString" AllowEditing="False" Header="Ziele" Visible="{Binding Path=PrototypeVM.IsGoalTreeVisible}"/>
+                                                <dxg:GridColumn FieldName="MassnahmenString" AllowEditing="False" Header="Maßnahmen" Visible="{Binding Path=PrototypeVM.IsGoalTreeVisible}"/>
                                                 <dxg:GridColumn FieldName="EmployeeName" AllowEditing="False" Header="Angelegt für" />
                                                 <dxg:GridColumn FieldName="InsUser" AllowEditing="False" Header="Angelegt von" x:Name="InsertedByColumn" />
                                                 <dxg:GridColumn FieldName="InsertedOnDateTime" AllowEditing="False" Header="Angelegt am" x:Name="InsertedOnColumn">
diff --git a/BeWo/ViewModel/ServiceRecordVM.cs b/BeWo/ViewModel/ServiceRecordVM.cs
index 450d84765..3ed00b48a 100644
--- a/BeWo/ViewModel/ServiceRecordVM.cs
+++ b/BeWo/ViewModel/ServiceRecordVM.cs
@@ -299,11 +299,14 @@ namespace BeWo.ViewModel
             get
             {
                 Brush brush = null;
-                if (_GroupOid != null)
+                //if (_GroupOid != null)
+                //{
+                //    brush = Application.Current.FindResource("GroupBookingBackgroundBrush") as Brush;
+                //}
+                if (!String.IsNullOrEmpty(BackgroundColor))
                 {
-                    brush = Application.Current.FindResource("GroupBookingBackgroundBrush") as Brush;
+                    return new SolidColorBrush((Color)System.Windows.Media.ColorConverter.ConvertFromString(BackgroundColor));
                 }
-
                 return brush ?? Brushes.White;
             }
         }
diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user b/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user
index e244fab95..017954e4c 100644
--- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user
+++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user
@@ -8,7 +8,7 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <ProjectView>ShowAllFiles</ProjectView>
     <WebStackScaffolding_ViewDialogWidth>600</WebStackScaffolding_ViewDialogWidth>
     <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
diff --git a/BeWoPlanerMobil/Service/ASPHibernateSessionManager.cs b/BeWoPlanerMobil/Service/ASPHibernateSessionManager.cs
index 89dca3c82..f0de9261b 100644
--- a/BeWoPlanerMobil/Service/ASPHibernateSessionManager.cs
+++ b/BeWoPlanerMobil/Service/ASPHibernateSessionManager.cs
@@ -165,7 +165,7 @@ namespace BeWoPlanerMobil.Service
             //log.Info(String.Format("TryAuthenticateWithLoginForm with username: '{0}', Password: '{1}', Tenant: {2}", name, password, MobileSessionFacade.Tenant));
             log.Info($"TryAuthenticateWithLoginForm with username: '{name}', Tenant: {MobileSessionFacade.Tenant}");
 
-            if (s.IsUserValid(name, password, null, "MobilClient", false) == UserValidationResult.UserValid)
+            if (s.IsUserValid(name, password, null, "MobilClient", false, "") == UserValidationResult.UserValid)
             {
                 var user = DAOFactory.UserDAO.FindUserByLoginName(name);
 
diff --git a/BeWoPlanerMobil/TestWebService.asmx.cs b/BeWoPlanerMobil/TestWebService.asmx.cs
index 976ed690a..a525c42a9 100644
--- a/BeWoPlanerMobil/TestWebService.asmx.cs
+++ b/BeWoPlanerMobil/TestWebService.asmx.cs
@@ -40,7 +40,7 @@ namespace BeWoPlanerMobil
 
             var s = new UserServiceImp();
 
-            if (s.IsUserValid(pUserName, pPassword, null, "MobilClient", false) == UserValidationResult.UserValid)
+            if (s.IsUserValid(pUserName, pPassword, null, "MobilClient", false, "") == UserValidationResult.UserValid)
             {
                 var user = DAOFactory.UserDAO.FindUserByLoginName(pUserName);
 
diff --git a/Service/DCEntityMapper/ServiceRecordDC_ServiceRecord.cs b/Service/DCEntityMapper/ServiceRecordDC_ServiceRecord.cs
index f6a97f858..dbb107a1e 100644
--- a/Service/DCEntityMapper/ServiceRecordDC_ServiceRecord.cs
+++ b/Service/DCEntityMapper/ServiceRecordDC_ServiceRecord.cs
@@ -124,7 +124,7 @@ namespace BeWo.Service.DCEntityMapper
 
             if (pEntity.ServiceRecordType.HasValue && pEntity.ServiceRecordType.Value == ServiceRecordTypeId.Content)
             {
-                pDataContract.BackgroundColor = "#FF008EED";
+                pDataContract.BackgroundColor = "#FF78BFFF";
             }
 
             return pDataContract;
diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs
index f86252caa..b5be4c5f1 100644
--- a/Service/Plugins/PluginLoader.cs
+++ b/Service/Plugins/PluginLoader.cs
@@ -171,7 +171,7 @@ namespace BeWo.Service.Plugins
                 //t = "3614251071"; // Pusteblume
                 //t = "7755740484"; // Sawo
                 //t = "8275654834"; // Twg Jonathan
-                //t = "6586058528"; // Freundeskreis Suchtkrankenhilfe e.V.
+                t = "6586058528"; // Freundeskreis Suchtkrankenhilfe e.V.
                 //t = "2632162696"; // Pro BeWo Düren
                 //t = "6340891020"; // Caritas Ahlen
                 //t = "3659854106"; // alpha e.V.
diff --git a/Service/ServiceImplementations/OperationsServiceImp.cs b/Service/ServiceImplementations/OperationsServiceImp.cs
index 1a5a9d648..f818026ad 100644
--- a/Service/ServiceImplementations/OperationsServiceImp.cs
+++ b/Service/ServiceImplementations/OperationsServiceImp.cs
@@ -2527,7 +2527,7 @@ namespace BeWo.Service.ServiceImplementations
 
             if (sr.ServiceRecordType.HasValue && sr.ServiceRecordType.Value == ServiceRecordTypeId.Content)
             {
-                dc.BackgroundColor = "#FF008EED";
+                dc.BackgroundColor = "#FF78BFFF";
             }