Index: branches/1.0.x/products/details.tpl
===================================================================
diff -u -r14794 -r14825
--- branches/1.0.x/products/details.tpl	(.../details.tpl)	(revision 14794)
+++ branches/1.0.x/products/details.tpl	(.../details.tpl)	(revision 14825)
@@ -67,12 +67,10 @@
 					<div class="img">
 						<p class="signsmall">Roll over images for multiple views:</p>
 						<ul id="pikame" >
-							<li><img src="<inp2:m_TemplatesBase />img/samples/good-details.jpg" width="256" height="258" alt="" /></li>
-							<li><img src="<inp2:m_TemplatesBase />img/samples/good1.jpg" width="256" height="258" alt="" /></li>
-							<li><img src="<inp2:m_TemplatesBase />img/samples/good2.jpg" width="256" height="258" alt="" /></li>
-							<li><img src="<inp2:m_TemplatesBase />img/samples/good-details.jpg" width="256" height="258" alt="" /></li>
-							<li><img src="<inp2:m_TemplatesBase />img/samples/good-details.jpg" width="256" height="258" alt="" /></li>
-							<li><img src="<inp2:m_TemplatesBase />img/samples/good-details.jpg" width="256" height="258" alt="" /></li>
+							<inp2:m_DefineElement name="additional_image_element">
+								<li><img src="<inp2:ImageSrc format="resize:256x258;wm:img/logo_watermark.png|-1|-1"/>" width="256" height="258" alt="" /></li>
+							</inp2:m_DefineElement>
+							<inp2:p_ListImages render_as="additional_image_element" types="additional" per_page="-1" no_table="1" MaxWidth="256" DefaultWidth="256" DefaultImage="img/no_picture.gif"/>
 						</ul>
 						<div class="viewlarger">
 							<a href="" onclick="TINY.box.show({image:'<inp2:m_TemplatesBase />img/samples/good-details-big.jpg',animate:true}); return false;">View Larger</a>
Index: branches/1.0.x/cart.tpl
===================================================================
diff -u -r14801 -r14825
--- branches/1.0.x/cart.tpl	(.../cart.tpl)	(revision 14801)
+++ branches/1.0.x/cart.tpl	(.../cart.tpl)	(revision 14825)
@@ -39,7 +39,7 @@
 				<table class="items">
 					<thead>
 						<tr>
-							<th colspan="2" style="text-align: left;">Items in your order (<span id="item-count"><inp2:orditems_TotalRecords/></span>)</th>
+							<th colspan="2" style="text-align: left;">Items in your order (<span id="item-count"><inp2:ord_ItemsInCart/></span>)</th>
 							<th>Qty.</th>
 							<th>Price</th>
 							<th>Total</th>
Index: branches/1.0.x/receipt.tpl
===================================================================
diff -u
--- branches/1.0.x/receipt.tpl	(revision 0)
+++ branches/1.0.x/receipt.tpl	(revision 14825)
@@ -0,0 +1,139 @@
+<!--##
+<NAME>Receipt</NAME>
+<DESC></DESC>
+<SECTION>Pages||Checkout</SECTION>
+##-->
+
+<inp2:m_DefineElement name="page_title">Your Receipt</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="add_to_head">
+
+</inp2:m_DefineElement>
+
+<!--## MAIN CONTENT ##-->
+<inp2:m_DefineElement name="content">
+
+	<ul class="steps">
+		<li class="step1"><span><i></i>Shopping Cart</span></li>
+		<li class="step2"><span><i></i>One-step Checkout</span></li>
+		<li class="step3 active"><span><i></i>Receipt</span></li>
+	</ul>
+
+	<div class="clear"></div>
+
+	<div class="cart-detail receipt">
+			<div class="success-order">
+				<p class="links">
+					<a href="javascript:window.print();" class="link-print">Print</a>
+					<a href="" class="link-download">Download</a>
+				</p>
+
+				<div class="clear"></div>
+				<p class="green">Thank you for your order #<inp2:ord_Field field="OrderNumber"/>!</p>
+
+				<p><strong>Below is the receipt / confirmation for your order. Please <a href="">print</a> or <a href="">download</a> it for your records.</strong></p>
+				<p>You will receive a confirmation once the order is approved and/or shipped.<br />Your credit card was authorized for the amount of your order but will not be charged until the order is approved</p>
+			</div>
+			<h1>Order <inp2:ord_Field field="OrderNumber"/></h1>
+			<div class="halfcol">
+				<fieldset>
+					<div class="fieldset">
+						Billing Information
+					</div>
+					<dl class="info">
+						<dt class="label-title">Full Name:</dt>
+						<dd>Bill Smith</dd>
+						<dt class="label-title">Company:</dt>
+						<dd>Intechnic</dd>
+						<dt class="label-title">Address:</dt>
+						<dd>333 East Highway 83, Suite 201, Mundelein, IL, 60060</dd>
+						<dt class="label-title">Phone:</dt>
+						<dd>847-970-6190</dd>
+					</dl>
+				</fieldset>
+				<fieldset class="creditcard">
+					<div class="fieldset">
+						Payment Information
+					</div>
+					<p>Visa XXXX XXXX XXXX 1234</p>
+				</fieldset>
+			</div>
+			<div class="halfcol halfcol-last">
+				<fieldset>
+					<div class="fieldset">
+						<label>Shipping Information</label>
+					</div>
+					<dl class="info">
+						<dt class="label-title">Shipping Type & Cost:</dt>
+						<dd>FedEx Ground (Next Day) $14.00</dd>
+						<dt class="label-title">Full Name:</dt>
+						<dd>Bill Smith</dd>
+						<dt class="label-title">Company:</dt>
+						<dd>Intechnic</dd>
+						<dt class="label-title">Address:</dt>
+						<dd>333 East Highway 83, Suite 201, Mundelein, IL, 60060</dd>
+					</dl>
+				</fieldset>
+			</div>
+			<div class="clear"></div>
+
+			<table class="items">
+				<thead>
+					<tr>
+						<th colspan="2" style="text-align: left;">Items in your order (<inp2:ord_ItemsInCart/>)</th>
+						<th>Qty.</th>
+						<th>Price</th>
+						<th>Total</th>
+					</tr>
+				</thead>
+				<tbody>
+					<tr>
+						<td class="item-img"><img src="<inp2:m_TemplatesBase/>img/samples/good5.jpg" width="58" height="58" alt="" /></td>
+						<td class="item-title">Nikon D5000 Kit 15-18 Digital Camera</td>
+						<td>1</td>
+						<td>$75.00</td>
+						<td>$75.00</td>
+					</tr>
+					<tr>
+						<td class="item-img"><img src="<inp2:m_TemplatesBase/>img/samples/good5.jpg" width="58" height="58" alt="" /></td>
+						<td class="item-title">Nikon D5000 Kit 15-18 Digital Camera</td>
+						<td>1</td>
+						<td>$75.00</td>
+						<td>$75.00</td>
+					</tr>
+					<tr>
+						<td class="item-img"><img src="<inp2:m_TemplatesBase/>img/samples/good5.jpg" width="58" height="58" alt="" /></td>
+						<td class="item-title">Nikon D5000 Kit 15-18 Digital Camera</td>
+						<td>1</td>
+						<td>$75.00</td>
+						<td>$75.00</td>
+					</tr>
+					<tr>
+						<td class="item-img"><img src="<inp2:m_TemplatesBase/>img/samples/good5.jpg" width="58" height="58" alt="" /></td>
+						<td class="item-title">Nikon D5000 Kit 15-18 Digital Camera</td>
+						<td>1</td>
+						<td>$75.00</td>
+						<td>$75.00</td>
+					</tr>
+				</tbody>
+			</table>
+
+			<dl class="total">
+				<dt>Subtotal</dt>
+				<dd>$1,759.99</dd>
+				<dt>Shipping</dt>
+				<dd class="price3">$100.00</dd>
+				<dt>Tax</dt>
+				<dd class="price3">$100.00</dd>
+				<dt>Order Total</dt>
+				<dd class="price4">$1,959.99</dd>
+			</dl>
+			<div class="clear"></div>
+		</div>
+
+</inp2:m_DefineElement>
+<!--## /MAIN CONTENT ##-->
+
+<!--## DESIGN TEMPLATE ##-->
+<inp2:m_include template="designs/default_design.des" pass_params="1"/>
+<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file