diff --git a/commerce_bank_transfer.module b/commerce_bank_transfer.module
index 4e0ea1e..40161c9 100755
--- a/commerce_bank_transfer.module
+++ b/commerce_bank_transfer.module
@@ -44,6 +44,17 @@ function commerce_bank_transfer_transaction_confirm_access($order, $transaction
 }
 
 /**
+ * Implements hook_theme().
+ */
+function commerce_bank_transfer_theme($existing, $type, $theme, $path) {
+  return array(
+    'commerce_bank_transfer_bank_details' => array(
+      'variables' => array('order' => NULL, 'payment_method' => NULL),
+    ),
+  );
+}
+
+/**
  * Implements hook_commerce_payment_method_info().
  */
 function commerce_bank_transfer_commerce_payment_method_info() {
@@ -165,7 +176,8 @@ function commerce_bank_transfer_submit_form($payment_method, $pane_values, $chec
 
   $form['bank_details'] = array(
   // TODO add message about details will be in email.. but email and token not yet done..
-    '#markup' => '<p><strong>' . t('Please make payment to:') . '</strong><br />' . commerce_bank_transfer_bank_details($order->order_id, $payment_method) . '</p>',
+    '#markup' => theme('commerce_bank_transfer_bank_details', array('order' => $order, 'payment_method' => $payment_method)),
+    //'#markup' => '<p><strong>' . t('Please make payment to:') . '</strong><br />' . commerce_bank_transfer_bank_details($order->order_id, $payment_method) . '</p>',
   // TODO "Account owner" was/is the infamouse "To" in uc_bank_transfer depending on how the online and email invoice is looking we can move "Account owner" into commerce_bank_transfer_bank_details()
   // TODO in uc_bank_transfer we sent the details through a theming function - should we still do this?
   );
@@ -202,12 +214,13 @@ function commerce_bank_transfer_transaction($payment_method, $order, $charge) {
 }
 
 /**
- * Implementation of commerce_bank_transfer_bank_details($oid).
+ * Implementation of theme_commerce_bank_transfer_bank_details().
  *
- * $oid = order ID
  */
-function commerce_bank_transfer_bank_details($oid, $pm) {
+function theme_commerce_bank_transfer_bank_details($variables) {
   global $user;
+  $oid = $variables['order']->order_id;
+  $pm = $variables['payment_method'];
 
   if (!empty($pm['settings']['details']['account_owner'])) {
     $bank_info[] = t('Account owner') . ': ' . $pm['settings']['details']['account_owner'];
@@ -240,6 +253,7 @@ function commerce_bank_transfer_bank_details($oid, $pm) {
   isset($bank_info) ? ($bank_details = implode('<br />', $bank_info)) : ($bank_details = '');
 
   $bank_details = token_replace($bank_details, array('user' => $user, 'commerce-order' => commerce_order_load($oid)));
+  $bank_details = '<p><strong>' . t('Please make payment to:') . '</strong><br />' . $bank_details . '</p>';
 
   return $bank_details;
 }