--- storm/stormtask/stormtask.theme.inc	2009-07-24 00:26:26.000000000 +0100
+++ storm-527768-6/stormtask/stormtask.theme.inc	2009-07-24 12:35:47.000000000 +0100
@@ -127,65 +127,13 @@ function theme_stormtask_view($node, $te
   $w = 0;
   $i = new stdClass();
 
-  if (module_exists('stormexpense') && user_access('Storm expense: access')) {
-    $v = l(t('Expenses'), 'storm/expenses/', array('query' => array('task_nid' => $node->nid)));
-    $i->type = 'stormexpense';
-    $params = $_GET;
-    $params['task_nid'] = $node->nid;
-    $v .= storm_icon_add_node($i, $params);
+  $node->content['stormtask']['links']['expenses'] = theme_storm_link('stormexpense', 'stormtask', $node->nid, $w++);
 
-    $node->content['stormtask']['links']['expenses']  = array(
-      '#prefix' => '<dt id="stormexpenses" class="stormcomponent">',
-      '#suffix' => '</dt>',
-      '#value' => $v,
-      '#weight' => $w++,
-    );
-  }
-  
-  if (module_exists('stormnote') && user_access('Storm note: access')) {
-    $v = l(t('Notes'), 'storm/notes/', array('query' => array('task_nid' => $node->nid)));
-    $i->type = 'stormnote';
-    $params = $_GET;
-    $params['task_nid'] = $node->nid;
-    $v .= storm_icon_add_node($i, $params);
+  $node->content['stormtask']['links']['notes'] = theme_storm_link('stormnote', 'stormtask', $node->nid, $w++);
 
-    $node->content['stormtask']['links']['notes']  = array(
-      '#prefix' => '<dt id="stormnotes" class="stormcomponent">',
-      '#suffix' => '</dt>',
-      '#value' => $v,
-      '#weight' => $w++,
-    );
-  }
-  
-  if (module_exists('stormticket') && user_access('Storm ticket: access')) {
-    $v = l(t('Tickets'), 'storm/tickets/', array('query' => array('task_nid' => $node->nid)));
-    $i->type = 'stormticket';
-    $params = $_GET;
-    $params['task_nid'] = $node->nid;
-    $v .= storm_icon_add_node($i, $params);
+  $node->content['stormtask']['links']['tickets'] = theme_storm_link('stormticket', 'stormtask', $node->nid, $w++);
 
-    $node->content['stormtask']['links']['tickets'] = array(
-      '#prefix' => '<dt id="stormtickets" class="stormcomponent">',
-      '#suffix' => '</dt>',
-      '#value' => $v,
-      '#weight' => $w++,
-    );
-  }
-
-  if (module_exists('stormtimetracking') && user_access('Storm timetracking: access')) {
-    $v = l(t('Timetrackings'), 'storm/timetrackings/', array('query' => array('task_nid' => $node->nid)));
-    $i->type = 'stormtimetracking';
-    $params = $_GET;
-    $params['task_nid'] = $node->nid;
-    $v .= storm_icon_add_node($i, $params);
-
-    $node->content['stormtask']['links']['timetrackings'] = array(
-      '#prefix' => '<dt id="stormtimetrackings" class="stormcomponent">',
-      '#suffix' => '</dt>',
-      '#value' => $v,
-      '#weight' => $w++,
-    );
-  }
+  $node->content['stormtask']['links']['timetrackings'] = theme_storm_link('stormtimetracking', 'stormtask', $node->nid, $w++);
 
   return $node;
 }