Index: vhUnitTest/APPS/EC/impl/ConfiguratorService/KleurenSchemaBepaler/Test.cls.xml
===================================================================
diff -u -r37103 -r37181
--- vhUnitTest/APPS/EC/impl/ConfiguratorService/KleurenSchemaBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 37103)
+++ vhUnitTest/APPS/EC/impl/ConfiguratorService/KleurenSchemaBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 37181)
@@ -46,7 +46,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: KleurenSchemaBepaler zonder vanhoecke personality geeft Licht kleurenschema">
+<Method name="Test: KleurenSchemaBepaler met Daro personality geeft Donker kleurenschema">
 <Implementation><![CDATA[
 	#dim Klant As vhTest.Dummy.DOM.VKP.VanHoeckeKlant = ##class(vhTest.Dummy.DOM.VKP.VanHoeckeKlant).%New()
 
@@ -56,6 +56,20 @@
 
 	#dim KleurenSchemaBepaler As APPS.EC.impl.ConfiguratorService.KleurenSchemaBepaler = ##class(APPS.EC.impl.ConfiguratorService.KleurenSchemaBepaler).%New()
 	
+	Do $$$AssertEquals(KleurenSchemaBepaler.Bepaal(PersonalityID, Klant.GeefID()),##class(APPS.EC.Unishop.enu.KleurenSchema).Donker())
+]]></Implementation>
+</Method>
+
+<Method name="Test: KleurenSchemaBepaler zonder vanhoecke personality geeft Licht kleurenschema">
+<Implementation><![CDATA[
+	#dim Klant As vhTest.Dummy.DOM.VKP.VanHoeckeKlant = ##class(vhTest.Dummy.DOM.VKP.VanHoeckeKlant).%New()
+
+	do ..PushKlant(Klant)
+	
+	#dim PersonalityID As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).SFS()
+
+	#dim KleurenSchemaBepaler As APPS.EC.impl.ConfiguratorService.KleurenSchemaBepaler = ##class(APPS.EC.impl.ConfiguratorService.KleurenSchemaBepaler).%New()
+	
 	Do $$$AssertEquals(KleurenSchemaBepaler.Bepaal(PersonalityID, Klant.GeefID()),##class(APPS.EC.Unishop.enu.KleurenSchema).Licht())
 ]]></Implementation>
 </Method>
@@ -64,7 +78,7 @@
 <Implementation><![CDATA[
 	#dim Klant As vhTest.Dummy.DOM.VKP.VanHoeckeKlant = ##class(vhTest.Dummy.DOM.VKP.VanHoeckeKlant).%New()
 	Do Klant.GeefAdres().ZetLandNr("DE")
-	Do Klant.ZetID(##class(DOM.VKP.enu.Klant).DaroFactors())
+	Do Klant.ZetID(##class(DOM.VKP.enu.Klant).SFS())
 	
 	do ..PushKlant(Klant)
 
Index: WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/ConfiguratorTypeBepaler.cls.xml
===================================================================
diff -u -r37097 -r37181
--- WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/ConfiguratorTypeBepaler.cls.xml	(.../ConfiguratorTypeBepaler.cls.xml)	(revision 37097)
+++ WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/ConfiguratorTypeBepaler.cls.xml	(.../ConfiguratorTypeBepaler.cls.xml)	(revision 37181)
@@ -9,7 +9,7 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>LocatieAPI:DOM.common.impl.LocatieAPI,ConfiguratorTypeBepaler:APPS.EC.impl.ConfiguratorService.ConfiguratorTypeBepaler</FormalSpec>
+<FormalSpec>ConfiguratorTypeBepaler:APPS.EC.impl.ConfiguratorService.ConfiguratorTypeBepaler</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
Index: vhUnitTest/WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/KleurenSchemaBepaler/Test.cls.xml
===================================================================
diff -u -r37095 -r37181
--- vhUnitTest/WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/KleurenSchemaBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 37095)
+++ vhUnitTest/WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/KleurenSchemaBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 37181)
@@ -12,7 +12,7 @@
 
 	Do KleurenSchemaBepalerMock.VerwachtMethodCall("Bepaal",WebshopSessie.PersonalityID,WebshopSessie.VhintraSessie.GebruikerData.KlantData.ID).DanDoeNiks()
 	
-	#dim KleurenSchemaBepaler As WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.KleurenSchemaBepaler = ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.KleurenSchemaBepaler).%New(,KleurenSchemaBepalerMock)
+	#dim KleurenSchemaBepaler As WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.KleurenSchemaBepaler = ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.KleurenSchemaBepaler).%New(KleurenSchemaBepalerMock)
 	
 	Do KleurenSchemaBepaler.Bepaal(WebshopSessie)
 	
Index: vhUnitTest/WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/ConfiguratorTypeBepaler/Test.cls.xml
===================================================================
diff -u -r37097 -r37181
--- vhUnitTest/WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/ConfiguratorTypeBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 37097)
+++ vhUnitTest/WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/ConfiguratorTypeBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 37181)
@@ -12,7 +12,7 @@
 
 	Do ConfiguratorTypeBepalerMock.VerwachtMethodCall("Bepaal",WebshopSessie.PersonalityID,WebshopSessie.VhintraSessie.GebruikerData.KlantData.ID).DanDoeNiks()
 	
-	#dim ConfiguratorTypeBepaler As WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.ConfiguratorTypeBepaler = ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.ConfiguratorTypeBepaler).%New(,ConfiguratorTypeBepalerMock)
+	#dim ConfiguratorTypeBepaler As WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.ConfiguratorTypeBepaler = ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.ConfiguratorTypeBepaler).%New(ConfiguratorTypeBepalerMock)
 	
 	Do ConfiguratorTypeBepaler.Bepaal(WebshopSessie)
 	
Index: WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/CheckoutTypeBepaler.cls.xml
===================================================================
diff -u -r33947 -r37181
--- WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/CheckoutTypeBepaler.cls.xml	(.../CheckoutTypeBepaler.cls.xml)	(revision 33947)
+++ WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/CheckoutTypeBepaler.cls.xml	(.../CheckoutTypeBepaler.cls.xml)	(revision 37181)
@@ -9,7 +9,6 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>LocatieAPI:DOM.common.impl.LocatieAPI</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
Index: APPS/EC/impl/ConfiguratorService/KleurenSchemaBepaler.cls.xml
===================================================================
diff -u -r37097 -r37181
--- APPS/EC/impl/ConfiguratorService/KleurenSchemaBepaler.cls.xml	(.../KleurenSchemaBepaler.cls.xml)	(revision 37097)
+++ APPS/EC/impl/ConfiguratorService/KleurenSchemaBepaler.cls.xml	(.../KleurenSchemaBepaler.cls.xml)	(revision 37181)
@@ -24,6 +24,8 @@
 <FormalSpec>PersonalityID:DOM.common.enu.Personality,KlantID:DOM.VKP.KlantID</FormalSpec>
 <ReturnType>APPS.EC.Unishop.enu.KleurenSchema</ReturnType>
 <Implementation><![CDATA[
+	Quit:..IsDaroPersonality(PersonalityID) ##class(APPS.EC.Unishop.enu.KleurenSchema).Donker() 	
+	
 	Quit:..IsGeenVanHoeckePersonality(PersonalityID) ##class(APPS.EC.Unishop.enu.KleurenSchema).Licht() 	
 
 	#dim Klant As DOM.VKP.VanHoeckeKlant = ..VerkoopAPI.GeefKlant(KlantID)
@@ -61,6 +63,14 @@
 <Implementation><![CDATA[	Quit (PersonalityID '= ##class(DOM.common.enu.Personality).VanHoecke())
 ]]></Implementation>
 </Method>
+
+<Method name="IsDaroPersonality">
+<FormalSpec>PersonalityID:DOM.common.enu.Personality</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (PersonalityID = ##class(DOM.common.enu.Personality).Daro())
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/KleurenSchemaBepaler.cls.xml
===================================================================
diff -u -r37095 -r37181
--- WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/KleurenSchemaBepaler.cls.xml	(.../KleurenSchemaBepaler.cls.xml)	(revision 37095)
+++ WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/KleurenSchemaBepaler.cls.xml	(.../KleurenSchemaBepaler.cls.xml)	(revision 37181)
@@ -9,7 +9,7 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>LocatieAPI:DOM.common.impl.LocatieAPI,KleurenSchemaBepaler:APPS.EC.impl.ConfiguratorService.KleurenSchemaBepaler</FormalSpec>
+<FormalSpec>KleurenSchemaBepaler:APPS.EC.impl.ConfiguratorService.KleurenSchemaBepaler</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>