diff --git a/storminvoice/storminvoice.module b/storminvoice/storminvoice.module
index cd8545d..9ca4aa8 100644
--- a/storminvoice/storminvoice.module
+++ b/storminvoice/storminvoice.module
@@ -168,7 +168,11 @@ function storminvoice_theme() {
     ),
     'storminvoice_autoadd_links' => array(
       'file'      => 'storminvoice.theme.inc',
-      'arguments' => array('nid', 'billable', 'billed'),
+      'variables' => array(
+        'nid' => NULL,
+        'billable' => NULL,
+        'billed' => NULL,
+      ),
     ),
   );
 }
diff --git a/storminvoice/storminvoice.theme.inc b/storminvoice/storminvoice.theme.inc
index 58ef163..902bf49 100644
--- a/storminvoice/storminvoice.theme.inc
+++ b/storminvoice/storminvoice.theme.inc
@@ -931,7 +931,11 @@ function theme_storminvoice_report_html($node, $language) {
  * @return varchar
  *   html coding for the link
  */
-function theme_storminvoice_autoadd_links($nid, $billable, $billed) {
+function theme_storminvoice_autoadd_links($variables) {
+  $nid = $variables['nid'];
+  $billable = $variables['billable'];
+  $billed = $variables['billed'];
+
   if (user_access('Storm invoice: add')) {
     if ($billable && !$billed) {
       $v = '';
diff --git a/stormproject/stormproject.theme.inc b/stormproject/stormproject.theme.inc
index 5913b2f..5d28fb6 100644
--- a/stormproject/stormproject.theme.inc
+++ b/stormproject/stormproject.theme.inc
@@ -30,7 +30,7 @@ function theme_stormproject_list($variables) {
 function theme_stormproject_view($variables) {
   $node = $variables['node'];
 
-  drupal_add_css(drupal_get_path('module', 'storm') . '/storm-node.css', 'module');
+  drupal_add_css(drupal_get_path('module', 'storm') . '/storm-node.css');
 
   $l_pos = 1; // Used to increase the link position number (see issue 814820)