diff --git a/templates/archive-product.php b/templates/archive-product.php
index a696feff2689..677e3789131d 100644
--- a/templates/archive-product.php
+++ b/templates/archive-product.php
@@ -4,9 +4,9 @@
  *
  * Override this template by copying it to yourtheme/woocommerce/archive-product.php
  *
- * @package WooCommerce
- * @since WooCommerce 1.0
- * @todo replace loop-shop with a content template and include query/loop here instead.
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
 
 get_header('shop'); ?>
diff --git a/templates/cart/cart.php b/templates/cart/cart.php
index 1f024dbdcde6..e34ea2331eff 100755
--- a/templates/cart/cart.php
+++ b/templates/cart/cart.php
@@ -1,8 +1,12 @@
 <?php
 /**
  * Cart Page
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
- 
+
 global $woocommerce;
 ?>
 
@@ -23,7 +27,7 @@
 	</thead>
 	<tbody>
 		<?php do_action( 'woocommerce_before_cart_contents' ); ?>
-		
+
 		<?php
 		if ( sizeof( $woocommerce->cart->get_cart() ) > 0 ) {
 			foreach ( $woocommerce->cart->get_cart() as $cart_item_key => $values ) {
@@ -33,66 +37,66 @@
 					<tr class = "<?php echo esc_attr( apply_filters('woocommerce_cart_table_item_class', 'cart_table_item', $values, $cart_item_key ) ); ?>">
 						<!-- Remove from cart link -->
 						<td class="product-remove">
-							<?php 
-								echo apply_filters( 'woocommerce_cart_item_remove_link', sprintf('<a href="%s" class="remove" title="%s">&times;</a>', esc_url( $woocommerce->cart->get_remove_url( $cart_item_key ) ), __('Remove this item', 'woocommerce') ), $cart_item_key ); 
+							<?php
+								echo apply_filters( 'woocommerce_cart_item_remove_link', sprintf('<a href="%s" class="remove" title="%s">&times;</a>', esc_url( $woocommerce->cart->get_remove_url( $cart_item_key ) ), __('Remove this item', 'woocommerce') ), $cart_item_key );
 							?>
 						</td>
-						
+
 						<!-- The thumbnail -->
 						<td class="product-thumbnail">
-							<?php 
+							<?php
 								$thumbnail = apply_filters( 'woocommerce_in_cart_product_thumbnail', $_product->get_image(), $values, $cart_item_key );
-								printf('<a href="%s">%s</a>', esc_url( get_permalink( apply_filters('woocommerce_in_cart_product_id', $values['product_id'] ) ) ), $thumbnail ); 
+								printf('<a href="%s">%s</a>', esc_url( get_permalink( apply_filters('woocommerce_in_cart_product_id', $values['product_id'] ) ) ), $thumbnail );
 							?>
 						</td>
-						
+
 						<!-- Product Name -->
 						<td class="product-name">
-							<?php 
+							<?php
 								if ( ! $_product->is_visible() || ( $_product instanceof WC_Product_Variation && ! $_product->parent_is_visible() ) )
 									echo apply_filters( 'woocommerce_in_cart_product_title', $_product->get_title(), $values, $cart_item_key );
 								else
 									printf('<a href="%s">%s</a>', esc_url( get_permalink( apply_filters('woocommerce_in_cart_product_id', $values['product_id'] ) ) ), apply_filters('woocommerce_in_cart_product_title', $_product->get_title(), $values, $cart_item_key ) );
-														
+
 								// Meta data
 								echo $woocommerce->cart->get_item_data( $values );
-                   				
+
                    				// Backorder notification
                    				if ( $_product->backorders_require_notification() && $_product->is_on_backorder( $values['quantity'] ) )
                    					echo '<p class="backorder_notification">' . __('Available on backorder', 'woocommerce') . '</p>';
 							?>
 						</td>
-						
+
 						<!-- Product price -->
 						<td class="product-price">
-							<?php 							
+							<?php
 								$product_price = get_option('woocommerce_display_cart_prices_excluding_tax') == 'yes' || $woocommerce->customer->is_vat_exempt() ? $_product->get_price_excluding_tax() : $_product->get_price();
-							
-								echo apply_filters('woocommerce_cart_item_price_html', woocommerce_price( $product_price ), $values, $cart_item_key ); 
+
+								echo apply_filters('woocommerce_cart_item_price_html', woocommerce_price( $product_price ), $values, $cart_item_key );
 							?>
 						</td>
-						
+
 						<!-- Quantity inputs -->
 						<td class="product-quantity">
-							<?php 
+							<?php
 								if ( $_product->is_sold_individually() ) {
 									$product_quantity = '1';
 								} else {
 									$data_min = apply_filters( 'woocommerce_cart_item_data_min', '', $_product );
 									$data_max = ( $_product->backorders_allowed() ) ? '' : $_product->get_stock_quantity();
-									$data_max = apply_filters( 'woocommerce_cart_item_data_max', $data_max, $_product ); 
-									
+									$data_max = apply_filters( 'woocommerce_cart_item_data_max', $data_max, $_product );
+
 									$product_quantity = sprintf( '<div class="quantity"><input name="cart[%s][qty]" data-min="%s" data-max="%s" value="%s" size="4" title="Qty" class="input-text qty text" maxlength="12" /></div>', $cart_item_key, $data_min, $data_max, esc_attr( $values['quantity'] ) );
 								}
-								
-								echo apply_filters( 'woocommerce_cart_item_quantity', $product_quantity, $cart_item_key ); 					
+
+								echo apply_filters( 'woocommerce_cart_item_quantity', $product_quantity, $cart_item_key );
 							?>
 						</td>
-						
+
 						<!-- Product subtotal -->
 						<td class="product-subtotal">
-							<?php 
-								echo apply_filters( 'woocommerce_cart_item_subtotal', $woocommerce->cart->get_product_subtotal( $_product, $values['quantity'] ), $values, $cart_item_key ); 
+							<?php
+								echo apply_filters( 'woocommerce_cart_item_subtotal', $woocommerce->cart->get_product_subtotal( $_product, $values['quantity'] ), $values, $cart_item_key );
 							?>
 						</td>
 					</tr>
@@ -100,7 +104,7 @@
 				}
 			}
 		}
-		
+
 		do_action( 'woocommerce_cart_contents' );
 		?>
 		<tr>
@@ -108,32 +112,32 @@
 
 				<?php if ( get_option( 'woocommerce_enable_coupons' ) == 'yes' && get_option( 'woocommerce_enable_coupon_form_on_cart' ) == 'yes') { ?>
 					<div class="coupon">
-					
+
 						<label for="coupon_code"><?php _e('Coupon', 'woocommerce'); ?>:</label> <input name="coupon_code" class="input-text" id="coupon_code" value="" /> <input type="submit" class="button" name="apply_coupon" value="<?php _e('Apply Coupon', 'woocommerce'); ?>" />
-						
+
 						<?php do_action('woocommerce_cart_coupon'); ?>
-						
+
 					</div>
 				<?php } ?>
 
 				<input type="submit" class="button" name="update_cart" value="<?php _e('Update Cart', 'woocommerce'); ?>" /> <a href="<?php echo esc_url( $woocommerce->cart->get_checkout_url() ); ?>" class="checkout-button button alt"><?php _e('Proceed to Checkout &rarr;', 'woocommerce'); ?></a>
 				<?php do_action('woocommerce_proceed_to_checkout'); ?>
-				
+
 				<?php $woocommerce->nonce_field('cart') ?>
 			</td>
 		</tr>
-		
+
 		<?php do_action( 'woocommerce_after_cart_contents' ); ?>
 	</tbody>
 </table>
 <?php do_action( 'woocommerce_after_cart_table' ); ?>
 </form>
 <div class="cart-collaterals">
-	
+
 	<?php do_action('woocommerce_cart_collaterals'); ?>
-	
+
 	<?php woocommerce_cart_totals(); ?>
-	
+
 	<?php woocommerce_shipping_calculator(); ?>
-	
+
 </div>
\ No newline at end of file
diff --git a/templates/cart/cross-sells.php b/templates/cart/cross-sells.php
index 61d66f1e12c8..0f26307ba9cf 100644
--- a/templates/cart/cross-sells.php
+++ b/templates/cart/cross-sells.php
@@ -1,6 +1,10 @@
 <?php
 /**
  * Cross-sells
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
 
 global $woocommerce_loop, $woocommerce, $product;
@@ -25,21 +29,21 @@
 if ( $products->have_posts() ) : ?>
 
 	<div class="cross-sells">
-		
+
 		<h2><?php _e('You may be interested in&hellip;', 'woocommerce') ?></h2>
-	
+
 		<ul class="products">
-			
+
 			<?php while ( $products->have_posts() ) : $products->the_post(); ?>
-		
+
 				<?php woocommerce_get_template_part( 'content', 'product' ); ?>
-	
+
 			<?php endwhile; // end of the loop. ?>
-				
+
 		</ul>
-		
+
 	</div>
-	
-<?php endif; 
+
+<?php endif;
 
 wp_reset_query();
diff --git a/templates/cart/empty.php b/templates/cart/empty.php
index 77316ca068f6..96b8b5d9be7b 100644
--- a/templates/cart/empty.php
+++ b/templates/cart/empty.php
@@ -1,6 +1,10 @@
 <?php
 /**
- * Empty Cart Page
+ * Empty cart page
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
 ?>
 
diff --git a/templates/cart/mini-cart.php b/templates/cart/mini-cart.php
index e9453e1c0cf3..0021c4224d39 100644
--- a/templates/cart/mini-cart.php
+++ b/templates/cart/mini-cart.php
@@ -1,62 +1,66 @@
 <?php
 /**
- * Mini-Cart
+ * Mini-cart
  *
  * Contains the markup for the mini-cart, used by the cart widget
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
- 
+
 global $woocommerce;
 ?>
 <ul class="cart_list product_list_widget <?php echo $args['list_class']; ?>">
 
 	<?php if ( sizeof( $woocommerce->cart->get_cart() ) > 0 ) : ?>
-	
-		<?php foreach ( $woocommerce->cart->get_cart() as $cart_item_key => $cart_item ) : 
-			
+
+		<?php foreach ( $woocommerce->cart->get_cart() as $cart_item_key => $cart_item ) :
+
 			$_product = $cart_item['data'];
-			
+
 			// Only display if allowed
-			if ( ! apply_filters('woocommerce_widget_cart_item_visible', true, $cart_item, $cart_item_key ) || ! $_product->exists() || $cart_item['quantity'] == 0 ) 
+			if ( ! apply_filters('woocommerce_widget_cart_item_visible', true, $cart_item, $cart_item_key ) || ! $_product->exists() || $cart_item['quantity'] == 0 )
 				continue;
-				
+
 			// Get price
 			$product_price = get_option( 'woocommerce_display_cart_prices_excluding_tax' ) == 'yes' || $woocommerce->customer->is_vat_exempt() ? $_product->get_price_excluding_tax() : $_product->get_price();
-			
-			$product_price = apply_filters( 'woocommerce_cart_item_price_html', woocommerce_price( $product_price ), $cart_item, $cart_item_key ); 	
+
+			$product_price = apply_filters( 'woocommerce_cart_item_price_html', woocommerce_price( $product_price ), $cart_item, $cart_item_key );
 			?>
-			
+
 			<li>
 				<a href="<?php echo get_permalink( $cart_item['product_id'] ); ?>">
-			
+
 					<?php echo $_product->get_image(); ?>
-		
+
 					<?php echo apply_filters('woocommerce_widget_cart_product_title', $_product->get_title(), $_product ); ?>
-				
+
 				</a>
-				
+
 				<?php echo $woocommerce->cart->get_item_data( $cart_item ); ?>
-				
+
 				<span class="quantity"><?php printf( '%s &times; %s', $cart_item['quantity'], $product_price ); ?></span>
 			</li>
-		
+
 		<?php endforeach; ?>
-	
+
 	<?php else : ?>
-	
+
 		<li class="empty"><?php _e('No products in the cart.', 'woocommerce'); ?></li>
-							
+
 	<?php endif; ?>
-	
+
 </ul><!-- end product list -->
 
 <?php if ( sizeof( $woocommerce->cart->get_cart() ) > 0 ) : ?>
 
 	<p class="total"><strong><?php _e('Subtotal', 'woocommerce'); ?>:</strong> <?php echo $woocommerce->cart->get_cart_subtotal(); ?></p>
-	
+
 	<?php do_action( 'woocommerce_widget_shopping_cart_before_buttons' ); ?>
-	
+
 	<p class="buttons">
-		<a href="<?php echo $woocommerce->cart->get_cart_url(); ?>" class="button"><?php _e('View Cart &rarr;', 'woocommerce'); ?></a> 
+		<a href="<?php echo $woocommerce->cart->get_cart_url(); ?>" class="button"><?php _e('View Cart &rarr;', 'woocommerce'); ?></a>
 		<a href="<?php echo $woocommerce->cart->get_checkout_url(); ?>" class="button checkout"><?php _e('Checkout &rarr;', 'woocommerce'); ?></a>
 	</p>
 
diff --git a/templates/cart/shipping-calculator.php b/templates/cart/shipping-calculator.php
index 246dba480bbc..b1187525402a 100644
--- a/templates/cart/shipping-calculator.php
+++ b/templates/cart/shipping-calculator.php
@@ -1,8 +1,12 @@
 <?php
 /**
  * Shipping Calculator
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
- 
+
 global $woocommerce;
 
 if ( get_option('woocommerce_enable_shipping_calc')=='no' || ! $woocommerce->cart->needs_shipping() ) return;
@@ -26,18 +30,18 @@
 			<?php
 				$current_cc = $woocommerce->customer->get_shipping_country();
 				$current_r = $woocommerce->customer->get_shipping_state();
-				
+
 				$states = $woocommerce->countries->get_states( $current_cc );
-				
+
 				if ( is_array( $states ) && empty( $states ) ) {
-				
+
 					// Hidden
 					?>
 					<input type="hidden" name="calc_shipping_state" id="calc_shipping_state" />
 					<?php
-				
+
 				} elseif ( is_array( $states ) ) {
-					
+
 					// Dropdown
 					?>
 					<span>
@@ -47,14 +51,14 @@
 						?></select>
 					</span>
 					<?php
-				
+
 				} else {
-				
+
 					// Input
 					?>
 					<input type="text" class="input-text" value="<?php echo esc_attr( $current_r ); ?>" placeholder="<?php _e('State', 'woocommerce'); ?>" name="calc_shipping_state" id="calc_shipping_state" />
 					<?php
-				
+
 				}
 			?>
 		</p>
diff --git a/templates/cart/totals.php b/templates/cart/totals.php
index 694bab348deb..9fe8d64d5195 100644
--- a/templates/cart/totals.php
+++ b/templates/cart/totals.php
@@ -1,38 +1,42 @@
 <?php
 /**
- * Cart Totals
+ * Cart totals
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
- 
+
 global $woocommerce;
 
 $available_methods = $woocommerce->shipping->get_available_shipping_methods();
 ?>
 <div class="cart_totals <?php if ( $woocommerce->customer->has_calculated_shipping() ) echo 'calculated_shipping'; ?>">
-	
+
 	<?php do_action('woocommerce_before_cart_totals'); ?>
-	
+
 	<?php if ( ! $woocommerce->shipping->enabled || $available_methods || ! $woocommerce->customer->get_shipping_country() || ! $woocommerce->customer->has_calculated_shipping() ) : ?>
-	
+
 		<h2><?php _e('Cart Totals', 'woocommerce'); ?></h2>
 		<table cellspacing="0" cellpadding="0">
 			<tbody>
-				
+
 				<tr class="cart-subtotal">
 					<th><strong><?php _e('Cart Subtotal', 'woocommerce'); ?></strong></th>
 					<td><strong><?php echo $woocommerce->cart->get_cart_subtotal(); ?></strong></td>
 				</tr>
-				
+
 				<?php if ($woocommerce->cart->get_discounts_before_tax()) : ?>
-				
+
 				<tr class="discount">
 					<th><?php _e('Cart Discount', 'woocommerce'); ?> <a href="<?php echo add_query_arg('remove_discounts', '1', $woocommerce->cart->get_cart_url()) ?>"><?php _e('[Remove]', 'woocommerce'); ?></a></th>
 					<td>-<?php echo $woocommerce->cart->get_discounts_before_tax(); ?></td>
 				</tr>
-				
+
 				<?php endif; ?>
-				
+
 				<?php if ( $woocommerce->cart->needs_shipping() && $woocommerce->cart->show_shipping() && ( $available_methods || get_option( 'woocommerce_enable_shipping_calc' ) == 'yes' ) ) { ?>
-				
+
 				<tr class="shipping">
 					<th><?php _e('Shipping', 'woocommerce'); ?></th>
 					<td>
@@ -69,28 +73,28 @@
 
 							// Show multiple shipping methods
 							} else {
-							
+
 								if ( get_option('woocommerce_shipping_method_format') == 'select' ) {
 
 									echo '<select name="shipping_method" id="shipping_method">';
-									
-									foreach ( $available_methods as $method ) 
+
+									foreach ( $available_methods as $method )
 										echo '<option value="' . esc_attr( $method->id ) . '" ' . selected( $method->id, $_SESSION['_chosen_shipping_method'], false ) . '>' . strip_tags( $method->full_label ) . '</option>';
 
 									echo '</select>';
-								
+
 								} else {
-								
-								
+
+
 									echo '<ul id="shipping_method">';
-									
+
 									foreach ( $available_methods as $method )
 										echo '<li><input type="radio" name="shipping_method" id="shipping_method_' . sanitize_title( $method->id ) . '" value="' . esc_attr( $method->id ) . '" ' . checked( $method->id, $_SESSION['_chosen_shipping_method'], false) . ' /> <label for="shipping_method_' . sanitize_title( $method->id ) . '">' . $method->full_label . '</label></li>';
-									
+
 									echo '</ul>';
-								
+
 								}
-								
+
 							}
 
 						// No shipping methods are available
@@ -104,21 +108,21 @@
 
 						}
 					?></td>
-					
+
 				</tr>
-	
+
 				<?php } ?>
-				
-				<?php 
+
+				<?php
 					if ( get_option('woocommerce_display_cart_taxes') == 'yes' && $woocommerce->cart->get_cart_tax() ) :
-						
+
 						$taxes = $woocommerce->cart->get_formatted_taxes();
-						
+
 						if (sizeof($taxes)>0) :
-						
+
 							$has_compound_tax = false;
-							
-							foreach ($taxes as $key => $tax) : 
+
+							foreach ($taxes as $key => $tax) :
 								if ($woocommerce->cart->tax->is_compound( $key )) : $has_compound_tax = true; continue; endif;
 								?>
 								<tr class="tax-rate tax-rate-<?php echo $key; ?>">
@@ -133,9 +137,9 @@
 									<td><?php echo $tax; ?></td>
 								</tr>
 								<?php
-								
+
 							endforeach;
-							
+
 							if ($has_compound_tax && !$woocommerce->cart->prices_include_tax) :
 								?>
 								<tr class="order-subtotal">
@@ -144,8 +148,8 @@
 								</tr>
 								<?php
 							endif;
-							
-							foreach ($taxes as $key => $tax) : 
+
+							foreach ($taxes as $key => $tax) :
 								if (!$woocommerce->cart->tax->is_compound( $key )) continue;
 								?>
 								<tr class="tax-rate tax-rate-<?php echo $key; ?>">
@@ -160,88 +164,88 @@
 									<td><?php echo $tax; ?></td>
 								</tr>
 								<?php
-								
+
 							endforeach;
-						
+
 						else :
-						
+
 							?>
 							<tr class="tax">
 								<th><?php _e('Tax', 'woocommerce'); ?></th>
 								<td><?php echo $woocommerce->cart->get_cart_tax(); ?></td>
 							</tr>
 							<?php
-						
-						endif;	
+
+						endif;
 					elseif ( get_option('woocommerce_display_cart_taxes_if_zero') == 'yes' ) :
-						
+
 						?>
 						<tr class="tax">
 							<th><?php _e('Tax', 'woocommerce'); ?></th>
 							<td><?php _ex( 'N/A', 'Relating to tax', 'woocommerce' ); ?></td>
 						</tr>
 						<?php
-							
+
 					endif;
 				?>
-	
+
 				<?php if ($woocommerce->cart->get_discounts_after_tax()) : ?>
-				
+
 				<tr class="discount">
 					<th><?php _e('Order Discount', 'woocommerce'); ?> <a href="<?php echo add_query_arg('remove_discounts', '2', $woocommerce->cart->get_cart_url()) ?>"><?php _e('[Remove]', 'woocommerce'); ?></a></th>
 					<td>-<?php echo $woocommerce->cart->get_discounts_after_tax(); ?></td>
 				</tr>
-				
+
 				<?php endif; ?>
-				
+
 				<tr class="total">
 					<th><strong><?php _e('Order Total', 'woocommerce'); ?></strong></th>
-					<td><strong><?php 
-						
+					<td><strong><?php
+
 						if (get_option('woocommerce_display_cart_taxes')=='no' && !$woocommerce->cart->prices_include_tax) :
-							echo $woocommerce->cart->get_total_ex_tax(); 
+							echo $woocommerce->cart->get_total_ex_tax();
 						else :
-							echo $woocommerce->cart->get_total(); 
+							echo $woocommerce->cart->get_total();
 						endif;
-						
+
 					?></strong></td>
 				</tr>
-				
+
 			</tbody>
 		</table>
-		
+
 		<?php if ( get_option('woocommerce_display_cart_taxes') == 'yes' && $woocommerce->cart->get_cart_tax() ) : ?>
-			<p><small><?php 
-			
+			<p><small><?php
+
 				$estimated_text = ( $woocommerce->customer->is_customer_outside_base() && ! $woocommerce->customer->has_calculated_shipping() ) ? sprintf( ' ' . __('(taxes estimated for %s)', 'woocommerce'), $woocommerce->countries->estimated_for_prefix() . __($woocommerce->countries->countries[ $woocommerce->countries->get_base_country() ], 'woocommerce') ) : '';
-				
-				printf(__('Note: Shipping and taxes are estimated%s and will be updated during checkout based on your billing and shipping information.', 'woocommerce'), $estimated_text ); 
-				
+
+				printf(__('Note: Shipping and taxes are estimated%s and will be updated during checkout based on your billing and shipping information.', 'woocommerce'), $estimated_text );
+
 			?></small></p>
 		<?php endif; ?>
-	
+
 	<?php elseif( $woocommerce->cart->needs_shipping() ) : ?>
-		
+
 		<?php if ( ! $woocommerce->customer->get_shipping_state() || ! $woocommerce->customer->get_shipping_postcode() ) : ?>
-		
+
 			<div class="woocommerce_info">
 				<p><?php _e('No shipping methods were found; please recalculate your shipping and enter your state/county and zip/postcode to ensure their are no other available methods for your location.', 'woocommerce'); ?></p>
 			</div>
-		
+
 		<?php else : ?>
-		
+
 			<div class="woocommerce_error">
-		
+
 				<p><?php printf(__('Sorry, it seems that there are no available shipping methods for your location (%s).', 'woocommerce'), $woocommerce->countries->countries[ $woocommerce->customer->get_shipping_country() ]); ?></p>
-				
+
 				<p><?php _e('If you require assistance or wish to make alternate arrangements please contact us.', 'woocommerce'); ?></p>
-				
+
 			</div>
-		
+
 		<?php endif; ?>
-		
+
 	<?php endif; ?>
-	
+
 	<?php do_action('woocommerce_after_cart_totals'); ?>
-	
+
 </div>
\ No newline at end of file
diff --git a/templates/checkout/cart-errors.php b/templates/checkout/cart-errors.php
index 487c90fd9191..694a107de998 100644
--- a/templates/checkout/cart-errors.php
+++ b/templates/checkout/cart-errors.php
@@ -1,6 +1,10 @@
 <?php
 /**
  * Cart errors page
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
 ?>
 
diff --git a/templates/checkout/form-billing.php b/templates/checkout/form-billing.php
index 2c9e7b2cbafe..6d71b77a6be9 100644
--- a/templates/checkout/form-billing.php
+++ b/templates/checkout/form-billing.php
@@ -1,7 +1,12 @@
 <?php
 /**
- * Checkout Billing Information Form
+ * Checkout billing information form
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
+
 global $woocommerce;
 ?>
 
diff --git a/templates/checkout/form-checkout.php b/templates/checkout/form-checkout.php
index 4719f47be065..6f87a692661a 100644
--- a/templates/checkout/form-checkout.php
+++ b/templates/checkout/form-checkout.php
@@ -1,4 +1,14 @@
-<?php global $woocommerce; $woocommerce_checkout = $woocommerce->checkout(); ?>
+<?php
+/**
+ * Checkout Form
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
+ */
+
+global $woocommerce; $woocommerce_checkout = $woocommerce->checkout();
+?>
 
 <?php $woocommerce->show_messages(); ?>
 
@@ -14,28 +24,28 @@
 $get_checkout_url = apply_filters( 'woocommerce_get_checkout_url', $woocommerce->cart->get_checkout_url() ); ?>
 
 <form name="checkout" method="post" class="checkout" action="<?php echo esc_url( $get_checkout_url ); ?>">
-	
+
 	<?php if (sizeof($woocommerce_checkout->checkout_fields)>0) : ?>
-	
+
 	<div class="col2-set" id="customer_details">
 		<div class="col-1">
 
 			<?php do_action('woocommerce_checkout_billing'); ?>
-						
+
 		</div>
 		<div class="col-2">
-		
+
 			<?php do_action('woocommerce_checkout_shipping'); ?>
-					
+
 		</div>
 	</div>
-	
+
 	<h3 id="order_review_heading"><?php _e('Your order', 'woocommerce'); ?></h3>
-	
+
 	<?php endif; ?>
 
 	<?php do_action('woocommerce_checkout_order_review'); ?>
-	
+
 </form>
 
 <?php do_action('woocommerce_after_checkout_form'); ?>
\ No newline at end of file
diff --git a/templates/checkout/form-coupon.php b/templates/checkout/form-coupon.php
index ac501dbe9f71..654034765c7e 100644
--- a/templates/checkout/form-coupon.php
+++ b/templates/checkout/form-coupon.php
@@ -1,7 +1,12 @@
 <?php
 /**
- * Checkout Coupon Form
+ * Checkout coupon form
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
+
 if ( get_option( 'woocommerce_enable_coupons' ) == 'no' || get_option( 'woocommerce_enable_coupon_form_on_checkout' ) == 'no' ) return;
 
 $info_message = apply_filters('woocommerce_checkout_coupon_message', __('Have a coupon?', 'woocommerce'));
@@ -18,6 +23,6 @@
 	<p class="form-row form-row-last">
 		<input type="submit" class="button" name="apply_coupon" value="<?php _e('Apply Coupon', 'woocommerce'); ?>" />
 	</p>
-	
+
 	<div class="clear"></div>
 </form>
\ No newline at end of file
diff --git a/templates/checkout/form-login.php b/templates/checkout/form-login.php
index 56a35998133b..7a5206c7b305 100644
--- a/templates/checkout/form-login.php
+++ b/templates/checkout/form-login.php
@@ -1,7 +1,12 @@
 <?php
 /**
- * Checkout Login Form
+ * Checkout login form
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
+
 if ( is_user_logged_in() ) return;
 if ( get_option('woocommerce_enable_signup_and_login_from_checkout') == "no" ) return;
 
diff --git a/templates/checkout/form-pay.php b/templates/checkout/form-pay.php
index 1d8a6cc3c40d..77ea3229f793 100755
--- a/templates/checkout/form-pay.php
+++ b/templates/checkout/form-pay.php
@@ -1,11 +1,16 @@
 <?php
 /**
  * Pay for order form
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
-global $woocommerce; 
+
+global $woocommerce;
 ?>
 <form id="order_review" method="post">
-	
+
 	<table class="shop_table">
 		<thead>
 			<tr>
@@ -15,20 +20,20 @@
 			</tr>
 		</thead>
 		<tfoot>
-		<?php 
+		<?php
 			if ( $totals = $order->get_order_item_totals() ) foreach ( $totals as $total ) :
 				?>
 				<tr>
 					<th scope="row" colspan="2"><?php echo $total['label']; ?></th>
 					<td><?php echo $total['value']; ?></td>
 				</tr>
-				<?php 
-			endforeach; 
+				<?php
+			endforeach;
 		?>
 		</tfoot>
 		<tbody>
 			<?php
-			if (sizeof($order->get_items())>0) : 
+			if (sizeof($order->get_items())>0) :
 				foreach ($order->get_items() as $item) :
 					echo '
 						<tr>
@@ -36,27 +41,27 @@
 							<td>'.$item['qty'].'</td>
 							<td>' . $order->get_formatted_line_subtotal($item) . '</td>
 						</tr>';
-				endforeach; 
+				endforeach;
 			endif;
 			?>
 		</tbody>
 	</table>
-	
+
 	<div id="payment">
 		<?php if ($order->order_total > 0) : ?>
 		<ul class="payment_methods methods">
-			<?php 
+			<?php
 				$available_gateways = $woocommerce->payment_gateways->get_available_payment_gateways();
-				if ($available_gateways) : 
+				if ($available_gateways) :
 					// Chosen Method
 					if (sizeof($available_gateways)) current($available_gateways)->set_current();
 					foreach ($available_gateways as $gateway ) :
 						?>
 						<li>
 							<input type="radio" id="payment_method_<?php echo $gateway->id; ?>" class="input-radio" name="payment_method" value="<?php echo esc_attr( $gateway->id ); ?>" <?php if ($gateway->chosen) echo 'checked="checked"'; ?> />
-							<label for="payment_method_<?php echo $gateway->id; ?>"><?php echo $gateway->get_title(); ?> <?php echo $gateway->get_icon(); ?></label> 
+							<label for="payment_method_<?php echo $gateway->id; ?>"><?php echo $gateway->get_title(); ?> <?php echo $gateway->get_icon(); ?></label>
 							<?php
-								if ( $gateway->has_fields() || $gateway->get_description() ) : 
+								if ( $gateway->has_fields() || $gateway->get_description() ) :
 									echo '<div class="payment_box payment_method_'.$gateway->id.'" style="display:none;">';
 									$gateway->payment_fields();
 									echo '</div>';
@@ -66,9 +71,9 @@
 						<?php
 					endforeach;
 				else :
-				
+
 					echo '<p>'.__('Sorry, it seems that there are no available payment methods for your location. Please contact us if you require assistance or wish to make alternate arrangements.', 'woocommerce').'</p>';
-					
+
 				endif;
 			?>
 		</ul>
@@ -81,5 +86,5 @@
 		</div>
 
 	</div>
-	
+
 </form>
\ No newline at end of file
diff --git a/templates/checkout/form-shipping.php b/templates/checkout/form-shipping.php
index 19f4f27708cf..be385ed6a98d 100644
--- a/templates/checkout/form-shipping.php
+++ b/templates/checkout/form-shipping.php
@@ -1,22 +1,27 @@
 <?php
 /**
- * Checkout Shipping Information Form
+ * Checkout shipping information form
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
+
 global $woocommerce;
 ?>
 
 <?php if ( ( $woocommerce->cart->needs_shipping() || get_option('woocommerce_require_shipping_address') == 'yes' ) && ! $woocommerce->cart->ship_to_billing_address_only() ) : ?>
-			
-	<?php 
+
+	<?php
 		if ( empty( $_POST ) ) :
-			
+
 			$shiptobilling = (get_option('woocommerce_ship_to_same_address')=='yes') ? 1 : 0;
 			$shiptobilling = apply_filters('woocommerce_shiptobilling_default', $shiptobilling);
-		
+
 		else :
-		
+
 			$shiptobilling = $checkout->get_value('shiptobilling');
-		
+
 		endif;
 	?>
 
@@ -24,41 +29,41 @@
 		<input id="shiptobilling-checkbox" class="input-checkbox" <?php checked($shiptobilling, 1); ?> type="checkbox" name="shiptobilling" value="1" />
 		<label for="shiptobilling-checkbox" class="checkbox"><?php _e('Ship to billing address?', 'woocommerce'); ?></label>
 	</p>
-			
+
 	<h3><?php _e('Shipping Address', 'woocommerce'); ?></h3>
-			
+
 	<div class="shipping_address">
-					
+
 		<?php do_action('woocommerce_before_checkout_shipping_form', $checkout); ?>
-		
+
 		<?php foreach ($checkout->checkout_fields['shipping'] as $key => $field) : ?>
-		
+
 			<?php woocommerce_form_field( $key, $field, $checkout->get_value( $key ) ); ?>
-		
+
 		<?php endforeach; ?>
-		
+
 		<?php do_action('woocommerce_after_checkout_shipping_form', $checkout); ?>
-								
+
 	</div>
-		
+
 <?php endif; ?>
-		
+
 <?php do_action('woocommerce_before_order_notes', $checkout); ?>
-		
+
 <?php if (get_option('woocommerce_enable_order_comments')!='no') : ?>
-		
+
 	<?php if ($woocommerce->cart->ship_to_billing_address_only()) : ?>
-	
+
 		<h3><?php _e('Additional Information', 'woocommerce'); ?></h3>
-	
+
 	<?php endif; ?>
-			
+
 	<?php foreach ($checkout->checkout_fields['order'] as $key => $field) : ?>
-	
+
 		<?php woocommerce_form_field( $key, $field, $checkout->get_value( $key ) ); ?>
-			
+
 	<?php endforeach; ?>
-								
+
 <?php endif; ?>
-		
+
 <?php do_action('woocommerce_after_order_notes', $checkout); ?>
\ No newline at end of file
diff --git a/templates/checkout/review-order.php b/templates/checkout/review-order.php
index 588473e6c56a..5700ce89ffb9 100755
--- a/templates/checkout/review-order.php
+++ b/templates/checkout/review-order.php
@@ -1,14 +1,18 @@
 <?php
 /**
- * Review Order
+ * Review order form
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
- 
+
 global $woocommerce;
 
 $available_methods = $woocommerce->shipping->get_available_shipping_methods();
 ?>
 <div id="order_review">
-	
+
 	<table class="shop_table">
 		<thead>
 			<tr>
@@ -18,25 +22,25 @@
 			</tr>
 		</thead>
 		<tfoot>
-		
+
 			<tr class="cart-subtotal">
 				<th colspan="2"><strong><?php _e('Cart Subtotal', 'woocommerce'); ?></strong></th>
 				<td><?php echo $woocommerce->cart->get_cart_subtotal(); ?></td>
 			</tr>
-			
+
 			<?php if ($woocommerce->cart->get_discounts_before_tax()) : ?>
-			
+
 			<tr class="discount">
 				<th colspan="2"><?php _e('Cart Discount', 'woocommerce'); ?></th>
 				<td>-<?php echo $woocommerce->cart->get_discounts_before_tax(); ?></td>
 			</tr>
-			
+
 			<?php endif; ?>
-			
+
 			<?php if ( $woocommerce->cart->needs_shipping() && $woocommerce->cart->show_shipping() ) : ?>
-			
+
 			<?php do_action('woocommerce_review_order_before_shipping'); ?>
-			
+
 			<tr class="shipping">
 				<th colspan="2"><?php _e('Shipping', 'woocommerce'); ?></th>
 				<td>
@@ -78,24 +82,24 @@
 							if ( get_option('woocommerce_shipping_method_format') == 'select' ) {
 
 								echo '<select name="shipping_method" id="shipping_method">';
-								
-								foreach ( $available_methods as $method ) 
+
+								foreach ( $available_methods as $method )
 									echo '<option value="' . esc_attr( $method->id ) . '" ' . selected( $method->id, $_SESSION['_chosen_shipping_method'], false ) . '>' . strip_tags( $method->full_label ) . '</option>';
 
 								echo '</select>';
-							
+
 							} else {
-							
-							
+
+
 								echo '<ul id="shipping_method">';
-								
+
 								foreach ( $available_methods as $method )
 									echo '<li><input type="radio" name="shipping_method" id="shipping_method_' . sanitize_title( $method->id ) . '" value="' . esc_attr( $method->id ) . '" ' . checked( $method->id, $_SESSION['_chosen_shipping_method'], false) . ' /> <label for="shipping_method_' . sanitize_title( $method->id ) . '">' . $method->full_label . '</label></li>';
-								
+
 								echo '</ul>';
-							
+
 							}
-							
+
 						}
 
 					// No shipping methods are available
@@ -109,37 +113,37 @@
 
 					}
 				?></td>
-				
+
 			</tr>
-			
+
 			<?php do_action('woocommerce_review_order_after_shipping'); ?>
 
 			<?php endif; ?>
-			
-			<?php 
+
+			<?php
 				if ($woocommerce->cart->get_cart_tax()) :
-					
+
 					$taxes = $woocommerce->cart->get_formatted_taxes();
-					
+
 					if (sizeof($taxes)>0) :
-					
+
 						$has_compound_tax = false;
-						
+
 						foreach ($taxes as $key => $tax) : if ($woocommerce->cart->tax->is_compound( $key )) : $has_compound_tax = true; continue; endif;
 
 							?>
 							<tr class="tax-rate tax-rate-<?php echo $key; ?>">
-								<th colspan="2"><?php 
-									if ( get_option('woocommerce_prices_include_tax') == 'yes' ) 
-										_e('incl.&nbsp;', 'woocommerce'); 
-									echo $woocommerce->cart->tax->get_rate_label( $key ); 
+								<th colspan="2"><?php
+									if ( get_option('woocommerce_prices_include_tax') == 'yes' )
+										_e('incl.&nbsp;', 'woocommerce');
+									echo $woocommerce->cart->tax->get_rate_label( $key );
 								?></th>
 								<td><?php echo $tax; ?></td>
 							</tr>
 							<?php
-							
+
 						endforeach;
-						
+
 						if ($has_compound_tax && !$woocommerce->cart->prices_include_tax) :
 							?>
 							<tr class="order-subtotal">
@@ -148,32 +152,32 @@
 							</tr>
 							<?php
 						endif;
-						
+
 						foreach ($taxes as $key => $tax) : if (!$woocommerce->cart->tax->is_compound( $key )) continue;
 
 							?>
 							<tr class="tax-rate tax-rate-<?php echo $key; ?>">
-								<th colspan="2"><?php 
-									if ( get_option('woocommerce_prices_include_tax') == 'yes' ) 
-										_e('incl.&nbsp;', 'woocommerce'); 
-									echo $woocommerce->cart->tax->get_rate_label( $key ); 
+								<th colspan="2"><?php
+									if ( get_option('woocommerce_prices_include_tax') == 'yes' )
+										_e('incl.&nbsp;', 'woocommerce');
+									echo $woocommerce->cart->tax->get_rate_label( $key );
 								?></th>
 								<td><?php echo $tax; ?></td>
 							</tr>
 							<?php
-							
+
 						endforeach;
-					
+
 					else :
-					
+
 						?>
 						<tr class="tax">
 							<th colspan="2"><?php echo $woocommerce->countries->tax_or_vat(); ?></th>
 							<td><?php echo $woocommerce->cart->get_cart_tax(); ?></td>
 						</tr>
 						<?php
-					
-					endif;	
+
+					endif;
 				elseif ( get_option( 'woocommerce_display_cart_taxes_if_zero' ) == 'yes' ) :
 				?>
 
@@ -187,27 +191,27 @@
 			?>
 
 			<?php if ($woocommerce->cart->get_discounts_after_tax()) : ?>
-			
+
 			<tr class="discount">
 				<th colspan="2"><?php _e('Order Discount', 'woocommerce'); ?></th>
 				<td>-<?php echo $woocommerce->cart->get_discounts_after_tax(); ?></td>
 			</tr>
-			
+
 			<?php endif; ?>
-			
+
 			<?php do_action('woocommerce_before_order_total'); ?>
-			
+
 			<tr class="total">
 				<th colspan="2"><strong><?php _e('Order Total', 'woocommerce'); ?></strong></th>
 				<td><strong><?php echo $woocommerce->cart->get_total(); ?></strong></td>
 			</tr>
-			
+
 			<?php do_action('woocommerce_after_order_total'); ?>
-			
+
 		</tfoot>
 		<tbody>
 			<?php
-				if (sizeof($woocommerce->cart->get_cart())>0) : 
+				if (sizeof($woocommerce->cart->get_cart())>0) :
 					foreach ($woocommerce->cart->get_cart() as $item_id => $values) :
 						$_product = $values['data'];
 						if ($_product->exists() && $values['quantity']>0) :
@@ -218,20 +222,20 @@
 									<td class="product-total">' . apply_filters( 'woocommerce_checkout_item_subtotal', $woocommerce->cart->get_product_subtotal( $_product, $values['quantity'] ), $values, $item_id ) . '</td>
 								</tr>';
 						endif;
-					endforeach; 
+					endforeach;
 				endif;
 
 				do_action( 'woocommerce_cart_contents_review_order' );
 			?>
 		</tbody>
 	</table>
-	
+
 	<div id="payment">
 		<?php if ($woocommerce->cart->needs_payment()) : ?>
 		<ul class="payment_methods methods">
-			<?php 
+			<?php
 				$available_gateways = $woocommerce->payment_gateways->get_available_payment_gateways();
-				if ($available_gateways) : 
+				if ($available_gateways) :
 					// Chosen Method
 					if (sizeof($available_gateways)) :
 						$default_gateway = get_option('woocommerce_default_gateway');
@@ -247,9 +251,9 @@
 						?>
 						<li>
 						<input type="radio" id="payment_method_<?php echo $gateway->id; ?>" class="input-radio" name="payment_method" value="<?php echo esc_attr( $gateway->id ); ?>" <?php if ($gateway->chosen) echo 'checked="checked"'; ?> />
-						<label for="payment_method_<?php echo $gateway->id; ?>"><?php echo $gateway->get_title(); ?> <?php echo $gateway->get_icon(); ?></label> 
+						<label for="payment_method_<?php echo $gateway->id; ?>"><?php echo $gateway->get_title(); ?> <?php echo $gateway->get_icon(); ?></label>
 							<?php
-								if ( $gateway->has_fields() || $gateway->get_description() ) : 
+								if ( $gateway->has_fields() || $gateway->get_description() ) :
 									echo '<div class="payment_box payment_method_'.$gateway->id.'" style="display:none;">';
 									$gateway->payment_fields();
 									echo '</div>';
@@ -259,41 +263,41 @@
 						<?php
 					endforeach;
 				else :
-				
+
 					if ( !$woocommerce->customer->get_country() ) :
 						echo '<p>'.__('Please fill in your details above to see available payment methods.', 'woocommerce').'</p>';
 					else :
 						echo '<p>'.__('Sorry, it seems that there are no available payment methods for your state. Please contact us if you require assistance or wish to make alternate arrangements.', 'woocommerce').'</p>';
 					endif;
-					
+
 				endif;
 			?>
 		</ul>
 		<?php endif; ?>
 
 		<div class="form-row place-order">
-		
+
 			<noscript><?php _e('Since your browser does not support JavaScript, or it is disabled, please ensure you click the <em>Update Totals</em> button before placing your order. You may be charged more than the amount stated above if you fail to do so.', 'woocommerce'); ?><br/><input type="submit" class="button alt" name="woocommerce_checkout_update_totals" value="<?php _e('Update totals', 'woocommerce'); ?>" /></noscript>
-		
+
 			<?php $woocommerce->nonce_field('process_checkout')?>
-			
+
 			<?php do_action( 'woocommerce_review_order_before_submit' ); ?>
-			
+
 			<input type="submit" class="button alt" name="woocommerce_checkout_place_order" id="place_order" value="<?php echo apply_filters('woocommerce_order_button_text', __('Place order', 'woocommerce')); ?>" />
-			
+
 			<?php if (woocommerce_get_page_id('terms')>0) : ?>
 			<p class="form-row terms">
 				<label for="terms" class="checkbox"><?php _e('I accept the', 'woocommerce'); ?> <a href="<?php echo esc_url( get_permalink(woocommerce_get_page_id('terms')) ); ?>" target="_blank"><?php _e('terms &amp; conditions', 'woocommerce'); ?></a></label>
 				<input type="checkbox" class="input-checkbox" name="terms" <?php if (isset($_POST['terms'])) echo 'checked="checked"'; ?> id="terms" />
 			</p>
 			<?php endif; ?>
-			
+
 			<?php do_action( 'woocommerce_review_order_after_submit' ); ?>
-			
+
 		</div>
-		
+
 		<div class="clear"></div>
 
 	</div>
-	
+
 </div>
\ No newline at end of file
diff --git a/templates/checkout/thankyou.php b/templates/checkout/thankyou.php
index 617060a0db9a..cafe63565cc1 100644
--- a/templates/checkout/thankyou.php
+++ b/templates/checkout/thankyou.php
@@ -1,15 +1,20 @@
 <?php
 /**
- * Thankyou Page
+ * Thankyou page
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
- 
+
+
 global $woocommerce;
 ?>
 
 <?php if ($order) : ?>
 
 	<?php if (in_array($order->status, array('failed'))) : ?>
-				
+
 		<p><?php _e('Unfortunately your order cannot be processed as the originating bank/merchant has declined your transaction.', 'woocommerce'); ?></p>
 
 		<p><?php
@@ -19,7 +24,7 @@
 				_e('Please attempt your purchase again.', 'woocommerce');
 			endif;
 		?></p>
-				
+
 		<p>
 			<a href="<?php echo esc_url( $order->get_checkout_payment_url() ); ?>" class="button pay"><?php _e('Pay', 'woocommerce') ?></a>
 			<?php if (is_user_logged_in()) : ?>
@@ -28,9 +33,9 @@
 		</p>
 
 	<?php else : ?>
-				
+
 		<p><?php _e('Thank you. Your order has been received.', 'woocommerce'); ?></p>
-				
+
 		<ul class="order_details">
 			<li class="order">
 				<?php _e('Order:', 'woocommerce'); ?>
@@ -47,21 +52,21 @@
 			<?php if ($order->payment_method_title) : ?>
 			<li class="method">
 				<?php _e('Payment method:', 'woocommerce'); ?>
-				<strong><?php 
+				<strong><?php
 					echo $order->payment_method_title;
 				?></strong>
 			</li>
 			<?php endif; ?>
 		</ul>
 		<div class="clear"></div>
-				
+
 	<?php endif; ?>
-		
+
 	<?php do_action( 'woocommerce_thankyou_' . $order->payment_method, $order->id ); ?>
 	<?php do_action( 'woocommerce_thankyou', $order->id ); ?>
 
 <?php else : ?>
-	
+
 	<p><?php _e('Thank you. Your order has been received.', 'woocommerce'); ?></p>
-	
+
 <?php endif; ?>
\ No newline at end of file
diff --git a/templates/content-product.php b/templates/content-product.php
index 7cf1fc516cc4..3c6030c56f07 100644
--- a/templates/content-product.php
+++ b/templates/content-product.php
@@ -4,61 +4,62 @@
  *
  * Override this template by copying it to yourtheme/woocommerce/content-product.php
  *
- * @package WooCommerce
- * @since WooCommerce 1.6
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
- 
+
 global $product, $woocommerce_loop;
 
 // Store loop count we're currently on
-if ( empty( $woocommerce_loop['loop'] ) ) 
+if ( empty( $woocommerce_loop['loop'] ) )
 	$woocommerce_loop['loop'] = 0;
 
 // Store column count for displaying the grid
-if ( empty( $woocommerce_loop['columns'] ) ) 
+if ( empty( $woocommerce_loop['columns'] ) )
 	$woocommerce_loop['columns'] = apply_filters( 'loop_shop_columns', 4 );
 
 // Ensure visibilty
-if ( ! $product->is_visible() ) 
-	return; 
+if ( ! $product->is_visible() )
+	return;
 
 // Increase loop count
 $woocommerce_loop['loop']++;
 ?>
-<li class="product <?php 
-	if ( $woocommerce_loop['loop'] % $woocommerce_loop['columns'] == 0 ) 
-		echo 'last'; 
-	elseif ( ( $woocommerce_loop['loop'] - 1 ) % $woocommerce_loop['columns'] == 0 ) 
-		echo 'first'; 
+<li class="product <?php
+	if ( $woocommerce_loop['loop'] % $woocommerce_loop['columns'] == 0 )
+		echo 'last';
+	elseif ( ( $woocommerce_loop['loop'] - 1 ) % $woocommerce_loop['columns'] == 0 )
+		echo 'first';
 	?>">
 
 	<?php do_action( 'woocommerce_before_shop_loop_item' ); ?>
-		
+
 	<a href="<?php the_permalink(); ?>">
-				
+
 		<?php
-			/** 
+			/**
 			 * woocommerce_before_shop_loop_item_title hook
 			 *
 			 * @hooked woocommerce_show_product_loop_sale_flash - 10
 			 * @hooked woocommerce_template_loop_product_thumbnail - 10
-			 */	  
-			do_action( 'woocommerce_before_shop_loop_item_title' ); 
+			 */
+			do_action( 'woocommerce_before_shop_loop_item_title' );
 		?>
-		
+
 		<h3><?php the_title(); ?></h3>
 
 		<?php
-			/** 
+			/**
 			 * woocommerce_after_shop_loop_item_title hook
 			 *
 			 * @hooked woocommerce_template_loop_price - 10
-			 */	  
-			do_action( 'woocommerce_after_shop_loop_item_title' ); 
+			 */
+			do_action( 'woocommerce_after_shop_loop_item_title' );
 		?>
-	
+
 	</a>
-	
+
 	<?php do_action( 'woocommerce_after_shop_loop_item' ); ?>
-			
+
 </li>
\ No newline at end of file
diff --git a/templates/content-product_cat.php b/templates/content-product_cat.php
index dc47aee83d0a..9c3e0e1bdbf2 100644
--- a/templates/content-product_cat.php
+++ b/templates/content-product_cat.php
@@ -4,59 +4,60 @@
  *
  * Override this template by copying it to yourtheme/woocommerce/content-product_cat.php
  *
- * @package WooCommerce
- * @since WooCommerce 1.6
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
- 
+
 global $woocommerce_loop;
 
 // Store loop count we're currently on
-if ( empty( $woocommerce_loop['loop'] ) ) 
+if ( empty( $woocommerce_loop['loop'] ) )
 	$woocommerce_loop['loop'] = 0;
 
 // Store column count for displaying the grid
-if ( empty( $woocommerce_loop['columns'] ) ) 
+if ( empty( $woocommerce_loop['columns'] ) )
 	$woocommerce_loop['columns'] = apply_filters( 'loop_shop_columns', 4 );
 
 // Increase loop count
 $woocommerce_loop['loop']++;
 ?>
-<li class="product <?php 
-	if ( $woocommerce_loop['loop'] % $woocommerce_loop['columns'] == 0 ) 
-		echo 'last'; 
-	elseif ( ( $woocommerce_loop['loop'] - 1 ) % $woocommerce_loop['columns'] == 0 ) 
-		echo 'first'; 
+<li class="product <?php
+	if ( $woocommerce_loop['loop'] % $woocommerce_loop['columns'] == 0 )
+		echo 'last';
+	elseif ( ( $woocommerce_loop['loop'] - 1 ) % $woocommerce_loop['columns'] == 0 )
+		echo 'first';
 	?>">
 
 	<?php do_action( 'woocommerce_before_subcategory', $category ); ?>
-		
+
 	<a href="<?php echo get_term_link( $category->slug, 'product_cat' ); ?>">
-				
+
 		<?php
-			/** 
+			/**
 			 * woocommerce_before_subcategory_title hook
 			 *
 			 * @hooked woocommerce_subcategory_thumbnail - 10
-			 */	  
-			do_action( 'woocommerce_before_subcategory_title', $category ); 
+			 */
+			do_action( 'woocommerce_before_subcategory_title', $category );
 		?>
-		
+
 		<h3>
-			<?php echo $category->name; ?> 
+			<?php echo $category->name; ?>
 			<?php if ( $category->count > 0 ) : ?>
 				<mark class="count">(<?php echo $category->count; ?>)</mark>
 			<?php endif; ?>
 		</h3>
 
 		<?php
-			/** 
+			/**
 			 * woocommerce_after_subcategory_title hook
-			 */	  
-			do_action( 'woocommerce_after_subcategory_title', $category ); 
+			 */
+			do_action( 'woocommerce_after_subcategory_title', $category );
 		?>
-	
+
 	</a>
-	
+
 	<?php do_action( 'woocommerce_after_subcategory', $category ); ?>
-			
+
 </li>
\ No newline at end of file
diff --git a/templates/content-single-product.php b/templates/content-single-product.php
index 7beaee15c395..6f44a003b839 100644
--- a/templates/content-single-product.php
+++ b/templates/content-single-product.php
@@ -4,36 +4,36 @@
  *
  * Override this template by copying it to yourtheme/woocommerce/content-single-product.php
  *
- * @package WooCommerce
- * @since WooCommerce 1.6
- * @todo prepend class names with wc-
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
 ?>
 
-<?php 
-	/** 
+<?php
+	/**
 	 * woocommerce_before_single_product hook
 	 *
 	 * @hooked woocommerce_show_messages - 10
 	 */
-	 do_action( 'woocommerce_before_single_product' ); 
+	 do_action( 'woocommerce_before_single_product' );
 ?>
 
 <div itemscope itemtype="http://schema.org/Product" id="product-<?php the_ID(); ?>" <?php post_class(); ?>>
 
-	<?php 
-		/** 
+	<?php
+		/**
 		 * woocommerce_show_product_images hook
 		 *
 		 * @hooked woocommerce_show_product_sale_flash - 10
 		 * @hooked woocommerce_show_product_images - 20
 		 */
-		do_action( 'woocommerce_before_single_product_summary' ); 
+		do_action( 'woocommerce_before_single_product_summary' );
 	?>
 
 	<div class="summary">
 
-		<?php 
+		<?php
 			/**
 			 * woocommerce_single_product_summary hook
 			 *
@@ -44,12 +44,12 @@
 			 * @hooked woocommerce_template_single_meta - 40
 			 * @hooked woocommerce_template_single_sharing - 50
 			 */
-			do_action( 'woocommerce_single_product_summary' ); 	
+			do_action( 'woocommerce_single_product_summary' );
 		?>
 
 	</div><!-- .summary -->
 
-	<?php 
+	<?php
 		/**
 		 * woocommerce_after_single_product_summary hook
 		 *
@@ -58,7 +58,7 @@
 		 */
 		do_action( 'woocommerce_after_single_product_summary' );
 	?>
-				
+
 </div><!-- #product-<?php the_ID(); ?> -->
 
 <?php do_action( 'woocommerce_after_single_product' ); ?>
\ No newline at end of file
diff --git a/templates/emails/admin-new-order.php b/templates/emails/admin-new-order.php
index bb5b46c34695..37150ed8a4df 100644
--- a/templates/emails/admin-new-order.php
+++ b/templates/emails/admin-new-order.php
@@ -1,4 +1,13 @@
-<?php if (!defined('ABSPATH')) exit; ?>
+<?php
+/**
+ * Admin new order email
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates/Emails
+ * @version     1.6.4
+ */
+
+if (!defined('ABSPATH')) exit; ?>
 
 <?php do_action('woocommerce_email_header', $email_heading); ?>
 
@@ -20,7 +29,7 @@
 		<?php echo $order->email_order_items_table( false, true ); ?>
 	</tbody>
 	<tfoot>
-		<?php 
+		<?php
 			if ( $totals = $order->get_order_item_totals() ) {
 				$i = 0;
 				foreach ( $totals as $total ) {
@@ -28,7 +37,7 @@
 					?><tr>
 						<th scope="row" colspan="2" style="text-align:left; border: 1px solid #eee; <?php if ( $i == 1 ) echo 'border-top-width: 4px;'; ?>"><?php echo $total['label']; ?></th>
 						<td style="text-align:left; border: 1px solid #eee; <?php if ( $i == 1 ) echo 'border-top-width: 4px;'; ?>"><?php echo $total['value']; ?></td>
-					</tr><?php 
+					</tr><?php
 				}
 			}
 		?>
diff --git a/templates/emails/customer-completed-order.php b/templates/emails/customer-completed-order.php
index 6fbdd965b21c..19271ce5dcab 100644
--- a/templates/emails/customer-completed-order.php
+++ b/templates/emails/customer-completed-order.php
@@ -1,4 +1,13 @@
-<?php if (!defined('ABSPATH')) exit; ?>
+<?php
+/**
+ * Customer completed order email
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates/Emails
+ * @version     1.6.4
+ */
+
+if (!defined('ABSPATH')) exit; ?>
 
 <?php do_action('woocommerce_email_header', $email_heading); ?>
 
@@ -20,7 +29,7 @@
 		<?php echo $order->email_order_items_table( true, false, true ); ?>
 	</tbody>
 	<tfoot>
-		<?php 
+		<?php
 			if ( $totals = $order->get_order_item_totals() ) {
 				$i = 0;
 				foreach ( $totals as $total ) {
@@ -28,7 +37,7 @@
 					?><tr>
 						<th scope="row" colspan="2" style="text-align:left; border: 1px solid #eee; <?php if ( $i == 1 ) echo 'border-top-width: 4px;'; ?>"><?php echo $total['label']; ?></th>
 						<td style="text-align:left; border: 1px solid #eee; <?php if ( $i == 1 ) echo 'border-top-width: 4px;'; ?>"><?php echo $total['value']; ?></td>
-					</tr><?php 
+					</tr><?php
 				}
 			}
 		?>
diff --git a/templates/emails/customer-invoice.php b/templates/emails/customer-invoice.php
index 18288370b0ab..62e4aae7551a 100644
--- a/templates/emails/customer-invoice.php
+++ b/templates/emails/customer-invoice.php
@@ -1,11 +1,20 @@
-<?php if (!defined('ABSPATH')) exit; ?>
+<?php
+/**
+ * Customer invoice email
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates/Emails
+ * @version     1.6.4
+ */
+
+if (!defined('ABSPATH')) exit; ?>
 
 <?php do_action('woocommerce_email_header', $email_heading); ?>
 
 <?php if ($order->status=='pending') : ?>
 
 	<p><?php printf( __( 'An order has been created for you on &ldquo;%s&rdquo;. To pay for this order please use the following link: <a href="%s">Pay</a>', 'woocommerce' ), get_bloginfo( 'name' ), $order->get_checkout_payment_url() ); ?></p>
-	
+
 <?php endif; ?>
 
 <?php do_action('woocommerce_email_before_order_table', $order, false); ?>
@@ -21,22 +30,22 @@
 		</tr>
 	</thead>
 	<tbody>
-		<?php 
+		<?php
 			switch ( $order->status ) {
 				case "completed" :
 					echo $order->email_order_items_table( true, false, true );
 				break;
 				case "processing" :
-					echo $order->email_order_items_table( get_option('woocommerce_downloads_grant_access_after_payment')=='yes' ? true : false, true, true ); 
+					echo $order->email_order_items_table( get_option('woocommerce_downloads_grant_access_after_payment')=='yes' ? true : false, true, true );
 				break;
 				default :
-					echo $order->email_order_items_table( false, true, false ); 
+					echo $order->email_order_items_table( false, true, false );
 				break;
 			}
 		?>
 	</tbody>
 	<tfoot>
-		<?php 
+		<?php
 			if ( $totals = $order->get_order_item_totals() ) {
 				$i = 0;
 				foreach ( $totals as $total ) {
@@ -44,7 +53,7 @@
 					?><tr>
 						<th scope="row" colspan="2" style="text-align:left; border: 1px solid #eee; <?php if ( $i == 1 ) echo 'border-top-width: 4px;'; ?>"><?php echo $total['label']; ?></th>
 						<td style="text-align:left; border: 1px solid #eee; <?php if ( $i == 1 ) echo 'border-top-width: 4px;'; ?>"><?php echo $total['value']; ?></td>
-					</tr><?php 
+					</tr><?php
 				}
 			}
 		?>
diff --git a/templates/emails/customer-new-account.php b/templates/emails/customer-new-account.php
index 94d6d717c044..db3e22ceb430 100644
--- a/templates/emails/customer-new-account.php
+++ b/templates/emails/customer-new-account.php
@@ -1,4 +1,13 @@
-<?php if (!defined('ABSPATH')) exit; ?>
+<?php
+/**
+ * Customer new account email
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates/Emails
+ * @version     1.6.4
+ */
+
+if (!defined('ABSPATH')) exit; ?>
 
 <?php do_action('woocommerce_email_header', $email_heading); ?>
 
diff --git a/templates/emails/customer-note.php b/templates/emails/customer-note.php
index a845819ada3c..f0b7187371be 100644
--- a/templates/emails/customer-note.php
+++ b/templates/emails/customer-note.php
@@ -1,4 +1,13 @@
-<?php if (!defined('ABSPATH')) exit; ?>
+<?php
+/**
+ * Customer note email
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates/Emails
+ * @version     1.6.4
+ */
+
+if (!defined('ABSPATH')) exit; ?>
 
 <?php do_action('woocommerce_email_header', $email_heading); ?>
 
@@ -24,7 +33,7 @@
 		<?php if ($order->status=='completed') echo $order->email_order_items_table( true, true ); else echo $order->email_order_items_table( false, true ); ?>
 	</tbody>
 	<tfoot>
-		<?php 
+		<?php
 			if ( $totals = $order->get_order_item_totals() ) {
 				$i = 0;
 				foreach ( $totals as $total ) {
@@ -32,7 +41,7 @@
 					?><tr>
 						<th scope="row" colspan="2" style="text-align:left; border: 1px solid #eee; <?php if ( $i == 1 ) echo 'border-top-width: 4px;'; ?>"><?php echo $total['label']; ?></th>
 						<td style="text-align:left; border: 1px solid #eee; <?php if ( $i == 1 ) echo 'border-top-width: 4px;'; ?>"><?php echo $total['value']; ?></td>
-					</tr><?php 
+					</tr><?php
 				}
 			}
 		?>
diff --git a/templates/emails/customer-processing-order.php b/templates/emails/customer-processing-order.php
index 31b9e2f9bc4f..7c4a3c646fa5 100644
--- a/templates/emails/customer-processing-order.php
+++ b/templates/emails/customer-processing-order.php
@@ -1,4 +1,13 @@
-<?php if (!defined('ABSPATH')) exit; ?>
+<?php
+/**
+ * Customer processing order email
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates/Emails
+ * @version     1.6.4
+ */
+
+if (!defined('ABSPATH')) exit; ?>
 
 <?php do_action('woocommerce_email_header', $email_heading); ?>
 
@@ -20,7 +29,7 @@
 		<?php echo $order->email_order_items_table( (get_option('woocommerce_downloads_grant_access_after_payment')=='yes' && $order->status=='processing') ? true : false, true, ($order->status=='processing') ? true : false ); ?>
 	</tbody>
 	<tfoot>
-		<?php 
+		<?php
 			if ( $totals = $order->get_order_item_totals() ) {
 				$i = 0;
 				foreach ( $totals as $total ) {
@@ -28,7 +37,7 @@
 					?><tr>
 						<th scope="row" colspan="2" style="text-align:left; border: 1px solid #eee; <?php if ( $i == 1 ) echo 'border-top-width: 4px;'; ?>"><?php echo $total['label']; ?></th>
 						<td style="text-align:left; border: 1px solid #eee; <?php if ( $i == 1 ) echo 'border-top-width: 4px;'; ?>"><?php echo $total['value']; ?></td>
-					</tr><?php 
+					</tr><?php
 				}
 			}
 		?>
diff --git a/templates/emails/email-addresses.php b/templates/emails/email-addresses.php
index 90dc56286096..efba7520be8b 100644
--- a/templates/emails/email-addresses.php
+++ b/templates/emails/email-addresses.php
@@ -1,13 +1,22 @@
-<table cellspacing="0" cellpadding="0" style="width: 100%; vertical-align: top;" border="0">
+<?php
+/**
+ * Email Addresses
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates/Emails
+ * @version     1.6.4
+ */
+
+?><table cellspacing="0" cellpadding="0" style="width: 100%; vertical-align: top;" border="0">
 
 	<tr>
 
 		<td valign="top" width="50%">
 
 			<h3><?php _e('Billing address', 'woocommerce'); ?></h3>
-	
+
 			<p><?php echo $order->get_formatted_billing_address(); ?></p>
-			
+
 		</td>
 
 		<?php if ( get_option( 'woocommerce_ship_to_billing_address_only' ) == 'no' ) : ?>
@@ -15,13 +24,13 @@
 		<td valign="top" width="50%">
 
 			<h3><?php _e('Shipping address', 'woocommerce'); ?></h3>
-	
+
 			<p><?php echo $order->get_formatted_shipping_address(); ?></p>
-		
-		</td>	
-			
+
+		</td>
+
 		<?php endif; ?>
 
 	</tr>
-	
+
 </table>
\ No newline at end of file
diff --git a/templates/emails/email-footer.php b/templates/emails/email-footer.php
index e8182bb6817a..0cf5f935fc6e 100644
--- a/templates/emails/email-footer.php
+++ b/templates/emails/email-footer.php
@@ -1,3 +1,13 @@
+<?php
+/**
+ * Email Footer
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates/Emails
+ * @version     1.6.4
+ */
+
+?>
 															</div>
 														</td>
                                                     </tr>
@@ -21,7 +31,7 @@
                                                         	<?php echo wpautop(wptexturize(apply_filters('woocommerce_email_footer_text', get_option('woocommerce_email_footer_text')))); ?>
                                                         </td>
                                                     </tr>
-                                                   
+
                                                 </table>
                                             </td>
                                         </tr>
diff --git a/templates/emails/email-header.php b/templates/emails/email-header.php
index 4638db6325d3..687f27d95107 100644
--- a/templates/emails/email-header.php
+++ b/templates/emails/email-header.php
@@ -1,8 +1,17 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<?php
+/**
+ * Email Header
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates/Emails
+ * @version     1.6.4
+ */
+
+?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        
+
         <title><?php echo get_bloginfo('name'); ?></title>
 		<style type="text/css">
 			/* Client-specific/Reset Styles */
@@ -10,7 +19,7 @@
 			body{
 				width:100% !important; /* Force Hotmail to display emails at full width */
 				-webkit-text-size-adjust:none; /* Prevent Webkit platforms from changing default text sizes. */
-				margin:0; 
+				margin:0;
 				padding:0;
 			}
 			img{border:none; font-size:14px; font-weight:bold; height:auto; line-height:100%; outline:none; text-decoration:none; text-transform:capitalize;}
@@ -21,7 +30,7 @@
 			body {
 				background: <?php echo get_option('woocommerce_email_background_color'); ?> url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJCAYAAADgkQYQAAAAOklEQVQYGWP8//8/AyHAREgBIyOjMQPIJFwYaIAxSI6RbOvAViC7A90qmBXI4qRZh2EFunXYrEC2DgDc+VH0jS2AGAAAAABJRU5ErkJggg==);
 			}
-			
+
 			#templateContainer{
 				border: 1px solid <?php echo woocommerce_hex_darker(get_option('woocommerce_email_background_color'), 20); ?>;
 				-webkit-box-shadow:0 0 0 3px rgba(0,0,0,0.1);
@@ -146,20 +155,20 @@
         	<table border="0" cellpadding="0" cellspacing="0" height="100%" width="100%" id="backgroundTable">
             	<tr>
                 	<td align="center" valign="top">
-                	
+
                 		<?php
                 			if ($img = get_option('woocommerce_email_header_image')) :
                 				echo '<p style="margin-top:0;"><img src="'.$img.'" alt="'.get_bloginfo('name').'" /></p>';
                 			endif;
                 		?>
-                        
+
                         <!-- // End Template Preheader \\ -->
                     	<table border="0" cellpadding="0" cellspacing="0" width="600" id="templateContainer" style="-webkit-box-shadow:0 0 0 3px rgba(0,0,0,0.025); -webkit-border-radius:6px;background-color:<?php echo get_option('woocommerce_email_body_background_color'); ?>;">
                         	<tr>
                             	<td align="center" valign="top">
                                     <!-- // Begin Template Header \\ -->
                                 	<table border="0" cellpadding="0" cellspacing="0" width="600" id="templateHeader" style="background-color:<?php echo get_option('woocommerce_email_base_color'); ?>; -webkit-border-top-left-radius:6px; -webkit-border-top-right-radius:6px; color:<?php echo woocommerce_light_or_dark(get_option('woocommerce_email_base_color'), '#202020', '#ffffff'); ?>; font-family:Arial; font-weight:bold; line-height:100%; vertical-align:middle;">
-                                	
+
                                         <tr>
                                             <td class="headerContent" style="padding:24px; ">
 
@@ -168,7 +177,7 @@
                                             		echo $email_heading;
                                             	?></h1>
                                             	<!-- // End Module: Standard Header Image \\ -->
-                                            
+
                                             </td>
                                         </tr>
                                     </table>
@@ -181,7 +190,7 @@
                                 	<table border="0" cellpadding="0" cellspacing="0" width="600" id="templateBody">
                                     	<tr>
                                             <td valign="top" class="bodyContent" style="background-color:<?php echo get_option('woocommerce_email_body_background_color'); ?>;">
-                                
+
                                                 <!-- // Begin Module: Standard Content \\ -->
                                                 <table border="0" cellpadding="20" cellspacing="0" width="100%">
                                                     <tr>
diff --git a/templates/emails/email-order-items.php b/templates/emails/email-order-items.php
index 6a24defc7384..d3b78dbc063f 100644
--- a/templates/emails/email-order-items.php
+++ b/templates/emails/email-order-items.php
@@ -3,41 +3,45 @@
  * Email Order Item
  *
  * Shows a line item inside the order emails table
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates/Emails
+ * @version     1.6.4
  */
- 
+
 global $woocommerce;
 
-foreach ($items as $item) : 
+foreach ($items as $item) :
 
 	// Get/prep product data
-	$_product = $order->get_product_from_item( $item ); 
+	$_product = $order->get_product_from_item( $item );
 	$item_meta = new order_item_meta( $item['item_meta'] );
 	$image = ($show_image) ? '<img src="'. current(wp_get_attachment_image_src( get_post_thumbnail_id( $_product->id ), 'thumbnail')) .'" alt="Product Image" height="'.$image_size[1].'" width="'.$image_size[0].'" style="vertical-align:middle; margin-right: 10px;" />' : '';
-	
+
 	?>
 	<tr>
-		<td style="text-align:left; vertical-align:middle; border: 1px solid #eee;"><?php 
-			
+		<td style="text-align:left; vertical-align:middle; border: 1px solid #eee;"><?php
+
 			// Show title/image etc
 			echo 	apply_filters( 'woocommerce_order_product_image', $image, $_product, $show_image);
-					
+
 			// Product name
 			echo 	apply_filters( 'woocommerce_order_product_title', $item['name'], $_product );
-					
+
 			// SKU
 			echo 	($show_sku && $_product->get_sku()) ? ' (#' . $_product->get_sku() . ')' : '';
-					
+
 			// File URL
 			echo 	( $show_download_links && $_product->exists() && $_product->is_downloadable() && $_product->has_file() ) ? '<br/><small>' . __( 'Download:', 'woocommerce' ) . ' <a href="' . $order->get_downloadable_file_url( $item['id'], $item['variation_id'] ) . '" target="_blank">' . $order->get_downloadable_file_url( $item['id'], $item['variation_id'] ) . '</a></small>' : '';
-					
+
 			// Variation
 			echo 	($item_meta->meta) ? '<br/><small>' . nl2br( $item_meta->display( true, true ) ) . '</small>' : '';
-					
+
 		?></td>
 		<td style="text-align:left; vertical-align:middle; border: 1px solid #eee;"><?php echo $item['qty'] ;?></td>
 		<td style="text-align:left; vertical-align:middle; border: 1px solid #eee;"><?php echo $order->get_formatted_line_subtotal( $item ); ?></td>
 	</tr>
-	
+
 	<?php if ($show_purchase_note && $purchase_note = get_post_meta( $_product->id, '_purchase_note', true)) : ?>
 		<tr>
 			<td colspan="3" style="text-align:left; vertical-align:middle; border: 1px solid #eee;"><?php echo apply_filters('the_content', $purchase_note); ?></td>
diff --git a/templates/loop-shop.php b/templates/loop-shop.php
index 9ebd8ec79fc6..2d512c8d0d89 100644
--- a/templates/loop-shop.php
+++ b/templates/loop-shop.php
@@ -4,10 +4,12 @@
  *
  * Outputs a product loop
  *
- * @package WooCommerce
- * @deprecated-since WooCommerce 1.6
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
+ * @deprecated 	1.6
  */
- 
+
 _deprecated_file( basename(__FILE__), '1.6' );
 ?>
 
@@ -16,7 +18,7 @@
 	<?php do_action('woocommerce_before_shop_loop'); ?>
 
 	<ul class="products">
-	
+
 		<?php woocommerce_product_subcategories(); ?>
 
 		<?php while ( have_posts() ) : the_post(); ?>
@@ -24,7 +26,7 @@
 			<?php woocommerce_get_template_part( 'content', 'product' ); ?>
 
 		<?php endwhile; // end of the loop. ?>
-		
+
 	</ul>
 
 	<?php do_action('woocommerce_after_shop_loop'); ?>
@@ -32,9 +34,9 @@
 <?php else : ?>
 
 	<?php if ( ! woocommerce_product_subcategories( array( 'before' => '<ul class="products">', 'after' => '</ul>' ) ) ) : ?>
-			
+
 		<p><?php _e( 'No products found which match your selection.', 'woocommerce' ); ?></p>
-			
+
 	<?php endif; ?>
 
 <?php endif; ?>
diff --git a/templates/loop/add-to-cart.php b/templates/loop/add-to-cart.php
index 530f02ae0258..34e2d331f6e3 100644
--- a/templates/loop/add-to-cart.php
+++ b/templates/loop/add-to-cart.php
@@ -1,6 +1,10 @@
 <?php
 /**
  * Loop Add to Cart
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
 
 global $product;
diff --git a/templates/loop/pagination.php b/templates/loop/pagination.php
index 21c9fba95d0a..29159fdd0421 100644
--- a/templates/loop/pagination.php
+++ b/templates/loop/pagination.php
@@ -1,6 +1,10 @@
 <?php
 /**
  * Pagination
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
 
 global $wp_query;
diff --git a/templates/loop/price.php b/templates/loop/price.php
index d0adddcbe9cd..a51c0dbb82c3 100644
--- a/templates/loop/price.php
+++ b/templates/loop/price.php
@@ -1,6 +1,10 @@
 <?php
 /**
  * Loop Price
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
 
 global $product;
diff --git a/templates/loop/sale-flash.php b/templates/loop/sale-flash.php
index 10d5b10b3e53..091e6f40089f 100644
--- a/templates/loop/sale-flash.php
+++ b/templates/loop/sale-flash.php
@@ -1,12 +1,16 @@
 <?php
 /**
- * Product Loop Sale Flash
+ * Product loop sale flash
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
 
 global $post, $product;
 ?>
 <?php if ($product->is_on_sale()) : ?>
-	
+
 	<?php echo apply_filters('woocommerce_sale_flash', '<span class="onsale">'.__('Sale!', 'woocommerce').'</span>', $post, $product); ?>
-	
+
 <?php endif; ?>
\ No newline at end of file
diff --git a/templates/loop/sorting.php b/templates/loop/sorting.php
index d012071e5222..62de18bbcdac 100644
--- a/templates/loop/sorting.php
+++ b/templates/loop/sorting.php
@@ -1,7 +1,12 @@
 <?php
 /**
  * Sorting
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
+
 ?>
 <form class="woocommerce_ordering" method="POST">
 	<select name="sort" class="orderby">
@@ -13,7 +18,7 @@
 				'price' 		=> __('Sort by price', 'woocommerce')
 			));
 
-			foreach ( $catalog_orderby as $id => $name ) 
+			foreach ( $catalog_orderby as $id => $name )
 				echo '<option value="' . $id . '" ' . selected( $_SESSION['orderby'], $id, false ) . '>' . $name . '</option>';
 		?>
 	</select>
diff --git a/templates/myaccount/form-change-password.php b/templates/myaccount/form-change-password.php
index b3b7737fa605..e1c8fa4058ca 100644
--- a/templates/myaccount/form-change-password.php
+++ b/templates/myaccount/form-change-password.php
@@ -1,8 +1,12 @@
 <?php
 /**
- * Change Password Form
+ * Change password form
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
- 
+
 global $woocommerce;
 ?>
 
@@ -19,10 +23,10 @@
 		<input type="password" class="input-text" name="password_2" id="password_2" />
 	</p>
 	<div class="clear"></div>
-	
+
 	<p><input type="submit" class="button" name="change_password" value="<?php _e('Save', 'woocommerce'); ?>" /></p>
-	
+
 	<?php $woocommerce->nonce_field('change_password')?>
 	<input type="hidden" name="action" value="change_password" />
-	
+
 </form>
\ No newline at end of file
diff --git a/templates/myaccount/form-edit-address.php b/templates/myaccount/form-edit-address.php
index 33011e4485bd..c698d92b6678 100644
--- a/templates/myaccount/form-edit-address.php
+++ b/templates/myaccount/form-edit-address.php
@@ -1,8 +1,12 @@
 <?php
 /**
- * Edit Address Form
+ * Edit address form
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
- 
+
 global $woocommerce, $current_user;
 
 get_currentuserinfo();
@@ -17,27 +21,27 @@
 <?php else : ?>
 
 	<form action="<?php echo esc_url( add_query_arg( 'address', $load_address, get_permalink( woocommerce_get_page_id('edit_address') ) ) ); ?>" method="post">
-		
+
 		<h3><?php if ($load_address=='billing') _e('Billing Address', 'woocommerce'); else _e('Shipping Address', 'woocommerce'); ?></h3>
-		
-		<?php 
+
+		<?php
 		foreach ($address as $key => $field) :
 			$value = (isset($_POST[$key])) ? $_POST[$key] : get_user_meta( get_current_user_id(), $key, true );
-			
+
 			// Default values
 			if (!$value && ($key=='billing_email' || $key=='shipping_email')) $value = $current_user->user_email;
 			if (!$value && ($key=='billing_country' || $key=='shipping_country')) $value = $woocommerce->countries->get_base_country();
 			if (!$value && ($key=='billing_state' || $key=='shipping_state')) $value = $woocommerce->countries->get_base_state();
-			
+
 			woocommerce_form_field( $key, $field, $value );
 		endforeach;
 		?>
-		
+
 		<input type="submit" class="button" name="save_address" value="<?php _e('Save Address', 'woocommerce'); ?>" />
-		
+
 		<?php $woocommerce->nonce_field('edit_address') ?>
 		<input type="hidden" name="action" value="edit_address" />
-	
+
 	</form>
 
 <?php endif; ?>
\ No newline at end of file
diff --git a/templates/myaccount/form-login.php b/templates/myaccount/form-login.php
index e1c7a50def6f..1af1ffd3c072 100644
--- a/templates/myaccount/form-login.php
+++ b/templates/myaccount/form-login.php
@@ -1,4 +1,13 @@
-<?php global $woocommerce; ?>
+<?php
+/**
+ * Login Form
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
+ */
+
+global $woocommerce; ?>
 
 <?php $woocommerce->show_messages(); ?>
 
diff --git a/templates/myaccount/my-account.php b/templates/myaccount/my-account.php
index f7ddd692aee0..90f4e7adf8cc 100644
--- a/templates/myaccount/my-account.php
+++ b/templates/myaccount/my-account.php
@@ -1,8 +1,12 @@
 <?php
 /**
- * My Account
+ * My Account page
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
- 
+
 global $woocommerce;
 ?>
 
@@ -19,12 +23,12 @@
 		<li><?php if (is_numeric($download['downloads_remaining'])) : ?><span class="count"><?php echo $download['downloads_remaining'] . _n('&nbsp;download remaining', '&nbsp;downloads remaining', $download['downloads_remaining'], 'woocommerce'); ?></span><?php endif; ?> <a href="<?php echo esc_url( $download['download_url'] ); ?>"><?php echo $download['download_name']; ?></a></li>
 	<?php endforeach; ?>
 </ul>
-<?php endif; ?>	
+<?php endif; ?>
 
 <h2><?php _e('Recent Orders', 'woocommerce'); ?></h2>
 <?php woocommerce_get_template('myaccount/my-orders.php', array( 'recent_orders' => $recent_orders )); ?>
 
-<h2><?php _e('My Address', 'woocommerce'); ?></h2>	
+<h2><?php _e('My Address', 'woocommerce'); ?></h2>
 <p class="myaccount_address"><?php _e('The following addresses will be used on the checkout page by default.', 'woocommerce'); ?></p>
 <?php woocommerce_get_template('myaccount/my-address.php'); ?>
 
diff --git a/templates/myaccount/my-address.php b/templates/myaccount/my-address.php
index 728efe34b1db..167c7b8842e9 100644
--- a/templates/myaccount/my-address.php
+++ b/templates/myaccount/my-address.php
@@ -1,8 +1,12 @@
 <?php
 /**
  * My Addresses
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
- 
+
 global $woocommerce;
 
 $customer_id = get_current_user_id();
@@ -11,14 +15,14 @@
 <?php if (get_option('woocommerce_ship_to_billing_address_only')=='no') : ?>
 
 	<div class="col2-set addresses">
-	
+
 		<div class="col-1">
-	
+
 <?php endif; ?>
-	
-			<header class="title">				
+
+			<header class="title">
 				<h3><?php _e('Billing Address', 'woocommerce'); ?></h3>
-				<a href="<?php echo esc_url( add_query_arg('address', 'billing', get_permalink(woocommerce_get_page_id('edit_address'))) ); ?>" class="edit"><?php _e('Edit', 'woocommerce'); ?></a>	
+				<a href="<?php echo esc_url( add_query_arg('address', 'billing', get_permalink(woocommerce_get_page_id('edit_address'))) ); ?>" class="edit"><?php _e('Edit', 'woocommerce'); ?></a>
 			</header>
 			<address>
 				<?php
@@ -28,25 +32,25 @@
 						'company'		=> get_user_meta( $customer_id, 'billing_company', true ),
 						'address_1'		=> get_user_meta( $customer_id, 'billing_address_1', true ),
 						'address_2'		=> get_user_meta( $customer_id, 'billing_address_2', true ),
-						'city'			=> get_user_meta( $customer_id, 'billing_city', true ),			
+						'city'			=> get_user_meta( $customer_id, 'billing_city', true ),
 						'state'			=> get_user_meta( $customer_id, 'billing_state', true ),
 						'postcode'		=> get_user_meta( $customer_id, 'billing_postcode', true ),
 						'country'		=> get_user_meta( $customer_id, 'billing_country', true )
 					);
-	
+
 					$formatted_address = $woocommerce->countries->get_formatted_address( $address );
-					
+
 					if (!$formatted_address) _e('You have not set up a billing address yet.', 'woocommerce'); else echo $formatted_address;
 				?>
 			</address>
 
 
 <?php if (get_option('woocommerce_ship_to_billing_address_only')=='no') : ?>
-	
+
 		</div><!-- /.col-1 -->
-		
+
 		<div class="col-2">
-		
+
 			<header class="title">
 				<h3><?php _e('Shipping Address', 'woocommerce'); ?></h3>
 				<a href="<?php echo esc_url( add_query_arg('address', 'shipping', get_permalink(woocommerce_get_page_id('edit_address'))) ); ?>" class="edit"><?php _e('Edit', 'woocommerce'); ?></a>
@@ -59,20 +63,20 @@
 						'company'		=> get_user_meta( $customer_id, 'shipping_company', true ),
 						'address_1'		=> get_user_meta( $customer_id, 'shipping_address_1', true ),
 						'address_2'		=> get_user_meta( $customer_id, 'shipping_address_2', true ),
-						'city'			=> get_user_meta( $customer_id, 'shipping_city', true ),			
+						'city'			=> get_user_meta( $customer_id, 'shipping_city', true ),
 						'state'			=> get_user_meta( $customer_id, 'shipping_state', true ),
 						'postcode'		=> get_user_meta( $customer_id, 'shipping_postcode', true ),
 						'country'		=> get_user_meta( $customer_id, 'shipping_country', true )
 					);
-	
+
 					$formatted_address = $woocommerce->countries->get_formatted_address( $address );
-					
+
 					if (!$formatted_address) _e('You have not set up a shipping address yet.', 'woocommerce'); else echo $formatted_address;
 				?>
 			</address>
-		
+
 		</div><!-- /.col-2 -->
-	
+
 	</div><!-- /.col2-set -->
 
 <?php endif; ?>
\ No newline at end of file
diff --git a/templates/myaccount/my-orders.php b/templates/myaccount/my-orders.php
index 699b45577c09..2d613cd54fec 100644
--- a/templates/myaccount/my-orders.php
+++ b/templates/myaccount/my-orders.php
@@ -3,8 +3,12 @@
  * My Orders
  *
  * Shows recent orders on the account page
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
- 
+
 global $woocommerce;
 
 $customer_id = get_current_user_id();
@@ -14,14 +18,14 @@
     'meta_key'        => '_customer_user',
     'meta_value'	  => $customer_id,
     'post_type'       => 'shop_order',
-    'post_status'     => 'publish' 
+    'post_status'     => 'publish'
 );
 $customer_orders = get_posts($args);
 
 if ($customer_orders) :
 ?>
 	<table class="shop_table my_account_orders">
-	
+
 		<thead>
 			<tr>
 				<th class="order-number"><span class="nobr"><?php _e('Order', 'woocommerce'); ?></span></th>
@@ -30,15 +34,15 @@
 				<th class="order-status" colspan="2"><span class="nobr"><?php _e('Status', 'woocommerce'); ?></span></th>
 			</tr>
 		</thead>
-		
+
 		<tbody><?php
 			foreach ($customer_orders as $customer_order) :
 				$order = new WC_Order();
-				
+
 				$order->populate( $customer_order );
-				
+
 				$status = get_term_by('slug', $order->status, 'shop_order_status');
-				
+
 				?><tr class="order">
 					<td class="order-number" width="1%">
 						<a href="<?php echo esc_url( add_query_arg('order', $order->id, get_permalink(woocommerce_get_page_id('view_order'))) ); ?>"><?php echo $order->get_order_number(); ?></a> &ndash; <time title="<?php echo esc_attr( strtotime($order->order_date) ); ?>"><?php echo date_i18n(get_option('date_format'), strtotime($order->order_date)); ?></time>
@@ -52,11 +56,11 @@
 						<?php endif; ?>
 					</td>
 					<td class="order-actions" style="text-align:right; white-space:nowrap;">
-												
+
 						<?php if (in_array($order->status, array('pending', 'failed'))) : ?>
 							<a href="<?php echo esc_url( $order->get_checkout_payment_url() ); ?>" class="button pay"><?php _e('Pay', 'woocommerce'); ?></a>
 						<?php endif; ?>
-						
+
 						<a href="<?php echo esc_url( add_query_arg('order', $order->id, get_permalink(woocommerce_get_page_id('view_order'))) ); ?>" class="button"><?php _e('View', 'woocommerce'); ?></a>
 
 
@@ -64,7 +68,7 @@
 				</tr><?php
 			endforeach;
 		?></tbody>
-	
+
 	</table>
 <?php
 else :
diff --git a/templates/order/form-tracking.php b/templates/order/form-tracking.php
index 9bd0cc50e205..df1141f39e4f 100644
--- a/templates/order/form-tracking.php
+++ b/templates/order/form-tracking.php
@@ -1,20 +1,24 @@
 <?php
 /**
- * Order Tracking Form
+ * Order tracking form
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
- 
+
 global $woocommerce, $post;
 ?>
 
 <form action="<?php echo esc_url( get_permalink($post->ID) ); ?>" method="post" class="track_order">
-	
+
 	<p><?php _e('To track your order please enter your Order ID in the box below and press return. This was given to you on your receipt and in the confirmation email you should have received.', 'woocommerce'); ?></p>
-	
+
 	<p class="form-row form-row-first"><label for="orderid"><?php _e('Order ID', 'woocommerce'); ?></label> <input class="input-text" type="text" name="orderid" id="orderid" placeholder="<?php _e('Found in your order confirmation email.', 'woocommerce'); ?>" /></p>
 	<p class="form-row form-row-last"><label for="order_email"><?php _e('Billing Email', 'woocommerce'); ?></label> <input class="input-text" type="text" name="order_email" id="order_email" placeholder="<?php _e('Email you used during checkout.', 'woocommerce'); ?>" /></p>
 	<div class="clear"></div>
-	
+
 	<p class="form-row"><input type="submit" class="button" name="track" value="<?php _e('Track"', 'woocommerce'); ?>" /></p>
 	<?php $woocommerce->nonce_field('order_tracking') ?>
-	
+
 </form>
\ No newline at end of file
diff --git a/templates/order/order-details.php b/templates/order/order-details.php
index 00ab8d6302e4..47915da10be4 100755
--- a/templates/order/order-details.php
+++ b/templates/order/order-details.php
@@ -1,8 +1,12 @@
 <?php
 /**
- * Order Details
+ * Order details
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
- 
+
 global $woocommerce;
 
 $order = new WC_Order( $order_id );
@@ -17,15 +21,15 @@
 		</tr>
 	</thead>
 	<tfoot>
-	<?php 
+	<?php
 		if ( $totals = $order->get_order_item_totals() ) foreach ( $totals as $total ) :
 			?>
 			<tr>
 				<th scope="row" colspan="2"><?php echo $total['label']; ?></th>
 				<td><?php echo $total['value']; ?></td>
 			</tr>
-			<?php 
-		endforeach; 
+			<?php
+		endforeach;
 	?>
 	</tfoot>
 	<tbody>
@@ -43,27 +47,27 @@
 				echo '
 					<tr class = "' . esc_attr( apply_filters('woocommerce_order_table_item_class', 'order_table_item', $item, $order ) ) . '">
 						<td class="product-name">';
-						
+
 				echo '<a href="'.get_permalink( $item['id'] ).'">' . $item['name'] . '</a>';
 
 				$item_meta = new order_item_meta( $item['item_meta'] );
 				$item_meta->display();
-				
+
 				if ( $_product->exists() && $_product->is_downloadable() && $_product->has_file() && ( $order->status=='completed' || ( get_option( 'woocommerce_downloads_grant_access_after_payment' ) == 'yes' && $order->status == 'processing' ) ) ) :
-					
+
 					echo '<br/><small><a href="' . $order->get_downloadable_file_url( $item['id'], $item['variation_id'] ) . '">' . __('Download file &rarr;', 'woocommerce') . '</a></small>';
-		
-				endif;	
+
+				endif;
 
 				echo '</td><td class="product-quantity">'.$item['qty'].'</td><td class="product-total">' . $order->get_formatted_line_subtotal($item) . '</td></tr>';
-				
+
 				// Show any purchase notes
 				if ($order->status=='completed' || $order->status=='processing') :
 					if ($purchase_note = get_post_meta( $_product->id, '_purchase_note', true)) :
 						echo '<tr class="product-purchase-note"><td colspan="3">' . apply_filters('the_content', $purchase_note) . '</td></tr>';
 					endif;
 				endif;
-				
+
 			endforeach;
 		endif;
 
@@ -97,7 +101,7 @@
 	<div class="col-1">
 
 <?php endif; ?>
-	
+
 		<header class="title">
 			<h3><?php _e('Billing Address', 'woocommerce'); ?></h3>
 		</header>
@@ -110,9 +114,9 @@
 <?php if (get_option('woocommerce_ship_to_billing_address_only')=='no') : ?>
 
 	</div><!-- /.col-1 -->
-	
+
 	<div class="col-2">
-	
+
 		<header class="title">
 			<h3><?php _e('Shipping Address', 'woocommerce'); ?></h3>
 		</header>
diff --git a/templates/order/tracking.php b/templates/order/tracking.php
index 928010bb5ad3..7990125344e7 100644
--- a/templates/order/tracking.php
+++ b/templates/order/tracking.php
@@ -1,8 +1,12 @@
 <?php
 /**
- * Order Tracking
+ * Order tracking
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
- 
+
 global $woocommerce;
 ?>
 
@@ -10,11 +14,11 @@
 	$status = get_term_by('slug', $order->status, 'shop_order_status');
 
 	$order_status_text = sprintf( __('Order %s which was made %s has the status &ldquo;%s&rdquo;', 'woocommerce'), $order->get_order_number(), human_time_diff(strtotime($order->order_date), current_time('timestamp')) . ' ' . __('ago', 'woocommerce'), __($status->name, 'woocommerce') );
-	
+
 	if ($order->status == 'completed') $order_status_text .= ' ' . __('and was completed', 'woocommerce') . ' ' . human_time_diff(strtotime($order->completed_date), current_time('timestamp')).__(' ago', 'woocommerce');
-	
+
 	$order_status_text .= '.';
-	
+
 	echo wpautop(apply_filters('woocommerce_order_tracking_status', $order_status_text, $order));
 ?>
 
@@ -23,10 +27,10 @@
 	if ($notes) :
 		?>
 		<h2><?php _e('Order Updates', 'woocommerce'); ?></h2>
-		<ol class="commentlist notes">	
+		<ol class="commentlist notes">
 			<?php foreach ($notes as $note) : ?>
 			<li class="comment note">
-				<div class="comment_container">			
+				<div class="comment_container">
 					<div class="comment-text">
 						<p class="meta"><?php echo date_i18n('l jS \of F Y, h:ia', strtotime($note->comment_date)); ?></p>
 						<div class="description">
@@ -34,7 +38,7 @@
 						</div>
 		  				<div class="clear"></div>
 		  			</div>
-					<div class="clear"></div>			
+					<div class="clear"></div>
 				</div>
 			</li>
 			<?php endforeach; ?>
diff --git a/templates/shop/breadcrumb.php b/templates/shop/breadcrumb.php
index ac4acec46527..b12f7fca2e46 100644
--- a/templates/shop/breadcrumb.php
+++ b/templates/shop/breadcrumb.php
@@ -1,6 +1,10 @@
 <?php
 /**
- * Shop Breadcrumb
+ * Shop breadcrumb
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
 
 global $post, $wp_query;
@@ -17,11 +21,11 @@
 if ( (!is_home() && !is_front_page() && !(is_post_type_archive() && get_option('page_on_front')==woocommerce_get_page_id('shop'))) || is_paged() ) :
 
 	echo $wrap_before;
-	
+
 	echo $before  . '<a class="home" href="' . $home_link . '">' . $home . '</a> '  . $after . $delimiter ;
-	
+
 	if ( is_category() ) :
-	
+
 		$cat_obj = $wp_query->get_queried_object();
 		$this_category = $cat_obj->term_id;
 		$this_category = get_category( $this_category );
@@ -30,12 +34,12 @@
 			echo get_category_parents($parent_category, TRUE, $delimiter );
 		endif;
 		echo $before . single_cat_title('', false) . $after;
-	
+
 	elseif ( is_tax('product_cat') ) :
-		
+
 		echo $prepend;
 		$term = get_term_by( 'slug', get_query_var( 'term' ), get_query_var( 'taxonomy' ) );
-	
+
 		$parents = array();
 		$parent = $term->parent;
 		while ($parent):
@@ -43,7 +47,7 @@
 			$new_parent = get_term_by( 'id', $parent, get_query_var( 'taxonomy' ));
 			$parent = $new_parent->parent;
 		endwhile;
-		
+
 		if(!empty($parents)):
 			$parents = array_reverse($parents);
 			foreach ($parents as $parent):
@@ -51,50 +55,50 @@
 				echo $before .  '<a href="' . get_term_link( $item->slug, 'product_cat' ) . '">' . $item->name . '</a>' . $after . $delimiter;
 			endforeach;
 		endif;
-	
+
 		$queried_object = $wp_query->get_queried_object();
 		echo $before . $queried_object->name . $after;
-	
+
 	elseif ( is_tax('product_tag') ) :
-	
+
 		$queried_object = $wp_query->get_queried_object();
 		echo $prepend . $before . __('Products tagged &ldquo;', 'woocommerce') . $queried_object->name . '&rdquo;' . $after;
-	
+
 	elseif ( is_day() ) :
-	
+
 		echo $before . '<a href="' . get_year_link(get_the_time('Y')) . '">' . get_the_time('Y') . '</a>' . $after . $delimiter;
 		echo $before . '<a href="' . get_month_link(get_the_time('Y'),get_the_time('m')) . '">' . get_the_time('F') . '</a>' . $after . $delimiter;
 		echo $before . get_the_time('d') . $after;
-	
+
 	elseif ( is_month() ) :
-	
+
 		echo $before . '<a href="' . get_year_link(get_the_time('Y')) . '">' . get_the_time('Y') . '</a>' . $after . $delimiter;
 		echo $before . get_the_time('F') . $after;
-	
+
 	elseif ( is_year() ) :
-	
+
 		echo $before . get_the_time('Y') . $after;
-	
+
 	elseif ( is_post_type_archive('product') && get_option('page_on_front') !== woocommerce_get_page_id('shop') ) :
-	
+
 		$_name = woocommerce_get_page_id('shop') ? get_the_title( woocommerce_get_page_id('shop') ) : ucwords(get_option('woocommerce_shop_slug'));
-	
+
 		if (is_search()) :
-	
+
 			echo $before . '<a href="' . get_post_type_archive_link('product') . '">' . $_name . '</a>' . $delimiter . __('Search results for &ldquo;', 'woocommerce') . get_search_query() . '&rdquo;' . $after;
-	
+
 		else :
-	
+
 			echo $before . '<a href="' . get_post_type_archive_link('product') . '">' . $_name . '</a>' . $after;
-	
+
 		endif;
-	
+
 	elseif ( is_single() && !is_attachment() ) :
-	
+
 	if ( get_post_type() == 'product' ) :
-	
+
 			echo $prepend;
-	
+
 			if ($terms = wp_get_object_terms( $post->ID, 'product_cat' )) :
 			$term = current($terms);
 			$parents = array();
@@ -113,9 +117,9 @@
 			endif;
 			echo $before . '<a href="' . get_term_link( $term->slug, 'product_cat' ) . '">' . $term->name . '</a>' . $after . $delimiter;
 		endif;
-	
+
 		echo $before . get_the_title() . $after;
-	
+
 	elseif ( get_post_type() != 'post' ) :
 		$post_type = get_post_type_object(get_post_type());
 		$slug = $post_type->rewrite;
@@ -126,30 +130,30 @@
 		echo get_category_parents($cat, TRUE, $delimiter);
 		echo $before . get_the_title() . $after;
 	endif;
-	
+
 	elseif ( is_404() ) :
-	
+
 		echo $before . __('Error 404', 'woocommerce') . $after;
-	
+
 	elseif ( !is_single() && !is_page() && get_post_type() != 'post' ) :
-	
+
 		$post_type = get_post_type_object(get_post_type());
 		if ($post_type) : echo $before . $post_type->labels->singular_name . $after; endif;
-	
+
 	elseif ( is_attachment() ) :
-	
+
 		$parent = get_post($post->post_parent);
 		$cat = get_the_category($parent->ID); $cat = $cat[0];
 		echo get_category_parents($cat, TRUE, '' . $delimiter);
 		echo $before . '<a href="' . get_permalink($parent) . '">' . $parent->post_title . '</a>' . $after . $delimiter;
 		echo $before . get_the_title() . $after;
-	
+
 	elseif ( is_page() && !$post->post_parent ) :
-	
+
 		echo $before . get_the_title() . $after;
-	
+
 	elseif ( is_page() && $post->post_parent ) :
-	
+
 		$parent_id  = $post->post_parent;
 		$breadcrumbs = array();
 		while ($parent_id) {
@@ -162,28 +166,28 @@
 			echo $crumb . '' . $delimiter;
 		endforeach;
 		echo $before . get_the_title() . $after;
-	
+
 	elseif ( is_search() ) :
-	
+
 		echo $before . __('Search results for &ldquo;', 'woocommerce') . get_search_query() . '&rdquo;' . $after;
-	
+
 	elseif ( is_tag() ) :
-	
+
 			echo $before . __('Posts tagged &ldquo;', 'woocommerce') . single_tag_title('', false) . '&rdquo;' . $after;
-	
+
 	elseif ( is_author() ) :
-	
+
 		$userdata = get_userdata($author);
 		echo $before . __('Author:', 'woocommerce') . ' ' . $userdata->display_name . $after;
-	
+
 	endif;
-	
+
 	if ( get_query_var('paged') ) :
-	
+
 		echo ' (' . __('Page', 'woocommerce') . ' ' . get_query_var('paged') .')';
-	
+
 	endif;
-	
+
 	echo $wrap_after;
 
 endif;
\ No newline at end of file
diff --git a/templates/shop/errors.php b/templates/shop/errors.php
index 65222bab3065..676501ab8066 100644
--- a/templates/shop/errors.php
+++ b/templates/shop/errors.php
@@ -1,6 +1,10 @@
 <?php
 /**
- * Error messages
+ * Show error messages
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
 if ( ! $errors ) return;
 ?>
diff --git a/templates/shop/form-login.php b/templates/shop/form-login.php
index 0d816f1a90ea..214e48b6d96c 100644
--- a/templates/shop/form-login.php
+++ b/templates/shop/form-login.php
@@ -1,6 +1,10 @@
 <?php
 /**
- * Login Form
+ * Login form
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
 
 global $woocommerce;
diff --git a/templates/shop/messages.php b/templates/shop/messages.php
index 947d19f70e44..c4c215e344fc 100644
--- a/templates/shop/messages.php
+++ b/templates/shop/messages.php
@@ -1,7 +1,12 @@
 <?php
 /**
- * Messages
+ * Show messages
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
+
 if ( ! $messages ) return;
 ?>
 
diff --git a/templates/shop/sidebar.php b/templates/shop/sidebar.php
index 7204768c0db1..e9c36af8580f 100644
--- a/templates/shop/sidebar.php
+++ b/templates/shop/sidebar.php
@@ -1 +1,10 @@
-<?php get_sidebar('shop'); ?>
\ No newline at end of file
+<?php
+/**
+ * Sidebar
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
+ */
+
+get_sidebar('shop'); ?>
\ No newline at end of file
diff --git a/templates/shop/wrapper-end.php b/templates/shop/wrapper-end.php
index 8e09d4299267..b92feb00cabf 100644
--- a/templates/shop/wrapper-end.php
+++ b/templates/shop/wrapper-end.php
@@ -1,6 +1,10 @@
 <?php
 /**
- * Content Wrappers
+ * Content wrappers
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
 ?>
 	</div>
diff --git a/templates/shop/wrapper-start.php b/templates/shop/wrapper-start.php
index 849a75e67557..abb8144c391d 100644
--- a/templates/shop/wrapper-start.php
+++ b/templates/shop/wrapper-start.php
@@ -1,7 +1,12 @@
 <?php
 /**
- * Content Wrappers
+ * Content wrappers
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
+
 $id = ( get_option('template') === 'twentyeleven' ) ? 'primary' : 'container';
 ?>
 <div id="<?php echo $id; ?>">
diff --git a/templates/single-product-reviews.php b/templates/single-product-reviews.php
index b0b6afa15996..a42c06818ce3 100644
--- a/templates/single-product-reviews.php
+++ b/templates/single-product-reviews.php
@@ -1,76 +1,85 @@
-<?php global $woocommerce; ?>
-<?php if ( comments_open() ) : ?><div id="reviews"><?php 
-	
+<?php
+/**
+ * Display single product reviews (comments)
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
+ */
+global $woocommerce;
+?>
+<?php if ( comments_open() ) : ?><div id="reviews"><?php
+
 	echo '<div id="comments">';
-	
+
 	$count = $wpdb->get_var("
-		SELECT COUNT(meta_value) FROM $wpdb->commentmeta 
+		SELECT COUNT(meta_value) FROM $wpdb->commentmeta
 		LEFT JOIN $wpdb->comments ON $wpdb->commentmeta.comment_id = $wpdb->comments.comment_ID
 		WHERE meta_key = 'rating'
 		AND comment_post_ID = $post->ID
 		AND comment_approved = '1'
 		AND meta_value > 0
 	");
-	
+
 	$rating = $wpdb->get_var("
-		SELECT SUM(meta_value) FROM $wpdb->commentmeta 
+		SELECT SUM(meta_value) FROM $wpdb->commentmeta
 		LEFT JOIN $wpdb->comments ON $wpdb->commentmeta.comment_id = $wpdb->comments.comment_ID
 		WHERE meta_key = 'rating'
 		AND comment_post_ID = $post->ID
 		AND comment_approved = '1'
 	");
-	
+
 	if ( $count > 0 ) :
-		
+
 		$average = number_format($rating / $count, 2);
-		
+
 		echo '<div itemprop="aggregateRating" itemscope itemtype="http://schema.org/AggregateRating">';
-		
+
 		echo '<div class="star-rating" title="'.sprintf(__('Rated %s out of 5', 'woocommerce'), $average).'"><span style="width:'.($average*16).'px"><span itemprop="ratingValue" class="rating">'.$average.'</span> '.__('out of 5', 'woocommerce').'</span></div>';
-		
+
 		echo '<h2>'.sprintf( _n('%s review for %s', '%s reviews for %s', $count, 'woocommerce'), '<span itemprop="ratingCount" class="count">'.$count.'</span>', wptexturize($post->post_title) ).'</h2>';
 
 		echo '</div>';
-		
+
 	else :
-	
+
 		echo '<h2>'.__('Reviews', 'woocommerce').'</h2>';
-		
+
 	endif;
 
 	$title_reply = '';
 
-	if ( have_comments() ) : 
+	if ( have_comments() ) :
 
 		echo '<ol class="commentlist">';
-		
+
 		wp_list_comments( array( 'callback' => 'woocommerce_comments' ) );
 
 		echo '</ol>';
-	
+
 		if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : ?>
 			<div class="navigation">
 				<div class="nav-previous"><?php previous_comments_link( __( '<span class="meta-nav">&larr;</span> Previous', 'woocommerce' ) ); ?></div>
 				<div class="nav-next"><?php next_comments_link( __( 'Next <span class="meta-nav">&rarr;</span>', 'woocommerce' ) ); ?></div>
 			</div>
 		<?php endif;
-		
+
 		echo '<p class="add_review"><a href="#review_form" class="inline show_review_form button">'.__('Add Review', 'woocommerce').'</a></p>';
-		
+
 		$title_reply = __('Add a review', 'woocommerce');
-		
-	else : 
+
+	else :
 
 		$title_reply = __('Be the first to review', 'woocommerce').' &ldquo;'.$post->post_title.'&rdquo;';
-		
+
 		echo '<p>'.__('There are no reviews yet, would you like to <a href="#review_form" class="inline show_review_form">submit yours</a>?', 'woocommerce').'</p>';
-	
+
 	endif;
-	
+
 	$commenter = wp_get_current_commenter();
-	
+
 	echo '</div><div id="review_form_wrapper"><div id="review_form">';
-	
+
 	$comment_form = array(
 		'title_reply' => $title_reply,
 		'comment_notes_before' => '',
@@ -85,9 +94,9 @@
 		'logged_in_as' => '',
 		'comment_field' => ''
 	);
-		
+
 	if ( get_option('woocommerce_enable_review_rating') == 'yes' ) {
-	
+
 		$comment_form['comment_field'] = '<p class="comment-form-rating"><label for="rating">' . __('Rating', 'woocommerce') .'</label><select name="rating" id="rating">
 			<option value="">'.__('Rate&hellip;', 'woocommerce').'</option>
 			<option value="5">'.__('Perfect', 'woocommerce').'</option>
@@ -96,14 +105,14 @@
 			<option value="2">'.__('Not that bad', 'woocommerce').'</option>
 			<option value="1">'.__('Very Poor', 'woocommerce').'</option>
 		</select></p>';
-			
+
 	}
-	
+
 	$comment_form['comment_field'] .= '<p class="comment-form-comment"><label for="comment">' . __( 'Your Review', 'woocommerce' ) . '</label><textarea id="comment" name="comment" cols="45" rows="8" aria-required="true"></textarea></p>' . $woocommerce->nonce_field('comment_rating', true, false);
-	
-	comment_form( $comment_form ); 
+
+	comment_form( $comment_form );
 
 	echo '</div></div>';
-	
+
 ?><div class="clear"></div></div>
 <?php endif; ?>
\ No newline at end of file
diff --git a/templates/single-product.php b/templates/single-product.php
index 5477d077a05f..7c13d055e417 100644
--- a/templates/single-product.php
+++ b/templates/single-product.php
@@ -4,19 +4,20 @@
  *
  * Override this template by copying it to yourtheme/woocommerce/single-product.php
  *
- * @package WooCommerce
- * @since WooCommerce 1.0
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
 
 get_header('shop'); ?>
 
-	<?php 
-		/** 
+	<?php
+		/**
 		 * woocommerce_before_main_content hook
 		 *
 		 * @hooked woocommerce_output_content_wrapper - 10 (outputs opening divs for the content)
 		 * @hooked woocommerce_breadcrumb - 20
-		 */	 
+		 */
 		do_action('woocommerce_before_main_content');
 	?>
 
@@ -27,21 +28,21 @@
 		<?php endwhile; // end of the loop. ?>
 
 	<?php
-		/** 
+		/**
 		 * woocommerce_after_main_content hook
 		 *
 		 * @hooked woocommerce_output_content_wrapper_end - 10 (outputs closing divs for the content)
-		 */	 
-		do_action('woocommerce_after_main_content'); 
+		 */
+		do_action('woocommerce_after_main_content');
 	?>
-	
-	<?php 
-		/** 
+
+	<?php
+		/**
 		 * woocommerce_sidebar hook
 		 *
 		 * @hooked woocommerce_get_sidebar - 10
-		 */		
-		do_action('woocommerce_sidebar'); 
+		 */
+		do_action('woocommerce_sidebar');
 	?>
-	
+
 <?php get_footer('shop'); ?>
\ No newline at end of file
diff --git a/templates/single-product/add-to-cart/external.php b/templates/single-product/add-to-cart/external.php
index ae4f0245c91d..6484bf20aa61 100644
--- a/templates/single-product/add-to-cart/external.php
+++ b/templates/single-product/add-to-cart/external.php
@@ -1,6 +1,10 @@
 <?php
 /**
- * External Add to Cart
+ * External product add to cart
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
 ?>
 <?php do_action('woocommerce_before_add_to_cart_button'); ?>
diff --git a/templates/single-product/add-to-cart/grouped.php b/templates/single-product/add-to-cart/grouped.php
index 970a5b764e33..023486bc220c 100644
--- a/templates/single-product/add-to-cart/grouped.php
+++ b/templates/single-product/add-to-cart/grouped.php
@@ -1,8 +1,12 @@
 <?php
 /**
- * Grouped Product Add to Cart
+ * Grouped product add to cart
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
- 
+
 global $woocommerce, $product;
 
 // Put grouped products into an array
@@ -10,15 +14,15 @@
 $quantites_required = false;
 
 foreach ( $product->get_children() as $child_id ) {
-	$child_product = $product->get_child( $child_id ); 
-	
-	if ( ! $child_product->is_sold_individually() && ! $child_product->is_type('external') ) 
+	$child_product = $product->get_child( $child_id );
+
+	if ( ! $child_product->is_sold_individually() && ! $child_product->is_type('external') )
 		$quantites_required = true;
-	
+
 	$grouped_products[] = array(
 		'product' => $child_product,
 		'availability' => $child_product->get_availability()
-	);	
+	);
 }
 ?>
 
@@ -30,34 +34,34 @@
 			<?php foreach ( $grouped_products as $child_product ) : ?>
 				<tr>
 					<td>
-						<?php if ( $child_product['product']->is_type('external') ) : 
-						
+						<?php if ( $child_product['product']->is_type('external') ) :
+
 							$product_url = get_post_meta( $child_product['product']->id, '_product_url', true );
 							$button_text = get_post_meta( $child_product['product']->id, '_button_text', true );
 							?>
-						
+
 							<a href="<?php echo $product_url; ?>" rel="nofollow" class="button alt"><?php echo apply_filters('single_add_to_cart_text', $button_text, 'external'); ?></a>
-						
+
 						<?php elseif ( ! $quantites_required ) : ?>
-						
+
 							<button type="submit" name="quantity[<?php echo $child_product['product']->id; ?>]" value="1" class="single_add_to_cart_button button alt"><?php _e('Add to cart', 'woocommerce'); ?></button>
-						
+
 						<?php else : ?>
-						
+
 							<?php woocommerce_quantity_input( array( 'input_name' => 'quantity['.$child_product['product']->id.']', 'input_value' => '0' ) ); ?>
-							
+
 						<?php endif; ?>
 					</td>
-					
+
 					<td class="label"><label for="product-<?php echo $child_product['product']->id; ?>"><?php
-						
-						if ($child_product['product']->is_visible()) 
+
+						if ($child_product['product']->is_visible())
 							echo '<a href="'.get_permalink($child_product['product']->id).'">' . $child_product['product']->get_title() . '</a>';
 						else
 							echo $child_product['product']->get_title();
-							
+
 					?></label></td>
-					
+
 					<td class="price"><?php echo $child_product['product']->get_price_html(); ?>
 					<?php echo apply_filters( 'woocommerce_stock_html', '<small class="stock '.$child_product['availability']['class'].'">'.$child_product['availability']['availability'].'</small>', $child_product['availability']['availability'] ); ?>
 					</td>
@@ -65,15 +69,15 @@
 			<?php endforeach; ?>
 		</tbody>
 	</table>
-	
+
 	<?php if ( $quantites_required ) : ?>
-	
+
 		<?php do_action('woocommerce_before_add_to_cart_button'); ?>
-	
+
 		<button type="submit" class="single_add_to_cart_button button alt"><?php echo apply_filters('single_add_to_cart_text', __('Add to cart', 'woocommerce'), $product->product_type); ?></button>
-	
+
 		<?php do_action('woocommerce_after_add_to_cart_button'); ?>
-	
+
 	<?php endif; ?>
 
 </form>
diff --git a/templates/single-product/add-to-cart/quantity.php b/templates/single-product/add-to-cart/quantity.php
index 4251d3da3498..43c5533c5bde 100644
--- a/templates/single-product/add-to-cart/quantity.php
+++ b/templates/single-product/add-to-cart/quantity.php
@@ -1,6 +1,10 @@
 <?php
 /**
- * Single Product Quantity Inputs
+ * Single product quantity inputs
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
 ?>
 <div class="quantity"><input name="<?php echo $input_name; ?>" data-min="<?php echo $min_value; ?>" data-max="<?php echo $max_value; ?>" value="<?php echo $input_value; ?>" size="4" title="Qty" class="input-text qty text" maxlength="12" /></div>
\ No newline at end of file
diff --git a/templates/single-product/add-to-cart/simple.php b/templates/single-product/add-to-cart/simple.php
index 0a8998e955f5..2060ebccb18d 100644
--- a/templates/single-product/add-to-cart/simple.php
+++ b/templates/single-product/add-to-cart/simple.php
@@ -1,6 +1,10 @@
 <?php
 /**
- * Simple Product Add to Cart
+ * Simple product add to cart
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
 
 global $woocommerce, $product;
diff --git a/templates/single-product/add-to-cart/variable.php b/templates/single-product/add-to-cart/variable.php
index 2700d8072717..04dea528d1b5 100644
--- a/templates/single-product/add-to-cart/variable.php
+++ b/templates/single-product/add-to-cart/variable.php
@@ -1,8 +1,12 @@
 <?php
 /**
- * Variable Product Add to Cart
+ * Variable product add to cart
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
- 
+
 global $woocommerce, $product, $post;
 ?>
 <script type="text/javascript">
@@ -19,9 +23,9 @@
 					<td class="label"><label for="<?php echo sanitize_title($name); ?>"><?php echo $woocommerce->attribute_label($name); ?></label></td>
 					<td class="value"><select id="<?php echo esc_attr( sanitize_title($name) ); ?>" name="attribute_<?php echo sanitize_title($name); ?>">
 						<option value=""><?php echo __('Choose an option', 'woocommerce') ?>&hellip;</option>
-						<?php 
+						<?php
 							if ( is_array( $options ) ) {
-							
+
 								if ( empty( $_POST ) )
 									$selected_value = ( isset( $selected_attributes[ sanitize_title( $name ) ] ) ) ? $selected_attributes[ sanitize_title( $name ) ] : '';
 								else
@@ -31,7 +35,7 @@
 								if ( taxonomy_exists( sanitize_title( $name ) ) ) {
 
 									$terms = get_terms( sanitize_title($name), array('menu_order' => 'ASC') );
-	
+
 									foreach ( $terms as $term ) {
 										if ( ! in_array( $term->slug, $options ) ) continue;
 										echo '<option value="' . $term->slug . '" ' . selected( $selected_value, $term->slug, false ) . '>' . apply_filters( 'woocommerce_variation_option_name', $term->name ) . '</option>';
diff --git a/templates/single-product/meta.php b/templates/single-product/meta.php
index 0fe168db77ab..a1b939be2aed 100644
--- a/templates/single-product/meta.php
+++ b/templates/single-product/meta.php
@@ -1,6 +1,10 @@
 <?php
 /**
  * Single Product Meta
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
 
 global $post, $product;
@@ -10,9 +14,9 @@
 	<?php if ( $product->is_type( array( 'simple', 'variable' ) ) && get_option('woocommerce_enable_sku') == 'yes' && $product->get_sku() ) : ?>
 		<span itemprop="productID" class="sku"><?php _e('SKU:', 'woocommerce'); ?> <?php echo $product->get_sku(); ?>.</span>
 	<?php endif; ?>
-	
+
 	<?php echo $product->get_categories( ', ', ' <span class="posted_in">'.__('Category:', 'woocommerce').' ', '.</span>'); ?>
-	
+
 	<?php echo $product->get_tags( ', ', ' <span class="tagged_as">'.__('Tags:', 'woocommerce').' ', '.</span>'); ?>
 
 </div>
\ No newline at end of file
diff --git a/templates/single-product/price.php b/templates/single-product/price.php
index 782e29dcec3a..650c4345e52c 100644
--- a/templates/single-product/price.php
+++ b/templates/single-product/price.php
@@ -1,14 +1,18 @@
 <?php
 /**
  * Single Product Price, including microdata for SEO
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
 
 global $post, $product;
 ?>
 <div itemprop="offers" itemscope itemtype="http://schema.org/Offer">
-	
+
 	<p itemprop="price" class="price"><?php echo $product->get_price_html(); ?></p>
-	
+
 	<link itemprop="availability" href="http://schema.org/<?php echo $product->is_in_stock() ? 'InStock' : 'OutOfStock'; ?>" />
-	
+
 </div>
\ No newline at end of file
diff --git a/templates/single-product/product-attributes.php b/templates/single-product/product-attributes.php
index d121547bbc35..a0b2b8b79edd 100644
--- a/templates/single-product/product-attributes.php
+++ b/templates/single-product/product-attributes.php
@@ -3,6 +3,10 @@
  * Product attributes
  *
  * Used by list_attributes() in the products class
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
 
 global $woocommerce;
@@ -13,55 +17,55 @@
 if ( empty( $attributes ) && ( ! $product->enable_dimensions_display() || ( ! $product->has_dimensions() && ! $product->has_weight() ) ) ) return;
 ?>
 <table class="shop_attributes">
-			
-	<?php if ( $product->enable_dimensions_display() ) : ?>	
-		
+
+	<?php if ( $product->enable_dimensions_display() ) : ?>
+
 		<?php if ( $product->has_weight() ) : $alt = $alt * -1; ?>
-		
+
 			<tr class="<?php if ( $alt == 1 ) echo 'alt'; ?>">
 				<th><?php _e('Weight', 'woocommerce') ?></th>
 				<td><?php echo $product->get_weight() . ' ' . get_option('woocommerce_weight_unit'); ?></td>
 			</tr>
-		
+
 		<?php endif; ?>
-		
+
 		<?php if ($product->has_dimensions()) : $alt = $alt * -1; ?>
-		
+
 			<tr class="<?php if ( $alt == 1 ) echo 'alt'; ?>">
 				<th><?php _e('Dimensions', 'woocommerce') ?></th>
 				<td><?php echo $product->get_dimensions(); ?></td>
-			</tr>		
-		
+			</tr>
+
 		<?php endif; ?>
-		
+
 	<?php endif; ?>
-			
-	<?php foreach ($attributes as $attribute) : 
-		
+
+	<?php foreach ($attributes as $attribute) :
+
 		if ( ! isset( $attribute['is_visible'] ) || ! $attribute['is_visible'] ) continue;
 		if ( $attribute['is_taxonomy'] && ! taxonomy_exists( $attribute['name'] ) ) continue;
-		
-		$alt = $alt * -1; 
+
+		$alt = $alt * -1;
 		?>
-			
+
 		<tr class="<?php if ( $alt == 1 ) echo 'alt'; ?>">
 			<th><?php echo $woocommerce->attribute_label( $attribute['name'] ); ?></th>
 			<td><?php
 				if ( $attribute['is_taxonomy'] ) {
-					
+
 					$values = woocommerce_get_product_terms( $product->id, $attribute['name'], 'names' );
 					echo apply_filters( 'woocommerce_attribute', wpautop( wptexturize( implode( ', ', $values ) ) ), $attribute, $values );
-					
+
 				} else {
-				
+
 					// Convert pipes to commas and display values
 					$values = explode( '|', $attribute['value'] );
 					echo apply_filters( 'woocommerce_attribute', wpautop( wptexturize( implode( ', ', $values ) ) ), $attribute, $values );
-					
+
 				}
 			?></td>
 		</tr>
-				
+
 	<?php endforeach; ?>
-	
+
 </table>
\ No newline at end of file
diff --git a/templates/single-product/product-image.php b/templates/single-product/product-image.php
index e98f1e2434c5..3d79134946bb 100644
--- a/templates/single-product/product-image.php
+++ b/templates/single-product/product-image.php
@@ -1,6 +1,10 @@
 <?php
 /**
  * Single Product Image
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
 
 global $post, $woocommerce;
@@ -13,9 +17,9 @@
 		<a itemprop="image" href="<?php echo wp_get_attachment_url( get_post_thumbnail_id() ); ?>" class="zoom" rel="thumbnails" title="<?php echo get_the_title( get_post_thumbnail_id() ); ?>"><?php echo get_the_post_thumbnail( $post->ID, apply_filters( 'single_product_large_thumbnail_size', 'shop_single' ) ) ?></a>
 
 	<?php else : ?>
-	
+
 		<img src="<?php echo woocommerce_placeholder_img_src(); ?>" alt="Placeholder" />
-	
+
 	<?php endif; ?>
 
 	<?php do_action('woocommerce_product_thumbnails'); ?>
diff --git a/templates/single-product/product-thumbnails.php b/templates/single-product/product-thumbnails.php
index 844339d63940..ac40add20382 100644
--- a/templates/single-product/product-thumbnails.php
+++ b/templates/single-product/product-thumbnails.php
@@ -1,11 +1,15 @@
 <?php
 /**
  * Single Product Thumbnails
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
 
 global $post, $woocommerce;
 ?>
-<div class="thumbnails"><?php	
+<div class="thumbnails"><?php
 	$attachments = get_posts( array(
 		'post_type' 	=> 'attachment',
 		'numberposts' 	=> -1,
@@ -17,28 +21,28 @@
 		'order'			=> 'ASC'
 	) );
 	if ($attachments) {
-		
+
 		$loop = 0;
 		$columns = apply_filters( 'woocommerce_product_thumbnails_columns', 3 );
-		
+
 		foreach ( $attachments as $key => $attachment ) {
-			
-			if ( get_post_meta( $attachment->ID, '_woocommerce_exclude_image', true ) == 1 ) 
+
+			if ( get_post_meta( $attachment->ID, '_woocommerce_exclude_image', true ) == 1 )
 				continue;
-				
+
 			$classes = array( 'zoom' );
-			
-			if ( $loop == 0 || $loop % $columns == 0 ) 
+
+			if ( $loop == 0 || $loop % $columns == 0 )
 				$classes[] = 'first';
-			
-			if ( ( $loop + 1 ) % $columns == 0 ) 
+
+			if ( ( $loop + 1 ) % $columns == 0 )
 				$classes[] = 'last';
 
 			printf( '<a href="%s" title="%s" rel="thumbnails" class="%s">%s</a>', wp_get_attachment_url( $attachment->ID ), esc_attr( $attachment->post_title ), implode(' ', $classes), wp_get_attachment_image( $attachment->ID, apply_filters( 'single_product_small_thumbnail_size', 'shop_thumbnail' ) ) );
-			
+
 			$loop++;
 
 		}
-		
+
 	}
 ?></div>
\ No newline at end of file
diff --git a/templates/single-product/related.php b/templates/single-product/related.php
index 6ed030ca8e4b..c91977f833a8 100644
--- a/templates/single-product/related.php
+++ b/templates/single-product/related.php
@@ -1,11 +1,15 @@
 <?php
 /**
  * Related Products
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
 
 global $product, $woocommerce_loop;
 
-$related = $product->get_related(); 
+$related = $product->get_related();
 
 if ( sizeof($related) == 0 ) return;
 
@@ -25,21 +29,21 @@
 if ( $products->have_posts() ) : ?>
 
 	<div class="related products">
-	
+
 		<h2><?php _e('Related Products', 'woocommerce'); ?></h2>
-		
+
 		<ul class="products">
-			
+
 			<?php while ( $products->have_posts() ) : $products->the_post(); ?>
-		
+
 				<?php woocommerce_get_template_part( 'content', 'product' ); ?>
-	
+
 			<?php endwhile; // end of the loop. ?>
-				
+
 		</ul>
-		
+
 	</div>
-	
-<?php endif; 
+
+<?php endif;
 
 wp_reset_postdata();
diff --git a/templates/single-product/review.php b/templates/single-product/review.php
index c1fe28984425..85f1a0de711a 100644
--- a/templates/single-product/review.php
+++ b/templates/single-product/review.php
@@ -3,37 +3,41 @@
  * Review Comments Template
  *
  * Closing li is left out on purpose!
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
- 
-global $post; 
+
+global $post;
 ?>
 <li itemprop="reviews" itemscope itemtype="http://schema.org/Review" <?php comment_class(); ?> id="li-comment-<?php comment_ID() ?>">
 	<div id="comment-<?php comment_ID(); ?>" class="comment_container">
 
 		<?php echo get_avatar( $GLOBALS['comment'], $size='60' ); ?>
-		
+
 		<div class="comment-text">
-		
+
 			<div itemprop="reviewRating" itemscope itemtype="http://schema.org/Rating" class="star-rating" title="<?php echo esc_attr( get_comment_meta( $GLOBALS['comment']->comment_ID, 'rating', true ) ); ?>">
 				<span style="width:<?php echo get_comment_meta( $GLOBALS['comment']->comment_ID, 'rating', true )*16; ?>px"><span itemprop="ratingValue"><?php echo get_comment_meta( $GLOBALS['comment']->comment_ID, 'rating', true ); ?></span> <?php _e('out of 5', 'woocommerce'); ?></span>
 			</div>
-			
+
 			<?php if ($GLOBALS['comment']->comment_approved == '0') : ?>
 				<p class="meta"><em><?php _e('Your comment is awaiting approval', 'woocommerce'); ?></em></p>
 			<?php else : ?>
 				<p class="meta">
-					<strong itemprop="author"><?php comment_author(); ?></strong> <?php 
-						
+					<strong itemprop="author"><?php comment_author(); ?></strong> <?php
+
 						if ( get_option('woocommerce_review_rating_verification_label') == 'yes' )
 							if ( woocommerce_customer_bought_product( $GLOBALS['comment']->comment_author_email, $GLOBALS['comment']->user_id, $post->ID ) )
 								echo '(' . __('verified owner', 'woocommerce') . ') ';
-						
+
 					?>&ndash; <time itemprop="datePublished" time datetime="<?php echo get_comment_date('c'); ?>"><?php echo get_comment_date(__('M jS Y', 'woocommerce')); ?></time>:
 				</p>
 			<?php endif; ?>
-			
+
 				<div itemprop="description" class="description"><?php comment_text(); ?></div>
 				<div class="clear"></div>
 			</div>
-		<div class="clear"></div>			
+		<div class="clear"></div>
 	</div>
\ No newline at end of file
diff --git a/templates/single-product/sale-flash.php b/templates/single-product/sale-flash.php
index 477bfeb86513..f71439cd0d77 100644
--- a/templates/single-product/sale-flash.php
+++ b/templates/single-product/sale-flash.php
@@ -1,12 +1,16 @@
 <?php
 /**
  * Single Product Sale Flash
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
 
 global $post, $product;
 ?>
 <?php if ($product->is_on_sale()) : ?>
-	
+
 	<?php echo apply_filters('woocommerce_sale_flash', '<span class="onsale">'.__('Sale!', 'woocommerce').'</span>', $post, $product); ?>
-	
+
 <?php endif; ?>
\ No newline at end of file
diff --git a/templates/single-product/share.php b/templates/single-product/share.php
index 2986b1bcfb08..641c8a7fd450 100644
--- a/templates/single-product/share.php
+++ b/templates/single-product/share.php
@@ -3,6 +3,10 @@
  * Single Product Share
  *
  * Sharing plugins can hook into here or you can add your own code directly.
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
 ?>
 
diff --git a/templates/single-product/short-description.php b/templates/single-product/short-description.php
index bad6f07e784d..ad818d061421 100644
--- a/templates/single-product/short-description.php
+++ b/templates/single-product/short-description.php
@@ -1,6 +1,10 @@
 <?php
 /**
- * Single Product Short Description
+ * Single product short description
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
 
 global $post;
diff --git a/templates/single-product/tabs.php b/templates/single-product/tabs.php
index be954b14faa3..8adf1ad44127 100644
--- a/templates/single-product/tabs.php
+++ b/templates/single-product/tabs.php
@@ -1,12 +1,16 @@
 <?php
 /**
- * Single Product Tabs
+ * Single Product tabs
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
 
 // Get tabs
 ob_start();
 
-do_action('woocommerce_product_tabs'); 
+do_action('woocommerce_product_tabs');
 
 $tabs = trim( ob_get_clean() );
 
diff --git a/templates/single-product/tabs/attributes.php b/templates/single-product/tabs/attributes.php
index c1b2ecc2d8b1..add4c28fd927 100644
--- a/templates/single-product/tabs/attributes.php
+++ b/templates/single-product/tabs/attributes.php
@@ -1,8 +1,12 @@
 <?php
 /**
- * Attributes Tab
+ * Attributes tab
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
- 
+
 global $woocommerce, $post, $product;
 
 $show_attr = ( get_option( 'woocommerce_enable_dimension_product_attributes' ) == 'yes' ? true : false );
@@ -10,13 +14,13 @@
 if ( $product->has_attributes() || ( $show_attr && $product->has_dimensions() ) || ( $show_attr && $product->has_weight() ) ) {
 	?>
 	<div class="panel entry-content" id="tab-attributes">
-	
+
 		<?php $heading = apply_filters('woocommerce_product_additional_information_heading', __('Additional Information', 'woocommerce')); ?>
-		
+
 		<h2><?php echo $heading; ?></h2>
-		
+
 		<?php $product->list_attributes(); ?>
-	
+
 	</div>
 	<?php
 }
diff --git a/templates/single-product/tabs/description.php b/templates/single-product/tabs/description.php
index f53e887b0152..1d280418e935 100644
--- a/templates/single-product/tabs/description.php
+++ b/templates/single-product/tabs/description.php
@@ -1,18 +1,22 @@
 <?php
 /**
- * Description Tab
+ * Description tab
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
- 
+
 global $woocommerce, $post;
 
 if ( $post->post_content ) : ?>
 	<div class="panel entry-content" id="tab-description">
-	
+
 		<?php $heading = apply_filters('woocommerce_product_description_heading', __('Product Description', 'woocommerce')); ?>
-		
+
 		<h2><?php echo $heading; ?></h2>
-		
+
 		<?php the_content(); ?>
-	
+
 	</div>
 <?php endif; ?>
\ No newline at end of file
diff --git a/templates/single-product/tabs/reviews.php b/templates/single-product/tabs/reviews.php
index 45d265ab8418..5c88e4578e41 100644
--- a/templates/single-product/tabs/reviews.php
+++ b/templates/single-product/tabs/reviews.php
@@ -1,14 +1,18 @@
 <?php
 /**
- * Reviews Tab
+ * Reviews tab
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
- 
+
 global $woocommerce, $post;
 
 if ( comments_open() ) : ?>
 	<div class="panel entry-content" id="tab-reviews">
-	
+
 		<?php comments_template(); ?>
-	
+
 	</div>
 <?php endif; ?>
\ No newline at end of file
diff --git a/templates/single-product/tabs/tab-attributes.php b/templates/single-product/tabs/tab-attributes.php
index 22ac03f219d9..8bc1715b21f6 100644
--- a/templates/single-product/tabs/tab-attributes.php
+++ b/templates/single-product/tabs/tab-attributes.php
@@ -1,4 +1,13 @@
-<?php global $product;
+<?php
+/**
+ * Attributes tab
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
+ */
+
+global $product;
 
 $show_attr = ( get_option( 'woocommerce_enable_dimension_product_attributes' ) == 'yes' ? true : false );
 
diff --git a/templates/single-product/tabs/tab-description.php b/templates/single-product/tabs/tab-description.php
index f716297fb5f9..0267f4bbf666 100644
--- a/templates/single-product/tabs/tab-description.php
+++ b/templates/single-product/tabs/tab-description.php
@@ -1,4 +1,13 @@
-<?php global $post;
+<?php
+/**
+ * Description tab
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
+ */
+
+global $post;
 
 if ( $post->post_content ) : ?>
 	<li class="description_tab"><a href="#tab-description"><?php _e('Description', 'woocommerce'); ?></a></li>
diff --git a/templates/single-product/tabs/tab-reviews.php b/templates/single-product/tabs/tab-reviews.php
index 4908b1220db3..9afa870f4408 100644
--- a/templates/single-product/tabs/tab-reviews.php
+++ b/templates/single-product/tabs/tab-reviews.php
@@ -1,3 +1,12 @@
-<?php if ( comments_open() ) : ?>
+<?php
+/**
+ * Reviews tab
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
+ */
+
+if ( comments_open() ) : ?>
 	<li class="reviews_tab"><a href="#tab-reviews"><?php _e('Reviews', 'woocommerce'); ?><?php echo comments_number(' (0)', ' (1)', ' (%)'); ?></a></li>
 <?php endif; ?>
\ No newline at end of file
diff --git a/templates/single-product/title.php b/templates/single-product/title.php
index 2b83f70cb469..526f411b663f 100644
--- a/templates/single-product/title.php
+++ b/templates/single-product/title.php
@@ -1,6 +1,10 @@
 <?php
 /**
- * Single Product Title
+ * Single Product title
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
 ?>
 <h1 itemprop="name" class="product_title entry-title"><?php the_title(); ?></h1>
\ No newline at end of file
diff --git a/templates/single-product/up-sells.php b/templates/single-product/up-sells.php
index 12df800f9c9c..d91eed0ebff9 100644
--- a/templates/single-product/up-sells.php
+++ b/templates/single-product/up-sells.php
@@ -1,6 +1,10 @@
 <?php
 /**
- * Up-sells
+ * Single Product Up-Sells
+ *
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
 
 global $product, $woocommerce_loop;
@@ -21,23 +25,23 @@
 $products = new WP_Query( $args );
 
 if ( $products->have_posts() ) : ?>
-	
+
 	<div class="upsells products">
-		
+
 		<h2><?php _e('You may also like&hellip;', 'woocommerce') ?></h2>
 
 		<ul class="products">
-			
+
 			<?php while ( $products->have_posts() ) : $products->the_post(); ?>
-		
+
 				<?php woocommerce_get_template_part( 'content', 'product' ); ?>
-	
+
 			<?php endwhile; // end of the loop. ?>
-				
+
 		</ul>
-		
+
 	</div>
-	
-<?php endif; 
+
+<?php endif;
 
 wp_reset_postdata();
\ No newline at end of file
diff --git a/templates/taxonomy-product_cat.php b/templates/taxonomy-product_cat.php
index 51ae1cd92d62..0b28894cd10c 100644
--- a/templates/taxonomy-product_cat.php
+++ b/templates/taxonomy-product_cat.php
@@ -4,7 +4,9 @@
  *
  * Override this template by copying it to yourtheme/woocommerce/taxonomy-product_cat.php
  *
- * @package WooCommerce
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
 
 woocommerce_get_template( 'archive-product.php' );
\ No newline at end of file
diff --git a/templates/taxonomy-product_tag.php b/templates/taxonomy-product_tag.php
index 43d0ce616438..a48409a00e81 100644
--- a/templates/taxonomy-product_tag.php
+++ b/templates/taxonomy-product_tag.php
@@ -4,7 +4,9 @@
  *
  * Override this template by copying it to yourtheme/woocommerce/taxonomy-product_tag.php
  *
- * @package WooCommerce
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     1.6.4
  */
 
 woocommerce_get_template( 'archive-product.php' );
\ No newline at end of file
diff --git a/woocommerce-hooks.php b/woocommerce-hooks.php
index 151571f00579..49bc1c9f2295 100644
--- a/woocommerce-hooks.php
+++ b/woocommerce-hooks.php
@@ -6,7 +6,7 @@
  *
  * @author 		WooThemes
  * @category 	Core
- * @package 	WooCommerce/Template
+ * @package 	WooCommerce/Templates
  * @version     1.6.4
  */
 
diff --git a/woocommerce-template.php b/woocommerce-template.php
index 6a7297650f41..27f5b3596beb 100644
--- a/woocommerce-template.php
+++ b/woocommerce-template.php
@@ -6,7 +6,7 @@
  *
  * @author 		WooThemes
  * @category 	Core
- * @package 	WooCommerce/Template
+ * @package 	WooCommerce/Templates
  * @version     1.6.4
  */