Index: branches/1.2.x/in-bulletin/elements/side_boxes/polls.elm.tpl
===================================================================
diff -u -N -r14274 -r15796
--- branches/1.2.x/in-bulletin/elements/side_boxes/polls.elm.tpl	(.../polls.elm.tpl)	(revision 14274)
+++ branches/1.2.x/in-bulletin/elements/side_boxes/polls.elm.tpl	(.../polls.elm.tpl)	(revision 15796)
@@ -17,9 +17,10 @@
 		<strong><inp2:Field name="Question"/></strong>
 	</div>
 	<inp2:m_if check="Field" name="Image">
-	<br/>
-		<a href="<inp2:Field name="Image" format="resize:640x480"/>" class="thickbox" title="<inp2:Field field="Question"/>">
-			<img src="<inp2:Field name="Image" format="resize:100x100"/>" border="0" alt="<inp2:Field field="Question"/>"></a>
+		<br/>
+		<a href="<inp2:Field name='Image' format='resize:640x480'/>" class="form-manager-window" title="<inp2:Field field='Question'/>">
+			<img src="<inp2:Field name='Image' format='resize:100x100'/>" border="0" alt="<inp2:Field field='Question'/>">
+		</a>
 	</inp2:m_if>
 
 	<div id="pollvote_<inp2:Field name="PollId"/>" style="text-align:left; margin-top:10px; margin-bottom:10px">
@@ -50,9 +51,9 @@
 	<inp2:m_if check="Field" name="AllowComments">
 	<div style="text-align:center;">
 		<inp2:m_ifnot check="HasCommented">
-			<a href="<inp2:CommentsLink t="in-bulletin/elements/content_boxes/add_poll_comment.elm" height="480" width="480"/>" title="<inp2:Field name="Question"/>" class="thickbox"/><inp2:m_phrase name="lu_title_AddComment"/></a><br>
+			<a href="<inp2:CommentsLink t='in-bulletin/elements/content_boxes/add_poll_comment.elm' height='480' width='480'/>" title="<inp2:Field name='Question'/>" class="form-manager-window"/><inp2:m_phrase name="lu_title_AddComment"/></a><br>
 		</inp2:m_ifnot>
-		<a href="<inp2:CommentsLink t="in-bulletin/elements/content_boxes/poll_comments.elm" height="480" width="480"/>" title="<inp2:Field name="Question"/>" class="thickbox"/><inp2:m_phrase name="lu_title_ViewComments"/></a>
+		<a href="<inp2:CommentsLink t='in-bulletin/elements/content_boxes/poll_comments.elm' height='480' width='480'/>" title="<inp2:Field name='Question'/>" class="form-manager-window"/><inp2:m_phrase name="lu_title_ViewComments"/></a>
 	</div>
 	</inp2:m_if>
 	<!--## //USER COMMENTS ##-->
Index: branches/1.2.x/in-bulletin/elements/content_boxes/poll_comments.elm.tpl
===================================================================
diff -u -N -r14274 -r15796
--- branches/1.2.x/in-bulletin/elements/content_boxes/poll_comments.elm.tpl	(.../poll_comments.elm.tpl)	(revision 14274)
+++ branches/1.2.x/in-bulletin/elements/content_boxes/poll_comments.elm.tpl	(.../poll_comments.elm.tpl)	(revision 15796)
@@ -1,26 +1,28 @@
 <inp2:m_DefineElement name="content">
 
 		<inp2:m_DefineElement name="poll_comment_element">
-		<li style="margin-bottom: 10px;">
-			<inp2:Field name="CommentBody"/>
-			<inp2:Field name="CreatedOn"/>
-			<inp2:Field name="GuestEmail"/>
-			<inp2:Field name="GuestName"/>
-			<inp2:Field name="CreatedById"/>
-		</li>
+			<li style="margin-bottom: 10px;">
+				<inp2:Field name="CommentBody"/>
+				<inp2:Field name="CreatedOn"/>
+				<inp2:Field name="GuestEmail"/>
+				<inp2:Field name="GuestName"/>
+				<inp2:Field name="CreatedById"/>
+			</li>
 		</inp2:m_DefineElement>
 		<br/>
 
-		<inp2:poll-comment_InitList list_name="list_comments" direction="H" sort_by="CreatedOn,Desc" requery="1"/>
+		<inp2:poll-comment_InitList list_name="list_comments" sort_by="CreatedOn,Desc"/>
 
-		<inp2:m_if check="poll-comment_TotalRecords list_name="list_comments">
+		<inp2:m_if check="poll-comment_TotalRecords" list_name="list_comments">
 			<ul>
 				<inp2:poll-comment_PrintList list_name="list_comments" render_as="poll_comment_element" direction="H"/>
 			</ul>
 		<inp2:m_else/>
-		<div align="center">
-			<a href="<inp2:poll_CommentsLink t="in-bulletin/elements/content_boxes/add_poll_comment.elm"/>?height=640&width=480" title="<inp2:poll_Field name="Question"/>" class="thickbox"><inp2:m_phrase name="lu_text_NoComments"/></a>
-		</div>
+			<div style="text-align: center;">
+				<a href="<inp2:poll_CommentsLink t='in-bulletin/elements/content_boxes/add_poll_comment.elm' width='480' height='640'/>" title="<inp2:poll_Field name='Question'/>" class="form-manager-window">
+					<inp2:m_phrase name="lu_text_NoComments"/>
+				</a>
+			</div>
 		</inp2:m_if>
 </inp2:m_DefineElement>
 
Index: branches/1.2.x/in-news/articles/article_detail.tpl
===================================================================
diff -u -N -r15388 -r15796
--- branches/1.2.x/in-news/articles/article_detail.tpl	(.../article_detail.tpl)	(revision 15388)
+++ branches/1.2.x/in-news/articles/article_detail.tpl	(.../article_detail.tpl)	(revision 15796)
@@ -29,7 +29,7 @@
 <!--## ADDITIONAL IMAGE ELEMENT ##-->
 <inp2:m_DefineElement name="additional_image_element">
 	<td>
-		<a href="<inp2:ImageSrc MaxWidth="fullsize"/>" class="thickbox" rel="article-images" title="<inp2:m_param name="alt"/>">
+		<a href="<inp2:ImageSrc MaxWidth='fullsize'/>" class="form-manager-window" rel="article-images" title="<inp2:m_param name='alt'/>">
 			<img src="<inp2:m_param name="img_path"/>" title="<inp2:m_param name="alt"/>" alt="<inp2:m_param name="alt"/>" <inp2:m_param name="img_size"/> border="0" /><br />
 		</a>
 	</td>
@@ -98,7 +98,7 @@
 								<inp2:m_if check="n_Field" name="cust_RssOriginalURL" inverse="1">
 								<td class="picture-padding" style="padding-left:25px" valign="top">
 									<inp2:m_if check="n_ImageSrc" MaxWidth="fullsize">
-										<a href="<inp2:n_ImageSrc MaxWidth="fullsize" DefaultImage="platform/img/no_picture.gif"/>" class="thickbox" rel="article-images" title="<inp2:n_Field name='PrimaryImageAlt' html_escape='1'/>">
+										<a href="<inp2:n_ImageSrc MaxWidth='fullsize' DefaultImage='platform/img/no_picture.gif'/>" class="form-manager-window" rel="article-images" title="<inp2:n_Field name='PrimaryImageAlt' html_escape='1'/>">
 											<inp2:n_Image render_as="image_element" Primary="1" MaxWidth="thumbnail" DefaultWidth="150" DefaultImage="platform/img/no_picture.gif"/><br />
 										</a>
 									<inp2:m_else/>
Index: branches/1.2.x/in-link/links/add_review.tpl
===================================================================
diff -u -N -r14834 -r15796
--- branches/1.2.x/in-link/links/add_review.tpl	(.../add_review.tpl)	(revision 14834)
+++ branches/1.2.x/in-link/links/add_review.tpl	(.../add_review.tpl)	(revision 15796)
@@ -76,7 +76,7 @@
 					<tr>
 						<td class="picture-padding" style="padding-left:25px" valign="top">
 							<inp2:m_if check="l_ImageSrc" MaxWidth="fullsize">
-							<a href="<inp2:l_ImageSrc MaxWidth="fullsize" />" class="thickbox" rel="link-images" title="<inp2:l_Field name='Name' html_escape='1'/>">
+							<a href="<inp2:l_ImageSrc MaxWidth='fullsize' />" class="form-manager-window" rel="link-images" title="<inp2:l_Field name='Name' html_escape='1'/>">
 								<inp2:l_Image render_as="image_element" Primary="1" MaxWidth="thumbnail" DefaultImage="platform/img/no_picture.gif" /><br />
 							</a>
 							<inp2:m_else/>
Index: branches/1.2.x/in-link/links/link_paid.tpl
===================================================================
diff -u -N -r15388 -r15796
--- branches/1.2.x/in-link/links/link_paid.tpl	(.../link_paid.tpl)	(revision 15388)
+++ branches/1.2.x/in-link/links/link_paid.tpl	(.../link_paid.tpl)	(revision 15796)
@@ -79,7 +79,7 @@
 								<tr>
 									<td class="picture-padding" style="padding-left:25px" valign="top">
 										<inp2:m_if check="l_ImageSrc" MaxWidth="fullsize">
-										<a href="<inp2:l_ImageSrc MaxWidth="fullsize" />" class="thickbox" rel="link-images" title="<inp2:l_Field name='Name' html_escape='1'/>">
+										<a href="<inp2:l_ImageSrc MaxWidth='fullsize' />" class="form-manager-window" rel="link-images" title="<inp2:l_Field name='Name' html_escape='1'/>">
 											<inp2:l_Image render_as="image_element" Primary="1" MaxWidth="thumbnail" DefaultWidth="150" DefaultImage="platform/img/no_picture.gif" /><br />
 										</a>
 										<inp2:m_else/>
@@ -107,7 +107,7 @@
 								<!--## ADDITIONAL IMAGE ELEMENT ##-->
 								<inp2:m_DefineElement name="additional_image_element">
 									<td>
-										<a href="<inp2:ImageSrc MaxWidth="fullsize"/>" class="thickbox" rel="link-images" title="<inp2:m_param name="alt"/>">
+										<a href="<inp2:ImageSrc MaxWidth='fullsize'/>" class="form-manager-window" rel="link-images" title="<inp2:m_param name='alt'/>">
 											<img src="<inp2:m_param name="img_path"/>" title="<inp2:m_param name="alt"/>" alt="<inp2:m_param name="alt"/>" <inp2:m_param name="img_size"/> border="0" /><br />
 										</a>
 									</td>
Index: branches/1.2.x/in-link/links/link_standard.tpl
===================================================================
diff -u -N -r15388 -r15796
--- branches/1.2.x/in-link/links/link_standard.tpl	(.../link_standard.tpl)	(revision 15388)
+++ branches/1.2.x/in-link/links/link_standard.tpl	(.../link_standard.tpl)	(revision 15796)
@@ -79,7 +79,7 @@
 								<tr>
 									<td class="picture-padding" style="padding-left:25px" valign="top">
 										<inp2:m_if check="l_ImageSrc" MaxWidth="fullsize">
-										<a href="<inp2:l_ImageSrc MaxWidth="fullsize" />" class="thickbox" rel="link-images" title="<inp2:l_Field name='PrimaryImageAlt' html_escape='1'/>">
+										<a href="<inp2:l_ImageSrc MaxWidth='fullsize' />" class="form-manager-window" rel="link-images" title="<inp2:l_Field name='PrimaryImageAlt' html_escape='1'/>">
 											<inp2:l_Image render_as="image_element" Primary="1" MaxWidth="thumbnail" DefaultWidth="150" DefaultImage="platform/img/no_picture.gif" /><br />
 										</a>
 										<inp2:m_else/>
@@ -107,7 +107,7 @@
 								<!--## ADDITIONAL IMAGE ELEMENT ##-->
 								<inp2:m_DefineElement name="additional_image_element">
 									<td>
-										<a href="<inp2:ImageSrc MaxWidth="fullsize"/>" class="thickbox" rel="link-images" title="<inp2:m_param name="alt"/>">
+										<a href="<inp2:ImageSrc MaxWidth='fullsize'/>" class="form-manager-window" rel="link-images" title="<inp2:m_param name='alt'/>">
 											<img src="<inp2:m_param name="img_path"/>" title="<inp2:m_param name="alt"/>" alt="<inp2:m_param name="alt"/>" <inp2:m_param name="img_size"/> border="0" /><br />
 										</a>
 									</td>
Index: branches/1.2.x/in-commerce/products/product_detail.tpl
===================================================================
diff -u -N -r15388 -r15796
--- branches/1.2.x/in-commerce/products/product_detail.tpl	(.../product_detail.tpl)	(revision 15388)
+++ branches/1.2.x/in-commerce/products/product_detail.tpl	(.../product_detail.tpl)	(revision 15796)
@@ -73,7 +73,7 @@
 									<td style="text-align: center; padding-right: 10px;" valign="top">
 										<!--## Check if image exists ##-->
 										<inp2:m_if check="p_ImageSrc" MaxWidth="fullsize">
-											<a href="<inp2:p_ImageSrc DefaultImage="platform/img/no_picture.gif" format="resize:450x450;wm:platform/img/logo_watermark.png|-1|-1"/>" class="thickbox" rel="product-images" title="<inp2:p_Field name='PrimaryImageAlt' html_escape='1'/>">
+											<a href="<inp2:p_ImageSrc DefaultImage='platform/img/no_picture.gif' format='resize:450x450;wm:platform/img/logo_watermark.png|-1|-1'/>" class="form-manager-window" rel="product-images" title="<inp2:p_Field name='PrimaryImageAlt' html_escape='1'/>">
 												<inp2:p_Image render_as="image_element" Primary="1" MaxWidth="thumbnail" DefaultWidth="150" DefaultImage="platform/img/no_picture.gif" align="center"/><br />
 											</a>
 										<!--## Check if image exists ##-->
@@ -237,7 +237,7 @@
 								<!--## ADDITIONAL IMAGE ELEMENT ##-->
 								<inp2:m_DefineElement name="additional_image_element">
 									<td>
-										<a href="<inp2:ImageSrc format="resize:450x450;wm:platform/img/logo_watermark.png|-1|-1"/>" class="thickbox" rel="product-images" title="<inp2:m_param name="alt"/>">
+										<a href="<inp2:ImageSrc format='resize:450x450;wm:platform/img/logo_watermark.png|-1|-1'/>" class="form-manager-window" rel="product-images" title="<inp2:m_param name="alt"/>">
 											<img src="<inp2:m_param name="img_path"/>" title="<inp2:m_param name="alt"/>" alt="<inp2:m_param name="alt"/>" <inp2:m_param name="img_size"/> border="0" /><br />
 										</a>
 									</td>
Index: branches/1.2.x/in-news/articles/add_review.tpl
===================================================================
diff -u -N -r14274 -r15796
--- branches/1.2.x/in-news/articles/add_review.tpl	(.../add_review.tpl)	(revision 14274)
+++ branches/1.2.x/in-news/articles/add_review.tpl	(.../add_review.tpl)	(revision 15796)
@@ -75,7 +75,7 @@
 					<tr>
 						<td class="picture-padding" style="padding-left:25px" valign="top">
 							<inp2:m_if check="n_ImageSrc" MaxWidth="fullsize">
-								<a href="<inp2:n_ImageSrc MaxWidth="fullsize" DefaultImage="platform/img/no_picture.gif"/>" class="thickbox" rel="article-images" title="<inp2:n_Field name='Title' html_escape='1'/>">
+								<a href="<inp2:n_ImageSrc MaxWidth='fullsize' DefaultImage='platform/img/no_picture.gif'/>" class="form-manager-window" rel="article-images" title="<inp2:n_Field name='Title' html_escape='1'/>">
 									<inp2:n_Image render_as="image_element" Primary="1" MaxWidth="thumbnail" DefaultImage="platform/img/no_picture.gif"/><br />
 								</a>
 							<inp2:m_else/>
Index: branches/1.2.x/in-commerce/products/add_review.tpl
===================================================================
diff -u -N -r14274 -r15796
--- branches/1.2.x/in-commerce/products/add_review.tpl	(.../add_review.tpl)	(revision 14274)
+++ branches/1.2.x/in-commerce/products/add_review.tpl	(.../add_review.tpl)	(revision 15796)
@@ -64,7 +64,7 @@
 						<td style="text-align: center; padding-right: 10px;" valign="top">
 							<!--## Check if image exists ##-->
 							<inp2:m_if check="p_ImageSrc" MaxWidth="fullsize">
-								<a href="<inp2:p_ImageSrc MaxWidth="fullsize" DefaultImage="platform/img/no_picture.gif"/>" class="thickbox" rel="product-images" target="_blank" title="<inp2:p_Field name='Name' html_escape='1'/>">
+								<a href="<inp2:p_ImageSrc MaxWidth='fullsize' DefaultImage='platform/img/no_picture.gif'/>" class="form-manager-window" rel="product-images" target="_blank" title="<inp2:p_Field name='Name' html_escape='1'/>">
 								<inp2:p_Image render_as="image_element" Primary="1" MaxWidth="thumbnail" DefaultImage="platform/img/no_picture.gif"/><br />
 							</a>
 							<!--## Check if image exists ##-->