diff -rup storm/stormticket/stormticket.module storm-343818/stormticket/stormticket.module
--- storm/stormticket/stormticket.module	2009-07-15 18:27:20.000000000 +0100
+++ storm-343818/stormticket/stormticket.module	2009-08-05 15:45:41.000000000 +0100
@@ -47,6 +47,17 @@ function stormticket_init() {
   drupal_add_js($settings, 'setting');
 }
 
+function stormticket_content_extra_fields($type_name) {
+  if ($type_name == 'stormticket') {
+    return array(
+      'group1' => array('label' => 'Organization/Project/Task Group', 'weight' => -20),
+      'group2' => array('label' => 'Category/Status/Priority Group', 'weight' => -19),
+      'group3' => array('label' => 'Date/Duration Group', 'weight' => 2),
+      'group5' => array('label' => 'Price Group', 'weight' => 3),
+    );
+  }
+}
+
 // ACCESS FUNCTIONS
 function stormticket_access($op, $node, $account=NULL) {
   if (empty($account)) {
@@ -281,7 +292,7 @@ function stormticket_form(&$node) {
   $form['group1'] = array(
     '#type' => 'markup',
     '#theme' => 'storm_form_group',
-    '#weight' => -20,
+    '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group1') : -20,
   );
 
   $s_org = stormorganization_access_sql($s_org);
@@ -331,7 +342,7 @@ function stormticket_form(&$node) {
   $form['group2'] = array(
     '#type' => 'markup',
     '#theme' => 'storm_form_group',
-    '#weight' => -19,
+    '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group2') : -19,
   );
 
   $category_list = stormattribute_attributes_bydomain('Ticket category');
@@ -363,13 +374,13 @@ function stormticket_form(&$node) {
     '#title' => check_plain($type->title_label),
     '#required' => TRUE,
     '#default_value' => $node->title,
-    '#weight' => 1,
+    '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'title') : 1,
   );
 
   $form['group3'] = array(
     '#type' => 'markup',
     '#theme' => 'storm_form_group',
-    '#weight' => 2,
+    '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group3') : 2,
   );
 
   $form['group3']['datebegin'] = array(
@@ -404,7 +415,7 @@ function stormticket_form(&$node) {
   $form['group5'] = array(
     '#type' => 'markup',
     '#theme' => 'storm_form_group',
-    '#weight' => 3,
+    '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group5') : 3,
   );
 
   $pricemodes = stormattribute_attributes_bydomain('Price mode');
@@ -431,7 +442,7 @@ function stormticket_form(&$node) {
   );
 
   if ($type->has_body) {
-    $form['body_filter']['#weight'] = 4;
+    $form['body_filter']['#weight'] = module_exists('content') ? content_extra_field_weight($node->type, 'body_field') : 4;
     $form['body_filter']['body'] = array(
       '#type' => 'textarea',
       '#title' => check_plain($type->body_label),