diff --git a/print.module b/print.module
index 66d80016edf1c92ea61971e765577c9e6c583197..a1fbd0599bd23cb08b7df2a78912dd718745d9cf 100644
--- a/print.module
+++ b/print.module
@@ -124,7 +124,7 @@ function print_theme() {
  * Clones the node theme registry for print_node so that it works with existing node templates
  */
 function print_theme_registry_alter(&$theme_registry) {
-  $theme_registry['print_node']['theme paths'] += $theme_registry['node']['theme paths'];
+//  $theme_registry['print_node']['theme path'] += $theme_registry['node']['theme path'];
 }
 
 /**
diff --git a/print.pages.inc b/print.pages.inc
index 146dfaec4cdafbf5bde7fd3b8a6cd0d429898c5d..0cf1d6c14e6baf7d1521c78b5deb8f49be9f5e38 100644
--- a/print.pages.inc
+++ b/print.pages.inc
@@ -197,12 +197,7 @@ function _print_var_generator($node, $message = NULL, $cid = NULL) {
   // If we are sending a message via e-mail, the CSS must be embedded
   if (!empty($message)) {
     $style = '';
-    $css_files = array();
-    foreach ($drupal_css as $types) {
-      foreach ($types as $values) {
-        $css_files = array_merge($css_files, array_keys($values));
-      }
-    }
+    $css_files = array_keys($drupal_css);
     if (!empty($print_css)) {
       // Convert to a local path, by removing the base_path
       $pattern = '!^' . base_path() . '!';
@@ -340,8 +335,8 @@ function _print_var_generator($node, $message = NULL, $cid = NULL) {
   if (module_exists('taxonomy')) {
 // TODO make this work when taxonomy works again
 //    $terms = taxonomy_link('taxonomy terms', $node);
-    $terms = taxonomy_preview_terms($node);
-    $print['taxonomy'] = theme('links', $terms);
+//    $terms = taxonomy_preview_terms($node);
+    $print['taxonomy'] = theme('links', array('links' => $terms));
   }
 
   $print['node'] = $node;
diff --git a/print_pdf/print_pdf.class.inc b/print_pdf/print_pdf.class.inc
index 0f78d10cf3a49f0d1cb955c4a98fcd20a815fd86..92f782eaeb903dbdb9d7fd839f650e06c663a29a 100644
--- a/print_pdf/print_pdf.class.inc
+++ b/print_pdf/print_pdf.class.inc
@@ -20,6 +20,6 @@ class PrintTCPDF extends TCPDF {
 
   //Page footer
   public function Footer() {
-    theme('print_pdf_tcpdf_footer2', $this);
+    theme('print_pdf_tcpdf_footer2', array('pdf' => $this));
   }
 }
diff --git a/print_pdf/print_pdf.pages.inc b/print_pdf/print_pdf.pages.inc
index 67aaea4bd0e2eba873899629666c49a419f39818..5d02a2b8e555aefc75bb65ab28423c8434ba99f7 100644
--- a/print_pdf/print_pdf.pages.inc
+++ b/print_pdf/print_pdf.pages.inc
@@ -150,7 +150,7 @@ function _print_pdf_dompdf($print, $html, $filename) {
   $dompdf->set_protocol($protocol);
 
 // dompdf can't handle footers cleanly, so disable the following
-//  $html = theme('print_pdf_dompdf_footer', $html);
+//  $html = theme('print_pdf_dompdf_footer', array('html' => $html));
 
   // If dompdf Unicode support is disabled, try to convert to ISO-8859-1 and then to HTML entities
   if (!variable_get('print_pdf_dompdf_unicode', PRINT_PDF_DOMPDF_UNICODE_DEFAULT)) {
@@ -254,9 +254,9 @@ function _print_pdf_tcpdf($print, $html, $filename) {
     $pdf->setRTL(TRUE);
   }
 
-  $pdf = theme('print_pdf_tcpdf_header', $pdf, $html, $font);
-  $pdf = theme('print_pdf_tcpdf_footer', $pdf, $html, $font);
-  $pdf = theme('print_pdf_tcpdf_page', $pdf);
+  $pdf = theme('print_pdf_tcpdf_header', array('pdf' => $pdf, 'html' => $html, 'font' => $font));
+  $pdf = theme('print_pdf_tcpdf_footer', array('pdf' => $pdf, 'html' => $html, 'font' => $font));
+  $pdf = theme('print_pdf_tcpdf_page', array('pdf' => $pdf));
 
   //initialize document
   $pdf->AliasNbPages();
@@ -264,7 +264,7 @@ function _print_pdf_tcpdf($print, $html, $filename) {
   // add a page
   $pdf->AddPage();
 
-  $pdf = theme('print_pdf_tcpdf_content', $pdf, $html, $font);
+  $pdf = theme('print_pdf_tcpdf_content', array('pdf' => $pdf, 'html' => $html, 'font' => $font));
 
   // reset pointer to the last page
   $pdf->lastPage();
@@ -350,9 +350,9 @@ function _print_pdf_wkhtmltopdf($print, $html, $filename) {
  *   contents of the body of the HTML from the original node
  * @see theme_print_pdf_tcpdf_footer()
  */
-function theme_print_pdf_dompdf_footer($html) {
-  preg_match('!<div class="print-footer">(.*?)</div>!si', $html, $tpl_footer);
-  $html = str_replace($tpl_footer[0], '', $html);
+function theme_print_pdf_dompdf_footer($vars) {
+  preg_match('!<div class="print-footer">(.*?)</div>!si', $vars['html'], $tpl_footer);
+  $html = str_replace($tpl_footer[0], '', $vars['html']);
 
   $text = '<script type="text/php">
     if (isset($pdf)) {
@@ -397,10 +397,11 @@ function theme_print_pdf_dompdf_footer($html) {
  *   array with the font definition (font name, styles and size)
  * @see theme_print_pdf_tcpdf_header()
  */
-function theme_print_pdf_tcpdf_header($pdf, $html, $font) {
-  preg_match('!<div class="print-logo">(.*?)</div>!si', $html, $tpl_logo);
-  preg_match('!<h1 class="print-title">(.*?)</h1>!si', $html, $tpl_title);
-  preg_match('!<div class="print-site_name">(.*?)</div>!si', $html, $tpl_site_name);
+function theme_print_pdf_tcpdf_header($vars) {
+  $pdf = $vars['pdf'];
+  preg_match('!<div class="print-logo">(.*?)</div>!si', $vars['html'], $tpl_logo);
+  preg_match('!<h1 class="print-title">(.*?)</h1>!si', $vars['html'], $tpl_title);
+  preg_match('!<div class="print-site_name">(.*?)</div>!si', $vars['html'], $tpl_site_name);
 
   $ratio = 0;
   $logo = '';
@@ -412,7 +413,7 @@ function theme_print_pdf_tcpdf_header($pdf, $html, $font) {
   }
 
   // set header font
-  $pdf->setHeaderFont($font);
+  $pdf->setHeaderFont($vars['font']);
   // set header margin
   $pdf->SetHeaderMargin(5);
   // set header data
@@ -428,7 +429,8 @@ function theme_print_pdf_tcpdf_header($pdf, $html, $font) {
  *   current TCPDF object
  * @see theme_print_pdf_tcpdf_page()
  */
-function theme_print_pdf_tcpdf_page($pdf) {
+function theme_print_pdf_tcpdf_page($vars) {
+  $pdf = $vars['pdf'];
   // set margins
   $pdf->SetMargins(15, 20, 15);
   // set auto page breaks
@@ -454,11 +456,12 @@ function theme_print_pdf_tcpdf_page($pdf) {
  *   array with the font definition (font name, styles and size)
  * @see theme_print_pdf_tcpdf_content()
  */
-function theme_print_pdf_tcpdf_content($pdf, $html, $font) {
+function theme_print_pdf_tcpdf_content($vars) {
+  $pdf = $vars['pdf'];
   // set content font
-  $pdf->setFont($font[0], $font[1], $font[2]);
+  $pdf->setFont($vars['font'][0], $vars['font'][1], $vars['font'][2]);
 
-  preg_match('!<body.*?>(.*)</body>!sim', $html, $matches);
+  preg_match('!<body.*?>(.*)</body>!sim', $vars['html'], $matches);
   $pattern = '!(?:<div class="print-(?:logo|site_name|breadcrumb|footer)">.*?</div>|<hr class="print-hr" />)!si';
   $matches[1] = preg_replace($pattern, '', $matches[1]);
 
@@ -491,13 +494,14 @@ function theme_print_pdf_tcpdf_content($pdf, $html, $font) {
  *   array with the font definition (font name, styles and size)
  * @see theme_print_pdf_tcpdf_footer()
  */
-function theme_print_pdf_tcpdf_footer($pdf, $html, $font) {
-  preg_match('!<div class="print-footer">(.*?)</div>!si', $html, $tpl_footer);
+function theme_print_pdf_tcpdf_footer($vars) {
+  $pdf = $vars['pdf'];
+  preg_match('!<div class="print-footer">(.*?)</div>!si', $vars['html'], $tpl_footer);
   $footer = trim(preg_replace('!</?div[^>]*?>!i', '', $tpl_footer[1]));
 
   // set footer font
-  $font[2] *= 0.8;
-  $pdf->setFooterFont($font);
+  $vars['font'][2] *= 0.8;
+  $pdf->setFooterFont($vars['font']);
   // set footer margin
   $pdf->SetFooterMargin(10);
   // set footer data
@@ -513,7 +517,8 @@ function theme_print_pdf_tcpdf_footer($pdf, $html, $font) {
  *   current TCPDF object
  * @see theme_print_pdf_tcpdf_footer2()
  */
-function theme_print_pdf_tcpdf_footer2($pdf) {
+function theme_print_pdf_tcpdf_footer2($vars) {
+  $pdf = $vars['pdf'];
   //Position at 1.5 cm from bottom
   $pdf->writeHTMLCell(0, 15, 15, -10, $pdf->footer, 0, 0, 0, TRUE, '');