Index: core/units/forms/form_submissions/form_submissions_config.php
===================================================================
--- core/units/forms/form_submissions/form_submissions_config.php
+++ core/units/forms/form_submissions/form_submissions_config.php
@@ -31,7 +31,7 @@
 
 					'Hooks'				=>	Array(
 											Array(
-												'Mode' => hAFTER,
+												'Mode' => hBEFORE,
 												'Conditional' => false,
 												'HookToPrefix' => '',
 												'HookToSpecial' => '*',
@@ -43,7 +43,7 @@
 
 											// Captcha processing
 											Array (
-												'Mode' => hAFTER,
+												'Mode' => hBEFORE,
 												'Conditional' => false,
 												'HookToPrefix' => '',
 												'HookToSpecial' => '*',
@@ -164,4 +164,4 @@
 							),
 						),
 					),
-	);
\ No newline at end of file
+	);
Index: core/units/forms/forms/forms_config.php
===================================================================
--- core/units/forms/forms/forms_config.php
+++ core/units/forms/forms/forms_config.php
@@ -37,7 +37,7 @@
 
 					'Hooks'				=>	Array(
 											Array(
-												'Mode' => hAFTER,
+												'Mode' => hBEFORE,
 												'Conditional' => false,
 												'HookToPrefix' => 'form', //self
 												'HookToSpecial' => '*',
@@ -222,4 +222,4 @@
 							),
 						),
 					),
-		);
\ No newline at end of file
+		);
Index: core/units/users/users_config.php
===================================================================
--- core/units/users/users_config.php
+++ core/units/users/users_config.php
@@ -62,7 +62,7 @@
 
 						// Captcha processing
 						Array (
-							'Mode' => hAFTER,
+							'Mode' => hBEFORE,
 							'Conditional' => false,
 							'HookToPrefix' => '',
 							'HookToSpecial' => '*',
@@ -662,4 +662,4 @@
 						),
 					),
 
-	);
\ No newline at end of file
+	);
Index: modules/custom/units/sections/sections_config.php
===================================================================
--- modules/custom/units/sections/sections_config.php
+++ modules/custom/units/sections/sections_config.php
@@ -76,7 +76,7 @@
 
 			# hook to category OnAfterConfigRead event called to customize category configuration settings
 			/*Array (
-				'Mode' => hAFTER,
+				'Mode' => hBEFORE,
 				'Conditional' => false,
 				'HookToPrefix' => 'c',
 				'HookToSpecial' => '*',
@@ -127,4 +127,4 @@
 			),
 		),
 
-	);
\ No newline at end of file
+	);
Index: modules/in-auction/units/category_listing/category_listing_config.php
===================================================================
--- modules/in-auction/units/category_listing/category_listing_config.php
+++ modules/in-auction/units/category_listing/category_listing_config.php
@@ -23,7 +23,7 @@
 					'Hooks'				=>	Array(
 
 							Array(
-								'Mode' => hAFTER,
+								'Mode' => hBEFORE,
 								'Conditional' => false,
 								'HookToPrefix' => '#PARENT#',
 								'HookToSpecial' => '*',
@@ -330,4 +330,4 @@
 			            ),
 
 					),
-	);
\ No newline at end of file
+	);
Index: modules/in-auction/units/product_listing/product_listing_config.php
===================================================================
--- modules/in-auction/units/product_listing/product_listing_config.php
+++ modules/in-auction/units/product_listing/product_listing_config.php
@@ -23,7 +23,7 @@
 					'Hooks'				=>	Array (
 
 							Array (
-								'Mode' => hAFTER,
+								'Mode' => hBEFORE,
 								'Conditional' => false,
 								'HookToPrefix' => '#PARENT#',
 								'HookToSpecial' => '*',
Index: modules/in-auction/units/sections/ebay_eh.php
===================================================================
--- modules/in-auction/units/sections/ebay_eh.php
+++ modules/in-auction/units/sections/ebay_eh.php
@@ -45,7 +45,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnAfterProductConfigRead($event)
+		protected function OnModifyProductsConfig(kEvent $event)
 		{
 			$a_fields = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'Fields');
 
@@ -135,7 +135,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnAfterCategoryConfigRead($event)
+		protected function OnModifyCategoriesConfig(kEvent $event)
 		{
 			$edit_tab_presets = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'EditTabPresets');
 			$edit_tab_presets['Default']['ebay'] = Array (
@@ -3889,4 +3889,4 @@
 					WHERE VariableName =\'eBay_'.$mode.'_'.$key.'\'';
 			$this->Conn->Query($sql);
 		}
-	}
\ No newline at end of file
+	}
Index: modules/in-auction/units/sections/sections_config.php
===================================================================
--- modules/in-auction/units/sections/sections_config.php
+++ modules/in-auction/units/sections/sections_config.php
@@ -64,7 +64,7 @@
 							),
 
 							Array (
-								'Mode' => hAFTER,
+								'Mode' => hBEFORE,
 								'Conditional' => false,
 								'HookToPrefix' => 'u',
 								'HookToSpecial' => '*',
@@ -119,25 +119,25 @@
 							),
 
 							Array (
-								'Mode' => hAFTER,
+								'Mode' => hBEFORE,
 								'Conditional' => false,
 								'HookToPrefix' => 'p',
 								'HookToSpecial' => '*',
 								'HookToEvent' => Array('OnAfterConfigRead'),
 								'DoPrefix' => '',
 								'DoSpecial' => '*',
-								'DoEvent' => 'OnAfterProductConfigRead',
+								'DoEvent' => 'OnModifyProductsConfig',
 							),
 
 							Array(
-								'Mode' => hAFTER,
+								'Mode' => hBEFORE,
 								'Conditional' => false,
 								'HookToPrefix' => 'c',
 								'HookToSpecial' => '*',
 								'HookToEvent' => Array('OnAfterConfigRead'),
 								'DoPrefix' => '',
 								'DoSpecial' => '*',
-								'DoEvent' => 'OnAfterCategoryConfigRead',
+								'DoEvent' => 'OnModifyCategoriesConfig',
 							),
 
 							Array(
@@ -230,4 +230,4 @@
 //						'in-commerce/products/products_tabs' => 'in-auction/products/products_tabs',
 					),
 
-	);
\ No newline at end of file
+	);
Index: modules/in-commerce/units/addresses/addresses_config.php
===================================================================
--- modules/in-commerce/units/addresses/addresses_config.php
+++ modules/in-commerce/units/addresses/addresses_config.php
@@ -45,7 +45,7 @@
 													'DoEvent' => 'OnUpdateProfileAddress',
 												),
 												Array (
-													'Mode' => hAFTER,
+													'Mode' => hBEFORE,
 													'Conditional' => false,
 													'HookToPrefix' => '#PARENT#',
 													'HookToSpecial' => '*',
@@ -155,4 +155,4 @@
 							),
 						),
 					),
-	);
\ No newline at end of file
+	);
Index: modules/in-commerce/units/products/products_config.php
===================================================================
--- modules/in-commerce/units/products/products_config.php
+++ modules/in-commerce/units/products/products_config.php
@@ -63,7 +63,7 @@
 						),
 
 						Array (
-							'Mode' => hAFTER,
+							'Mode' => hBEFORE,
 							'Conditional' => false,
 							'HookToPrefix' => 'lst',
 							'HookToSpecial' => '*',
Index: modules/in-commerce/units/reports/reports_config.php
===================================================================
--- modules/in-commerce/units/reports/reports_config.php
+++ modules/in-commerce/units/reports/reports_config.php
@@ -31,7 +31,7 @@
 
 					'Hooks' => Array(
 						Array(
-							'Mode' => hAFTER,
+							'Mode' => hBEFORE,
 							'Conditional' => false,
 							'HookToPrefix' => 'rep',
 							'HookToSpecial' => '*',
@@ -130,4 +130,4 @@
 
 													),
 								),
-	);
\ No newline at end of file
+	);
Index: modules/in-commerce/units/sections/sections_config.php
===================================================================
--- modules/in-commerce/units/sections/sections_config.php
+++ modules/in-commerce/units/sections/sections_config.php
@@ -21,7 +21,7 @@
 
 		'Hooks' => Array (
 			Array (
-				'Mode' => hAFTER,
+				'Mode' => hBEFORE,
 				'Conditional' => false,
 				'HookToPrefix' => 'site-domain',
 				'HookToSpecial' => '*',
Index: modules/in-link/units/link_validation/link_validation_config.php
===================================================================
--- modules/in-link/units/link_validation/link_validation_config.php
+++ modules/in-link/units/link_validation/link_validation_config.php
@@ -25,7 +25,7 @@
 
 		'Hooks' => Array (
 			Array (
-				'Mode' => hAFTER,
+				'Mode' => hBEFORE,
 				'Conditional' => true,
 				'HookToPrefix' => 'l',
 				'HookToSpecial' => '*',
@@ -168,4 +168,4 @@
 				),
 			),
 		),
-	);
\ No newline at end of file
+	);
Index: modules/in-link/units/links/links_config.php
===================================================================
--- modules/in-link/units/links/links_config.php
+++ modules/in-link/units/links/links_config.php
@@ -108,7 +108,7 @@
 						),
 
 						Array (
-							'Mode' => hAFTER,
+							'Mode' => hBEFORE,
 							'Conditional' => false,
 							'HookToPrefix' => '',
 							'HookToSpecial' => '*',
@@ -650,4 +650,4 @@
 												'RatingDelayInterval'	=>	'link_RatingDelay_Interval',
 
 										),
-	);
\ No newline at end of file
+	);
Index: modules/in-news/units/articles/articles_config.php
===================================================================
--- modules/in-news/units/articles/articles_config.php
+++ modules/in-news/units/articles/articles_config.php
@@ -30,7 +30,7 @@
 
 					'Hooks' => Array (
 						Array (
-							'Mode' => hAFTER,
+							'Mode' => hBEFORE,
 							'Conditional' => false,
 							'HookToPrefix' => 'c',
 							'HookToSpecial' => '*',
@@ -568,4 +568,4 @@
 												'RatingDelayValue'		=>	'News_RatingDelay_Value',
 												'RatingDelayInterval'	=>	'News_RatingDelay_Interval',
 										),
-			);
\ No newline at end of file
+			);