diff --git a/modules/storm/storm-node.css b/modules/storm/storm-node.css
deleted file mode 100644
index 25d44df..0000000
--- a/modules/storm/storm-node.css
+++ /dev/null
@@ -1,39 +0,0 @@
-
-/* CSS Attributes used when viewing SuiteDesk nodes */
-
-dt.print_html {
-  background: transparent url(images/html.png) no-repeat top left;
-}
-
-dt.print_pdf {
-  background: transparent url(images/pdf.png) no-repeat top left;
-}
-
-div.stormfields, div.field, div.stormbody {
-  width: 70%;
-}
-
-div.stormfields div.label, div.stormbody div.label, div.field div.field-label-inline-first {
-  float: left;
-  width: 150px;
-  text-align: right;
-  clear: left;
-  font-weight: bold;
-}
-
-div.stormlinks {
-  float:right;
-  width: 30%;
-}
-
-div.stormbody div.value p {
-  clear: left;
-  margin: 1.2em;
-  margin-left: 0px;
-  margin-top: 0px;
-  margin-right: 0px;
-}
-
-table#attachments {
-  float: left;
-}
diff --git a/modules/storm/stormdok/stormdok.theme.inc b/modules/storm/stormdok/stormdok.theme.inc
index e4451dc..9380fbd 100644
--- a/modules/storm/stormdok/stormdok.theme.inc
+++ b/modules/storm/stormdok/stormdok.theme.inc
@@ -30,8 +30,6 @@ function theme_stormdok_list($header, $doks) {
 }
 
 function theme_stormdok_view($node, $teaser = FALSE, $page = FALSE) {
-  drupal_add_css(drupal_get_path('module', 'storm') . '/storm-node.css', 'module');
-
   $node = node_prepare($node, $teaser);
   $l_pos = 1; // Used to increase the link position number (see issue 814820)
 
diff --git a/modules/storm/stormevent/stormevent.theme.inc b/modules/storm/stormevent/stormevent.theme.inc
index 8c9c188..3cac84e 100644
--- a/modules/storm/stormevent/stormevent.theme.inc
+++ b/modules/storm/stormevent/stormevent.theme.inc
@@ -47,8 +47,6 @@ function theme_stormevent_list($header, $events) {
 }
 
 function theme_stormevent_view($node, $teaser = FALSE, $page = FALSE) {
-  drupal_add_css(drupal_get_path('module', 'storm') . '/storm-node.css', 'module');
-
   $node = node_prepare($node, $teaser);
   $l_pos = 1; // Used to increase the link position number (see issue 814820)
 
diff --git a/modules/storm/stormexpense/stormexpense.theme.inc b/modules/storm/stormexpense/stormexpense.theme.inc
index 54dc4c9..ad2e9a6 100644
--- a/modules/storm/stormexpense/stormexpense.theme.inc
+++ b/modules/storm/stormexpense/stormexpense.theme.inc
@@ -70,8 +70,6 @@ function theme_stormexpense_list($header, $expenses, $totals) {
 }
 
 function theme_stormexpense_view($node, $teaser = FALSE, $page = FALSE) {
-  drupal_add_css(drupal_get_path('module', 'storm') . '/storm-node.css', 'module');
-
   $node = node_prepare($node, $teaser);
   $l_pos = 1; // Used to increase the link position number (see issue 814820)
 
diff --git a/modules/storm/stormidea/stormidea.theme.inc b/modules/storm/stormidea/stormidea.theme.inc
index aecb5ac..7d3cca9 100644
--- a/modules/storm/stormidea/stormidea.theme.inc
+++ b/modules/storm/stormidea/stormidea.theme.inc
@@ -22,8 +22,6 @@ function theme_stormidea_list($header, $ideas) {
 }
 
 function theme_stormidea_view($node, $teaser = FALSE, $page = FALSE) {
-  drupal_add_css(drupal_get_path('module', 'storm') . '/storm-node.css', 'module');
-
   $node = node_prepare($node, $teaser);
   $l_pos = 1; // Used to increase the link position number (see issue 814820)
 
diff --git a/modules/storm/storminvoice/storminvoice.theme.inc b/modules/storm/storminvoice/storminvoice.theme.inc
index 315107e..896ee03 100644
--- a/modules/storm/storminvoice/storminvoice.theme.inc
+++ b/modules/storm/storminvoice/storminvoice.theme.inc
@@ -175,8 +175,8 @@ function theme_storminvoice_list($header, $invoices, $itemsperpage, $totals_topa
  *   The node object that contains the invoice.
  */
 function theme_storminvoice_view($node, $teaser = FALSE, $page = FALSE) {
-  // Add generic SuiteDesk node CSS
-  drupal_add_css(drupal_get_path('module', 'storm') . '/storm-node.css', 'module');
+  global $language;
+
   // Adds CSS for SuiteDesk Invoice node view
   drupal_add_css(drupal_get_path('module', 'storminvoice') . '/storminvoice-nodeview.css');
 
@@ -191,13 +191,13 @@ function theme_storminvoice_view($node, $teaser = FALSE, $page = FALSE) {
 
   // Bodge fix to keep html and pdf invoices working. Without language, menu items default to /storm
   if (!$node->language) {
-    $node->language = 'en';
+    $node->language = $language->language;
   }
 
   $node->content['links']['print']['html'] = array(
     '#prefix' => '<dt class="stormcomponent print_html">',
     '#suffix' => '</dt>',
-    '#value' => l(t('Print HTML'), 'invoice/report/'. $node->nid .'/html/'. $node->language),
+    '#value' => l(t('Print HTML'), 'invoice/report/'. $node->nid .'/html/'. $node->language, array('attributes' => array('onclick' => 'window.open(this.href); return false', 'rel' => 'nofollow'))),
     '#weight' => $l_pos++,
   );
 
@@ -207,7 +207,7 @@ function theme_storminvoice_view($node, $teaser = FALSE, $page = FALSE) {
     $node->content['links']['print']['pdf'] = array(
       '#prefix' => '<dt class="stormcomponent print_pdf">',
       '#suffix' => '</dt>',
-      '#value' => l(t('Print PDF'), 'invoice/report/'. $node->nid .'/pdf/'. $node->language),
+      '#value' => l(t('Print PDF'), 'invoice/report/'. $node->nid .'/pdf/'. $node->language, array('attributes' => array('onclick' => 'window.open(this.href); return false', 'rel' => 'nofollow'))),
       '#weight' => $l_pos++,
     );
       $node->content['links']['print']['email'] = array(
@@ -415,6 +415,7 @@ function theme_storminvoice_view($node, $teaser = FALSE, $page = FALSE) {
 
   $organization = node_load($node->organization_nid);
   $myorg = node_load(variable_get('storm_organization_nid', 0));
+/*
   if (isset($myorg->orglanguage)) {
     if ($myorg->orglanguage != $organization->orglanguage) {
       $language = $organization->orglanguage .','. $myorg->orglanguage;
@@ -423,7 +424,7 @@ function theme_storminvoice_view($node, $teaser = FALSE, $page = FALSE) {
       $language = $myorg->orglanguage;
     }
   }
-
+*/
   if (isset($myorg->currency)) {
     $currencies = storm_attributes_bydomain('Currency');
     $node->content['group5']['currency'] = array(
@@ -481,7 +482,7 @@ function theme_storminvoice_report_pdf($node, $language, $output = 'screen') {
     drupal_goto('node/'. $node->nid);
   }
 
-  require_once($tcpdf_dir .'/config/lang/eng.php');
+# require_once($tcpdf_dir .'/config/lang/eng.php');
   require_once($tcpdf_dir .'/tcpdf.php');
   $languages = explode(',', $language);
   $language = $languages[0];
diff --git a/modules/storm/stormnote/stormnote.theme.inc b/modules/storm/stormnote/stormnote.theme.inc
index 87a28c2..d209439 100644
--- a/modules/storm/stormnote/stormnote.theme.inc
+++ b/modules/storm/stormnote/stormnote.theme.inc
@@ -28,8 +28,6 @@ function theme_stormnote_list($header, $notes) {
 }
 
 function theme_stormnote_view($node, $teaser = FALSE, $page = FALSE) {
-  drupal_add_css(drupal_get_path('module', 'storm') . '/storm-node.css', 'module');
-
   $node = node_prepare($node, $teaser);
   $l_pos = 1; // Used to increase the link position number (see issue 814820)
 
diff --git a/modules/storm/stormorganization/stormorganization.theme.inc b/modules/storm/stormorganization/stormorganization.theme.inc
index 61e63d6..70a8015 100644
--- a/modules/storm/stormorganization/stormorganization.theme.inc
+++ b/modules/storm/stormorganization/stormorganization.theme.inc
@@ -24,8 +24,6 @@ function theme_stormorganization_list($header, $organizations) {
 }
 
 function theme_stormorganization_view($node, $teaser = FALSE, $page = FALSE) {
-  drupal_add_css(drupal_get_path('module', 'storm') . '/storm-node.css', 'module');
-
   $node = node_prepare($node, $teaser);
   $l_pos = 1; // Used to increase the link position number (see issue 814820)
 
diff --git a/modules/storm/stormperson/stormperson.theme.inc b/modules/storm/stormperson/stormperson.theme.inc
index 35747bb..115e485 100644
--- a/modules/storm/stormperson/stormperson.theme.inc
+++ b/modules/storm/stormperson/stormperson.theme.inc
@@ -22,8 +22,6 @@ function theme_stormperson_list($header, $people) {
 }
 
 function theme_stormperson_view($node, $teaser = FALSE, $page = FALSE) {
-  drupal_add_css(drupal_get_path('module', 'storm') . '/storm-node.css', 'module');
-
   $node = node_prepare($node, $teaser);
 
   $node->content['links'] = array(
diff --git a/modules/storm/stormproject/stormproject.theme.inc b/modules/storm/stormproject/stormproject.theme.inc
index 75ae848..7ac145e 100644
--- a/modules/storm/stormproject/stormproject.theme.inc
+++ b/modules/storm/stormproject/stormproject.theme.inc
@@ -30,8 +30,6 @@ function theme_stormproject_list($header, $projects) {
 }
 
 function theme_stormproject_view($node, $teaser = FALSE, $page = FALSE) {
-  drupal_add_css(drupal_get_path('module', 'storm') . '/storm-node.css', 'module');
-
   $node = node_prepare($node, $teaser);
   $l_pos = 1; // Used to increase the link position number (see issue 814820)
 
diff --git a/modules/storm/stormtask/stormtask.theme.inc b/modules/storm/stormtask/stormtask.theme.inc
index 9dda7bf..092b52f 100644
--- a/modules/storm/stormtask/stormtask.theme.inc
+++ b/modules/storm/stormtask/stormtask.theme.inc
@@ -91,8 +91,6 @@ function theme_stormtask_list($header, $tasks) {
 }
 
 function theme_stormtask_view($node, $teaser = FALSE, $page = FALSE) {
-  drupal_add_css(drupal_get_path('module', 'storm') . '/storm-node.css', 'module');
-
   $node = node_prepare($node, $teaser);
   $l_pos = 1; // Used to increase the link position number (see issue 814820)
 
diff --git a/modules/storm/stormteam/stormteam.theme.inc b/modules/storm/stormteam/stormteam.theme.inc
index 54de87b..cf79887 100644
--- a/modules/storm/stormteam/stormteam.theme.inc
+++ b/modules/storm/stormteam/stormteam.theme.inc
@@ -10,8 +10,6 @@
  * Theme function for the SuiteDesk Team node view
  */
 function theme_stormteam_view($node, $teaser = FALSE, $page = FALSE) {
-  drupal_add_css(drupal_get_path('module', 'storm') . '/storm-node.css', 'module');
-
   $node = node_prepare($node, $teaser);
   $type = node_get_types('type', $node);
 
diff --git a/modules/storm/stormticket/stormticket.theme.inc b/modules/storm/stormticket/stormticket.theme.inc
index 1e2604f..948b897 100644
--- a/modules/storm/stormticket/stormticket.theme.inc
+++ b/modules/storm/stormticket/stormticket.theme.inc
@@ -32,8 +32,6 @@ function theme_stormticket_list($header, $tickets) {
 }
 
 function theme_stormticket_view($node, $teaser = FALSE, $page = FALSE) {
-  drupal_add_css(drupal_get_path('module', 'storm') . '/storm-node.css', 'module');
-
   $node = node_prepare($node, $teaser);
 
   $node->content['links'] = array(
diff --git a/modules/storm/stormtimetracking/stormtimetracking.theme.inc b/modules/storm/stormtimetracking/stormtimetracking.theme.inc
index 28fd567..07f2a79 100644
--- a/modules/storm/stormtimetracking/stormtimetracking.theme.inc
+++ b/modules/storm/stormtimetracking/stormtimetracking.theme.inc
@@ -27,8 +27,6 @@ function theme_stormtimetracking_list($header, $timetrackings, $billing_duration
 }
 
 function theme_stormtimetracking_view($node, $teaser = FALSE, $page = FALSE) {
-  drupal_add_css(drupal_get_path('module', 'storm') . '/storm-node.css', 'module');
-
   $node = node_prepare($node, $teaser);
   $l_pos = 1; // Used to increase the link position number (see issue 814820)
 
diff --git a/themes/zuitedesk/css/suitedesk.css b/themes/zuitedesk/css/suitedesk.css
index 02ecf58..ff2cbb2 100644
--- a/themes/zuitedesk/css/suitedesk.css
+++ b/themes/zuitedesk/css/suitedesk.css
@@ -1588,6 +1588,16 @@ table.formgroup_access .description {
   margin-top: .75em;
 }
 
+/*
+ * "SuiteDesk Invoice" node.
+ */
+dt.print_html {
+  background: transparent url(../images/html.png) no-repeat top left;
+}
+dt.print_pdf {
+  background: transparent url(../images/pdf.png) no-repeat top left;
+}
+
 /*
  * "SuiteDesk Organization" node form.
  */
diff --git a/modules/storm/images/html.png b/themes/zuitedesk/images/html.png
similarity index 100%
rename from modules/storm/images/html.png
rename to themes/zuitedesk/images/html.png
diff --git a/modules/storm/images/pdf.png b/themes/zuitedesk/images/pdf.png
similarity index 100%
rename from modules/storm/images/pdf.png
rename to themes/zuitedesk/images/pdf.png
diff --git a/themes/zuitedesk/modules/storm/storm-node.css b/themes/zuitedesk/modules/storm/storm-node.css
deleted file mode 100644
index e69de29..0000000
diff --git a/themes/zuitedesk/zuitedesk.info b/themes/zuitedesk/zuitedesk.info
index 1c02328..cef3b1d 100644
--- a/themes/zuitedesk/zuitedesk.info
+++ b/themes/zuitedesk/zuitedesk.info
@@ -1,6 +1,6 @@
 name        = SuiteDesk Theme
 description = SuiteDesk Theme Zen.
-version     = 0.2.53
+version     = 0.2.54
 
 screenshot = screenshot.png
 
@@ -49,7 +49,6 @@ stylesheets[all][] = modules/system/defaults.css
 stylesheets[all][] = modules/system/system.css
 stylesheets[all][] = modules/system/system-menus.css
 stylesheets[all][] = modules/user/user.css
-stylesheets[all][] = modules/storm/storm-node.css
 stylesheets[all][] = modules/print/css/printlinks.css