Index: branches/RC/themes/default2009/index.tpl
===================================================================
diff -u -N -r11462 -r11468
--- branches/RC/themes/default2009/index.tpl	(.../index.tpl)	(revision 11462)
+++ branches/RC/themes/default2009/index.tpl	(.../index.tpl)	(revision 11468)
@@ -47,7 +47,7 @@
 
 	<div class="movable-element">
 		<!--## INCLUDE HOME PAGE ELEMENTS FOR EACH MODULE ##-->
-		<inp2:m_ModuleInclude template="elements/content_boxes/home_page_items" data_exists="1"/>
+		<inp2:m_ModuleInclude template="elements/content_boxes/home_page_items.elm" data_exists="1"/>
 		<!--## /HOME PAGE ELEMENTS ##-->
 	</div>
 </inp2:m_DefineElement>
Index: branches/RC/themes/default2009/platform/my_account/my_favorites.tpl
===================================================================
diff -u -N -r11462 -r11468
--- branches/RC/themes/default2009/platform/my_account/my_favorites.tpl	(.../my_favorites.tpl)	(revision 11462)
+++ branches/RC/themes/default2009/platform/my_account/my_favorites.tpl	(.../my_favorites.tpl)	(revision 11468)
@@ -19,7 +19,7 @@
 
 	<!-- my favorites -->
 	<inp2:m_Set favorites_found="0"/>
-	<inp2:m_ModuleInclude template="elements/content_boxes/my_favorites"/>
+	<inp2:m_ModuleInclude template="elements/content_boxes/my_favorites.elm."/>
 
 	<inp2:m_if check="m_GetEquals" var="favorites_found" value="0">
 		<inp2:m_include template="platform/elements/content_boxes/no_favorites.elm"/>
Index: branches/RC/themes/default2009/platform/elements/side_boxes/login.elm.tpl
===================================================================
diff -u -N -r11462 -r11468
--- branches/RC/themes/default2009/platform/elements/side_boxes/login.elm.tpl	(.../login.elm.tpl)	(revision 11462)
+++ branches/RC/themes/default2009/platform/elements/side_boxes/login.elm.tpl	(.../login.elm.tpl)	(revision 11468)
@@ -49,9 +49,9 @@
 		<inp2:m_RenderElement name="box_element" template="platform/my_account/my_preferences" title="lu_MyPreferences"/>
 		<!-- /SHOW MY PREFERENCES -->
 
-		<!-- INCLUDE "themes/default2007/[MODULE_NAME]/my_account/my_items.tpl" FOR EACH INSTALLED MODULE -->
-		<inp2:m_ModuleInclude template="my_account/my_items" place="sidebox" section="1"/>
-		<!-- /INCLUDE "themes/[MODULE_NAME]/my_account/my_items.tpl" FOR EACH INSTALLED MODULE -->
+		<!-- INCLUDE "themes/default2007/[MODULE_NAME]/my_account/my_items.elm.tpl" FOR EACH INSTALLED MODULE -->
+		<inp2:m_ModuleInclude template="my_account/my_items.elm" place="sidebox" section="1"/>
+		<!-- /INCLUDE "themes/[MODULE_NAME]/my_account/my_items.elm.tpl" FOR EACH INSTALLED MODULE -->
 
 		<tr>
 			<td>
@@ -74,7 +74,7 @@
 			</td>
 		</tr>
 
-		<inp2:m_ModuleInclude template="my_account/my_items" place="sidebox" section="2"/>
+		<inp2:m_ModuleInclude template="my_account/my_items.elm" place="sidebox" section="2"/>
 	</table>
 
 <!-- /IF LOGGED -->
Index: branches/RC/themes/default2009/platform/inc/captcha_image.elm.tpl
===================================================================
diff -u -N
--- branches/RC/themes/default2009/platform/inc/captcha_image.elm.tpl	(revision 0)
+++ branches/RC/themes/default2009/platform/inc/captcha_image.elm.tpl	(revision 11468)
@@ -0,0 +1 @@
+<inp2:m_NoDebug/><inp2:m_CaptchaImage />
\ No newline at end of file
Index: branches/RC/themes/default2009/platform/my_account/my_account.tpl
===================================================================
diff -u -N -r11462 -r11468
--- branches/RC/themes/default2009/platform/my_account/my_account.tpl	(.../my_account.tpl)	(revision 11462)
+++ branches/RC/themes/default2009/platform/my_account/my_account.tpl	(.../my_account.tpl)	(revision 11468)
@@ -41,7 +41,7 @@
 			<inp2:m_RenderElement name="my_account_element" template="platform/my_account/my_favorites" title="lu_MyFavorites" description="lu_description_MyFavorites" icon_image="platform/img/ic_myfavorites46.gif"/>
 			<inp2:m_RenderElement name="my_account_element" template="platform/my_account/my_preferences" title="lu_MyPreferences" description="lu_description_MyPreferences" icon_image="platform/img/ic_mypreferences46.gif"/>
 
-			<inp2:m_ModuleInclude template="my_account/my_items" place="contentbox" section="1"/>
+			<inp2:m_ModuleInclude template="my_account/my_items.elm" place="contentbox" section="1"/>
 		</table>
 	</inp2:m_RenderElement>
 	<!-- // my account -->
@@ -53,7 +53,7 @@
 		</inp2:m_Capture>
 
 		<table>
-			<inp2:m_ModuleInclude template="my_account/my_items" place="contentbox" section="2"/>
+			<inp2:m_ModuleInclude template="my_account/my_items.elm" place="contentbox" section="2"/>
 		</table>
 	</inp2:m_RenderElement>
 	<!-- // my items -->
Index: branches/RC/themes/default2009/platform/elements/forms.elm.tpl
===================================================================
diff -u -N -r11462 -r11468
--- branches/RC/themes/default2009/platform/elements/forms.elm.tpl	(.../forms.elm.tpl)	(revision 11462)
+++ branches/RC/themes/default2009/platform/elements/forms.elm.tpl	(.../forms.elm.tpl)	(revision 11468)
@@ -348,7 +348,7 @@
 			<inp2:m_if check="{$prefix}_HasError" field="Captcha">
 				<span class="field-error"><inp2:{$prefix}_Error field="Captcha"/></span><br />
 			</inp2:m_if>
-			<img src="<inp2:m_Link template="platform/inc/captcha_image" var="{$prefix}_captcha_code" w="150" h="30"/>" alt="<inp2:m_Phrase name="$title"/>"/><br />
+			<img src="<inp2:m_Link template="platform/inc/captcha_image.elm" var="{$prefix}_captcha_code" w="150" h="30"/>" alt="<inp2:m_Phrase name="$title"/>"/><br />
 			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="5" alt=""/><br />
 			<input type="text" class="input-text" name="<inp2:{$prefix}_InputName field="Captcha"/>" value="<inp2:{$prefix}_Field field="Captcha"/>" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_Param name="style"/>">
 		</td>
Index: branches/RC/themes/default2009/platform/inc/captcha_image.tpl
===================================================================
diff -u -N
--- branches/RC/themes/default2009/platform/inc/captcha_image.tpl	(revision 11337)
+++ branches/RC/themes/default2009/platform/inc/captcha_image.tpl	(revision 0)
@@ -1 +0,0 @@
-<inp2:m_NoDebug/><inp2:m_CaptchaImage />
\ No newline at end of file
Index: branches/RC/themes/default2009/platform/search/search_results.tpl
===================================================================
diff -u -N -r11462 -r11468
--- branches/RC/themes/default2009/platform/search/search_results.tpl	(.../search_results.tpl)	(revision 11462)
+++ branches/RC/themes/default2009/platform/search/search_results.tpl	(.../search_results.tpl)	(revision 11468)
@@ -17,7 +17,7 @@
 	<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_SearchResults" templates="platform/search/search_results"/>
 
 	<inp2:m_Set items_found="0"/>
-	<inp2:m_ModuleInclude template="elements/content_boxes/search_results"/>
+	<inp2:m_ModuleInclude template="elements/content_boxes/search_results.elm"/>
 
 	<inp2:m_if check="m_GetEquals" var="items_found" value="0">
 		<inp2:m_include template="platform/elements/content_boxes/nothing_found.elm"/>