Index: CHUI/Sys/Toegang/MainForm.cls.xml
===================================================================
diff -u -r1074 -r2578
--- CHUI/Sys/Toegang/MainForm.cls.xml	(.../MainForm.cls.xml)	(revision 1074)
+++ CHUI/Sys/Toegang/MainForm.cls.xml	(.../MainForm.cls.xml)	(revision 2578)
@@ -3,8 +3,7 @@
 <Class name="CHUI.Sys.Toegang.MainForm">
 <IncludeCode>BL.Sys.Toegang</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%CHUI.TForm</Super>
-<ClassDefinitionError>0</ClassDefinitionError>
+<Super>TCHUI.TForm</Super>
 
 <UDLText name="T">
 <Content><![CDATA[
@@ -18,15 +17,15 @@
 ==========================================================================================================================
 PROPERTIES                                                                                                               .
 ==========================================================================================================================</Description>
-<Type>%CHUI.TLabel</Type>
+<Type>TCHUI.TLabel</Type>
 </Property>
 
 <Property name="lblLabel2">
-<Type>%CHUI.TLabel</Type>
+<Type>TCHUI.TLabel</Type>
 </Property>
 
 <Property name="lblLabel1">
-<Type>%CHUI.TLabel</Type>
+<Type>TCHUI.TLabel</Type>
 </Property>
 
 <UDLText name="T">
@@ -37,11 +36,11 @@
 </UDLText>
 
 <Property name="btnButton2">
-<Type>%CHUI.TButton</Type>
+<Type>TCHUI.TButton</Type>
 </Property>
 
 <Property name="btnButton1">
-<Type>%CHUI.TButton</Type>
+<Type>TCHUI.TButton</Type>
 </Property>
 
 <UDLText name="T">
@@ -52,11 +51,11 @@
 </UDLText>
 
 <Property name="pmGebruiker">
-<Type>%CHUI.TPopup</Type>
+<Type>TCHUI.TPopup</Type>
 </Property>
 
 <Property name="pmPopup1">
-<Type>%CHUI.TPopup</Type>
+<Type>TCHUI.TPopup</Type>
 </Property>
 
 <Method name="CreateControls">
@@ -70,9 +69,9 @@
 	Set ..Caption="NewApplication"
 
 	//Labels
-	Do ##class(%CHUI.TLabel).CreateSet(%this,"lblLabel1","Gebruiker",2,3,,,$$$alLeft,,,$LB(,,$$$fsNoUnderline))
+	Do ##class(TCHUI.TLabel).CreateSet(%this,"lblLabel1","Gebruiker",2,3,,,$$$alLeft,,,$LB(,,$$$fsNoUnderline))
 
-	Set ..pmGebruiker=##class(%CHUI.TPopup).Create(%this,"pmGebruiker","Toegang",2,14,8,40)
+	Set ..pmGebruiker=##class(TCHUI.TPopup).Create(%this,"pmGebruiker","Toegang",2,14,8,40)
 	Do ..pmGebruiker.InitSpec(,,,10)
 	Set ..pmGebruiker.opMultiSelect=1
 	Set ..pmGebruiker.opShowText=1
@@ -86,16 +85,16 @@
 	. Do ..pmGebruiker.AddItem(Initials,UserName)
 	Do ..pmGebruiker.DefaultFrames()
 
-	Do ##class(%CHUI.TLabel).CreateSet(%this,"lblLabel3","Toegang",12,3,,,$$$alLeft,,,$LB(,,$$$fsNoUnderline))
+	Do ##class(TCHUI.TLabel).CreateSet(%this,"lblLabel3","Toegang",12,3,,,$$$alLeft,,,$LB(,,$$$fsNoUnderline))
 
 	//Buttons
-	Do ##class(%CHUI.TButton).CreateSet(%this,"btnButton1","Ok",21,28,,7,,,,,$$$alCenter)
+	Do ##class(TCHUI.TButton).CreateSet(%this,"btnButton1","Ok",21,28,,7,,,,,$$$alCenter)
 	Set ..btnButton1.OnClick=$LB(%this,"btnButton1Click")
-	Do ##class(%CHUI.TButton).CreateSet(%this,"btnButton2","Annuleren",21,17,,9,,,,,$$$alCenter)
+	Do ##class(TCHUI.TButton).CreateSet(%this,"btnButton2","Annuleren",21,17,,9,,,,,$$$alCenter)
 	Set ..btnButton2.OnClick=$LB(%this,"btnButton2Click")
 
 	//Popups
-	Set ..pmPopup1=##class(%CHUI.TPopup).Create(%this,"pmPopup1","Toegang",12,14,8,40)
+	Set ..pmPopup1=##class(TCHUI.TPopup).Create(%this,"pmPopup1","Toegang",12,14,8,40)
 	Do ..pmPopup1.InitSpec(,,,10)
 	Set ..pmPopup1.opMultiSelect=1
 	Set ..pmPopup1.opShowText=1
@@ -114,13 +113,13 @@
 ==========================================================================================================================
 EVENTs                                                                                                                   .
 ==========================================================================================================================</Description>
-<FormalSpec>Sender:%CHUI.TControlBasis</FormalSpec>
+<FormalSpec>Sender:TCHUI.TControlBasis</FormalSpec>
 <Implementation><![CDATA[	Do ..Close()
 ]]></Implementation>
 </Method>
 
 <Method name="btnButton1Click">
-<FormalSpec>Sender:%CHUI.TControlBasis</FormalSpec>
+<FormalSpec>Sender:TCHUI.TControlBasis</FormalSpec>
 <Implementation><![CDATA[
 	Set lbUser=..pmGebruiker.Selected