Index: branches/5.0.x/themes/default/designs/form.tpl
===================================================================
diff -u -r12862 -r12876
--- branches/5.0.x/themes/default/designs/form.tpl	(.../form.tpl)	(revision 12862)
+++ branches/5.0.x/themes/default/designs/form.tpl	(.../form.tpl)	(revision 12876)
@@ -32,6 +32,8 @@
 						<div class="bg-contacts-down">
 
 							<form method="post" action="<inp2:m_Link m_cat_id="0" m_cat_page="1"/>">
+							<inp2:formsubs_PresetFormFields/>
+
 							<inp2:m_if check="formsubs_HasError" field="any">
 								<p class="red"><inp2:m_RenderElement name="error_message" /></p>
 							</inp2:m_if>
@@ -60,9 +62,11 @@
 		</div>
 
 		<script type="text/javascript">
-			$(document).ready(function() {
-				$('div.text').addClass('contacts');
-			});
+			$(document).ready(
+				function() {
+					$('div.text').addClass('contacts');
+				}
+			);
 		</script>
 	</inp2:m_RenderElement>
 
Index: branches/5.0.x/core/units/form_submissions/form_submissions_eh.php
===================================================================
diff -u -r12734 -r12876
--- branches/5.0.x/core/units/form_submissions/form_submissions_eh.php	(.../form_submissions_eh.php)	(revision 12734)
+++ branches/5.0.x/core/units/form_submissions/form_submissions_eh.php	(.../form_submissions_eh.php)	(revision 12876)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: form_submissions_eh.php 12734 2009-10-20 19:28:11Z alex $
+* @version	$Id: form_submissions_eh.php 12876 2009-11-03 15:23:37Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -126,17 +126,31 @@
 			return parent::getPassedID($event);
 		}
 
+		/**
+		 * Creates new form submission from Front-End
+		 *
+		 * @param kEvent $event
+		 */
 		function OnCreate(&$event)
 		{
 			parent::OnCreate($event);
-			if ($event->status == erSUCCESS) {
 
-				$this->Application->EmailEventAdmin('FORM.SUBMITTED');
-				//$this->Application->EmailEventUser('FORM.SUBMITTED', null, 'to_email' = )
-
-				$event->redirect_params['opener'] = 's';
-				$event->redirect_params['m_cat_id'] = 0;
-				$event->redirect = $this->Application->GetVar('success_template');
+			if ($event->status != erSUCCESS) {
+				return ;
 			}
+
+			$this->Application->EmailEventAdmin('FORM.SUBMITTED');
+//			$this->Application->EmailEventUser('FORM.SUBMITTED', null, 'to_email' => '');
+
+			$event->SetRedirectParam('opener', 's');
+			$event->SetRedirectParam('m_cat_id', 0);
+
+			$theme =& $this->Application->recallObject('theme.current');
+			/* @var $theme kDBItem */
+
+			$template = $this->Application->GetVar('success_template');
+			$alias_template = $theme->GetField('TemplateAliases', $template);
+
+			$event->redirect = $alias_template ? $alias_template : $template;
 		}
 	}
\ No newline at end of file
Index: branches/5.0.x/themes/advanced/_install/theme.xml
===================================================================
diff -u -r12808 -r12876
--- branches/5.0.x/themes/advanced/_install/theme.xml	(.../theme.xml)	(revision 12808)
+++ branches/5.0.x/themes/advanced/_install/theme.xml	(.../theme.xml)	(revision 12876)
@@ -1,3 +1,5 @@
 <theme>
 	<default_design>platform/designs/general</default_design>
+	<form_design>platform/designs/form</form_design>
+	<form_thankyou>platform/thankyou</form_thankyou>
 </theme>
\ No newline at end of file
Index: branches/5.0.x/themes/simple/_install/theme.xml
===================================================================
diff -u -r12847 -r12876
--- branches/5.0.x/themes/simple/_install/theme.xml	(.../theme.xml)	(revision 12847)
+++ branches/5.0.x/themes/simple/_install/theme.xml	(.../theme.xml)	(revision 12876)
@@ -1,3 +1,5 @@
 <theme>
 	<default_design>designs/general</default_design>
+	<form_design>designs/form</form_design>
+	<form_thankyou>thankyou</form_thankyou>
 </theme>
\ No newline at end of file
Index: branches/5.0.x/themes/default/_install/theme.xml
===================================================================
diff -u -r12862 -r12876
--- branches/5.0.x/themes/default/_install/theme.xml	(.../theme.xml)	(revision 12862)
+++ branches/5.0.x/themes/default/_install/theme.xml	(.../theme.xml)	(revision 12876)
@@ -1,3 +1,5 @@
 <theme>
 	<default_design>designs/general</default_design>
+	<form_design>designs/form</form_design>
+	<form_thankyou>thankyou</form_thankyou>
 </theme>
\ No newline at end of file