diff --git a/drupal/sites/all/modules/commerce_invoice_receipt/commerce_invoice_receipt.module b/drupal/sites/all/modules/commerce_invoice_receipt/commerce_invoice_receipt.module
index 04193c8..b51b9e6 100644
--- a/drupal/sites/all/modules/commerce_invoice_receipt/commerce_invoice_receipt.module
+++ b/drupal/sites/all/modules/commerce_invoice_receipt/commerce_invoice_receipt.module
@@ -91,10 +91,22 @@ function commerce_invoice_receipt_entity_info_alter(&$entity_info) {
 * Implements hook_theme().
 */
 function commerce_invoice_receipt_theme() {
+  // Get current default theme
+  $default_theme_path = drupal_get_path('theme', variable_get('theme_default', NULL));
+  $default_template_path = drupal_get_path('module', 'commerce_invoice_receipt') . '/theme';
+
+  // Check commerce-order-invoice-view.tpl.php is in the current theme
+  if (file_exists($default_theme_path.'/invoice/commerce-order-invoice-view.tpl.php')) { 
+    $default_template_path = $default_theme_path.'/invoice/';
+  } 
+  elseif (file_exists($default_theme_path.'/commerce-order-invoice-view.tpl.php')) {
+    $default_template_path = $default_theme_path;
+  }  
+
   return array(
     'commerce_order_invoice_view' => array(
       'variables' => array('info' => NULL, 'order' => NULL),
-      'path' => drupal_get_path('module', 'commerce_invoice_receipt') . '/theme',
+      'path' => $default_template_path,
       'template' => 'commerce-order-invoice-view',
     ),
   );
@@ -109,14 +121,26 @@ function commerce_invoice_receipt_mail($key, &$message, $params) {
     'langcode' => $langcode,
     'context' => '',
   );
-  
+
   switch ($key) {
     // Setup an e-mailed invoice.
     case 'invoice':
+     // Get current default theme
+     $default_theme_path = drupal_get_path('theme', variable_get('theme_default', NULL));
+     $default_template_css = drupal_get_path('module', 'commerce_invoice_receipt') . '/theme/commerce_invoice_receipt.css';
+
+     // Check commerce_invoice_receipt.css is in the current theme
+     if (file_exists($default_theme_path.'/invoice/commerce_invoice_receipt.css')) {    
+       $default_template_css = $default_theme_path.'/invoice/commerce_invoice_receipt.css';
+     } 
+     elseif (file_exists($default_theme_path.'/css/commerce_invoice_receipt.css')) {
+       $default_template_css = $default_theme_path.'/css/commerce_invoice_receipt.css';
+     }
+    
       $styles[] = array(
         'type' => 'file',
         'media' => 'all',
-        'data' => drupal_get_path('module', 'commerce_invoice_receipt') . '/theme/commerce_invoice_receipt.css',
+        'data' => $default_template_css,
         'group' => CSS_DEFAULT,
         'every_page' => FALSE,
         'weight' => 0,