=== modified file 'payment/uc_google_checkout/uc_google_checkout.admin.inc'
--- payment/uc_google_checkout/uc_google_checkout.admin.inc	2009-04-18 01:03:01 +0000
+++ payment/uc_google_checkout/uc_google_checkout.admin.inc	2009-04-24 13:10:32 +0000
@@ -313,7 +313,7 @@
   }
   $balance = uc_payment_balance($order);
   $context = array(
-    'revision' => 'formatted-original',
+    'revision' => 'themed-original',
     'location' => 'google-checkout-terminal',
   );
   $output .= '<p>'. t('Use this terminal to process credit card payments:') .'</p>'

=== modified file 'payment/uc_payment/uc_payment.admin.inc'
--- payment/uc_payment/uc_payment.admin.inc	2009-04-18 01:05:58 +0000
+++ payment/uc_payment/uc_payment.admin.inc	2009-04-24 14:02:12 +0000
@@ -298,7 +298,7 @@
   $payments = uc_payment_load_payments($order->order_id);
 
   $context = array(
-    'revision' => 'formatted-original',
+    'revision' => 'themed-original',
     'location' => 'order-payments-admin',
     'subject' => array(
       'order' => $order,
@@ -308,7 +308,6 @@
   $form['order_total'] = array('#value' => uc_price($total, $context));
   $form['payments'] = tapir_get_table('uc_payments_table');
 
-  $context = array('revision' => 'themed-original');
   if ($payments !== FALSE) {
     foreach ($payments as $payment) {
       $context['subject']['payment'] = $payment;

=== modified file 'payment/uc_payment/uc_payment_checkout_pane.inc'
--- payment/uc_payment/uc_payment_checkout_pane.inc	2009-04-13 14:34:21 +0000
+++ payment/uc_payment/uc_payment_checkout_pane.inc	2009-04-24 13:10:33 +0000
@@ -102,7 +102,6 @@
       usort($line_items, 'uc_weight_sort');
 
       $context = array(
-        'revision' => 'formatted',
         'location' => 'checkout-review-line-item',
       );
       foreach ($line_items as $line_item) {

=== modified file 'payment/uc_recurring/uc_recurring.admin.inc'
--- payment/uc_recurring/uc_recurring.admin.inc	2009-04-18 01:03:01 +0000
+++ payment/uc_recurring/uc_recurring.admin.inc	2009-04-24 13:10:33 +0000
@@ -35,7 +35,7 @@
   }
 
   $context = array(
-    'revision' => 'formatted-original',
+    'revision' => 'themed-original',
     'location' => 'recurring-admin',
   );
 

=== modified file 'payment/uc_recurring/uc_recurring.module'
--- payment/uc_recurring/uc_recurring.module	2009-04-18 01:03:01 +0000
+++ payment/uc_recurring/uc_recurring.module	2009-04-24 13:10:33 +0000
@@ -657,7 +657,7 @@
   $header = array(t('Order'), t('Amount'), t('Interval'), t('Next charge'), t('Remaining'), t('Operations'));
 
   $context = array(
-    'revision' => 'formatted-original',
+    'revision' => 'themed-original',
     'location' => 'recurring-user-table',
   );
 

=== modified file 'shipping/uc_flatrate/uc_flatrate.admin.inc'
--- shipping/uc_flatrate/uc_flatrate.admin.inc	2009-04-13 14:34:57 +0000
+++ shipping/uc_flatrate/uc_flatrate.admin.inc	2009-04-24 13:10:33 +0000
@@ -14,7 +14,6 @@
   $output = '';
 
   $context = array(
-    'revision' => 'formatted',
     'location' => 'shipping-flatrate-method-admin',
   );
 

=== modified file 'shipping/uc_quote/uc_quote.module'
--- shipping/uc_quote/uc_quote.module	2009-04-18 01:05:58 +0000
+++ shipping/uc_quote/uc_quote.module	2009-04-24 13:10:33 +0000
@@ -867,7 +867,6 @@
 
     case 'review':
       $context = array(
-        'revision' => 'formatted',
         'location' => 'shipping-quote-checkout-pane-review',
       );
       $result = db_query("SELECT * FROM {uc_order_line_items} WHERE order_id = %d AND type = '%s'", $arg1->order_id, 'shipping');

=== modified file 'shipping/uc_shipping/uc_shipping.admin.inc'
--- shipping/uc_shipping/uc_shipping.admin.inc	2009-04-18 01:05:58 +0000
+++ shipping/uc_shipping/uc_shipping.admin.inc	2009-04-24 13:10:33 +0000
@@ -588,14 +588,16 @@
     $rows[] = array(t('Services:'), $shipment->accessorials);
   }
   $context = array(
-    'revision' => 'formatted',
     'location' => 'shipping-order-view',
+    'class' => array(
+      'cost',
+    ),
     'subject' => array(
       'shipment' => $shipment,
       'field' => 'cost',
     ),
   );
-  $rows[] = array(t('Cost:'), uc_price($shipment->cost, $context));
+  $rows[] = array(t('Cost:'), uc_price($shipment->cost, $context, array('label' => FALSE)));
   $output .= theme('table', array(), $rows, array('style' => 'width:auto'));
   $output .= '</div>';
   foreach ($shipment->packages as $package) {

=== modified file 'shipping/uc_ups/uc_ups.admin.inc'
--- shipping/uc_ups/uc_ups.admin.inc	2009-04-18 01:05:58 +0000
+++ shipping/uc_ups/uc_ups.admin.inc	2009-04-24 13:10:33 +0000
@@ -207,7 +207,6 @@
   $method = uc_ups_shipping_method();
   $output .= '<b>'. $method['ups']['quote']['accessorials'][$_SESSION['ups']['service']] .'</b><br />';
   $context = array(
-    'revision' => 'formatted',
     'location' => 'shipping-ups-confirm',
     'subject' => array(
       'ups_info' => $_SESSION['ups'],

=== modified file 'uc_attribute/uc_attribute.admin.inc'
--- uc_attribute/uc_attribute.admin.inc	2009-04-18 07:09:30 +0000
+++ uc_attribute/uc_attribute.admin.inc	2009-04-24 13:10:32 +0000
@@ -470,7 +470,6 @@
     $form['#tree'] = TRUE;
 
     $context = array(
-      'revision' => 'formatted',
       'location' => 'attribute-form-default-option',
     );
     if (count($attributes) > 0) {

=== modified file 'uc_cart/uc_cart.module'
--- uc_cart/uc_cart.module	2009-04-18 06:12:04 +0000
+++ uc_cart/uc_cart.module	2009-04-24 13:10:32 +0000
@@ -709,7 +709,7 @@
  */
 function theme_uc_cart_block_summary($item_count, $item_text, $total, $summary_links) {
   $context = array(
-    'revision' => 'formatted-original',
+    'revision' => 'themed-original',
     'location' => 'cart-block-total',
   );
   // Build the basic table with the number of items in the cart and total.
@@ -870,7 +870,7 @@
   );
 
   $context = array(
-    'revision' => 'formatted-original',
+    'revision' => 'themed-original',
     'location' => 'cart-subtotal',
   );
   $i = 0;
@@ -1050,7 +1050,7 @@
   }
 
   $context = array(
-    'revision' => 'formatted-original',
+    'revision' => 'themed-original',
     'location' => 'cart-table-subtotal',
   );
   $table[] = array(

=== modified file 'uc_cart/uc_cart_checkout_pane.inc'
--- uc_cart/uc_cart_checkout_pane.inc	2009-04-18 06:12:04 +0000
+++ uc_cart/uc_cart_checkout_pane.inc	2009-04-24 13:10:32 +0000
@@ -607,7 +607,7 @@
   // Add the subtotal as the final row.
   if ($show_subtotal) {
     $context = array(
-      'revision' => 'formatted-original',
+      'revision' => 'themed-original',
       'location' => 'cart-checkout-subtotal',
     );
     $rows[] = array(

=== modified file 'uc_product/uc_product.module'
--- uc_product/uc_product.module	2009-04-13 14:34:21 +0000
+++ uc_product/uc_product.module	2009-04-24 13:21:59 +0000
@@ -714,7 +714,7 @@
 
   $context['class'][1] = 'display';
   $context['subject']['field'] = 'sell_price';
-  $node->content['display_price'] = array('#value' => uc_price($node->sell_price, $context),
+  $node->content['display_price'] = array('#value' => theme('uc_product_price', $node->sell_price, $context),
     '#access' => $enabled['display_price'],
     '#weight' => $weight['display_price'],
   );
@@ -728,14 +728,14 @@
 
     $context['class'][1] = 'list';
     $context['subject']['field'] = 'list_price';
-    $node->content['list_price'] = array('#value' => uc_price($node->list_price, $context),
+    $node->content['list_price'] = array('#value' => theme('uc_product_price', $node->list_price, $context),
       '#access' => $enabled['list_price'],
       '#weight' => $weight['list_price'],
     );
 
     $context['class'][1] = 'cost';
     $context['subject']['field'] = 'cost';
-    $node->content['cost'] = array('#value' => uc_price($node->cost, $context),
+    $node->content['cost'] = array('#value' => theme('uc_product_price', $node->cost, $context),
       '#access' => $enabled['cost'] && user_access('administer products'),
       '#weight' => $weight['cost'],
     );
@@ -746,7 +746,7 @@
 
   $context['class'][1] = 'sell';
   $context['subject']['field'] = 'sell_price';
-  $node->content['sell_price'] = array('#value' => uc_price($node->sell_price, $context, array('label' => !$teaser)),
+  $node->content['sell_price'] = array('#value' => theme('uc_product_price', $node->sell_price, $context, array('label' => !$teaser)),
     '#access' => $enabled['sell_price'],
     '#weight' => $weight['sell_price'],
   );
@@ -1414,29 +1414,11 @@
  *   Determines the label and the CSS class of the <div>.
  * @ingroup themeable
  */
-function theme_uc_product_price($price, $class, $no_label = 0) {
-  $output = '<div class="product-info '. $class .'">';
-  if ($no_label) {
-    $output .= uc_currency_format($price);
-  }
-  else {
-    switch ($class) {
-      case 'list-price':
-        $output .= t('List Price: !price', array('!price' => uc_currency_format($price)));
-      break;
-      case 'cost':
-        $output .= t('Cost: !price', array('!price' => uc_currency_format($price)));
-      break;
-      case 'sell-price':
-        $output .= t('Price: !price', array('!price' => uc_currency_format($price)));
-      break;
-      default:
-        $output .= uc_currency_format($price);
-      break;
-    }
-  }
-
+function theme_uc_product_price($price, $context, $options = array()) {
+  $output = '<div class="product-info '. implode(' ', (array)$context['class']) .'">';
+  $output .= uc_price($price, $context, $options);
   $output .= '</div>';
+
   return $output;
 }
 

=== modified file 'uc_store/uc_store.module'
--- uc_store/uc_store.module	2009-04-18 01:05:58 +0000
+++ uc_store/uc_store.module	2009-04-24 14:01:55 +0000
@@ -568,7 +568,7 @@
   }
   $context['class'][] = 'uc-price';
   // Class the element.
-  $output = '<div class="'. implode(' ', $context['class']) .'">';
+  $output = '<span class="'. implode(' ', $context['class']) .'">';
   // Prefix(es).
   if ($options['label'] && isset($options['prefixes'])) {
     $output .= implode('', $options['prefixes']);
@@ -579,7 +579,7 @@
   if ($options['label'] && isset($options['suffixes'])) {
     $output .= implode('', $options['suffixes']);
   }
-  $output .= '</div>';
+  $output .= '</span>';
 
   return $output;
 }

=== modified file 'uc_tax_report/uc_tax_report.module'
--- uc_tax_report/uc_tax_report.module	2009-04-18 01:05:58 +0000
+++ uc_tax_report/uc_tax_report.module	2009-04-24 13:10:33 +0000
@@ -121,7 +121,7 @@
   $star_legend = '';
 
   $context = array(
-    'revision' => 'formatted-original',
+    'revision' => 'themed-original',
     'location' => 'tax-report',
   );
   foreach($totals as $line) {