diff --git a/storm.css b/storm.css
index 1580ba8..c4cb75e 100644
--- a/storm.css
+++ b/storm.css
@@ -2,6 +2,7 @@ table.formgroup {
 width: auto;
 margin: 0;
 clear: both;
+border: none;
 }
 
 table.formgroup tr td {
@@ -171,4 +172,4 @@ background: transparent url(images/configuration.png) no-repeat top left;
 
 .view .attachment .storm-icon-add-view {
   float: right;
-}
\ No newline at end of file
+}
diff --git a/storm.module b/storm.module
index e267389..13ae857 100644
--- a/storm.module
+++ b/storm.module
@@ -161,7 +161,7 @@ function storm_theme() {
   return array(
     'storm_form_group' => array(
       'file'      => 'storm.theme.inc',
-      'arguments' => array('header', 'form'),
+      'render element' => 'element',
     ),
     'datetime' => array(
       'file'      => 'storm.theme.inc',
diff --git a/storm.theme.inc b/storm.theme.inc
index 5b8ecfc..6776a6e 100644
--- a/storm.theme.inc
+++ b/storm.theme.inc
@@ -5,17 +5,29 @@
  * Provides theme functions for Storm modules
  */
 
-function theme_storm_form_group($form) {
-  drupal_add_css(drupal_get_path('module', 'storm') .'/storm.css', 'module');
-  $output = NULL; // Variable set as per issue 684016.
+function theme_storm_form_group($variables) {
+  $element = $variables['element'];
+
+  drupal_add_css(drupal_get_path('module', 'storm') .'/storm.css');
 
   $row = array();
-  foreach (element_children($form) as $key) {
-    array_push($row, drupal_render($form[$key]));
+  foreach (element_children($element) as $key) {
+    array_push($row, drupal_render($element[$key]));
   }
-  $rows[] = array('data' => $row, 'class' => 'formgroup');
-  $output .= theme('table', array(), $rows, array('class' => 'formgroup'));
-  return $output;
+
+  $rows = array(
+    array(
+      'data' => $row,
+      'class' => array('formgroup'),
+      'no_striping' => TRUE,
+    )
+  );
+
+  return theme('table', array(
+    'header' => array(),
+    'rows' => $rows,
+    'attributes' => array('class' => array('formgroup'))
+  ));
 }
 
 function theme_datetime($element) {
diff --git a/stormorganization/stormorganization.module b/stormorganization/stormorganization.module
index 57ea8e7..894c250 100644
--- a/stormorganization/stormorganization.module
+++ b/stormorganization/stormorganization.module
@@ -255,7 +255,7 @@ function stormorganization_form(&$node) {
 
   $form['group1'] = array(
     '#type' => 'markup',
-//    '#theme' => 'storm_form_group',
+    '#theme' => 'storm_form_group',
     '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group1') : -20,
   );
 
@@ -279,13 +279,13 @@ function stormorganization_form(&$node) {
 
   $form['group2'] = array(
     '#type' => 'markup',
-//    '#theme' => 'storm_form_group',
+    '#theme' => 'storm_form_group',
     '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group2') : -19,
   );
 
   $form['group3'] = array(
     '#type' => 'markup',
-//    '#theme' => 'storm_form_group',
+    '#theme' => 'storm_form_group',
     '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group3') : -18,
   );
 
@@ -331,7 +331,7 @@ function stormorganization_form(&$node) {
 
   $form['group4'] = array(
     '#type' => 'markup',
-//    '#theme' => 'storm_form_group',
+    '#theme' => 'storm_form_group',
     '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group4') : -17,
   );
 
@@ -357,7 +357,7 @@ function stormorganization_form(&$node) {
 
   $form['group5'] = array(
     '#type' => 'markup',
-//    '#theme' => 'storm_form_group',
+    '#theme' => 'storm_form_group',
     '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group5') : -16,
   );
 
diff --git a/stormperson/stormperson.module b/stormperson/stormperson.module
index 2d53ace..4ca28a0 100644
--- a/stormperson/stormperson.module
+++ b/stormperson/stormperson.module
@@ -322,7 +322,7 @@ function stormperson_form(&$node) {
 
   $form['group1'] = array(
     '#type' => 'markup',
-//    '#theme' => 'storm_form_group',
+    '#theme' => 'storm_form_group',
     '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group1') : -20,
   );
 
@@ -343,7 +343,7 @@ function stormperson_form(&$node) {
 
   $form['group2'] = array(
     '#type' => 'markup',
-//    '#theme' => 'storm_form_group',
+    '#theme' => 'storm_form_group',
     '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group2') : -19,
   );
 
@@ -382,7 +382,7 @@ function stormperson_form(&$node) {
 
   $form['group3'] = array(
     '#type' => 'markup',
-//    '#theme' => 'storm_form_group',
+    '#theme' => 'storm_form_group',
     '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group3') : -18,
   );
 
@@ -402,7 +402,7 @@ function stormperson_form(&$node) {
 
   $form['group4'] = array(
     '#type' => 'markup',
-//    '#theme' => 'storm_form_group',
+    '#theme' => 'storm_form_group',
     '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group4') : -17,
   );
 
diff --git a/stormproject/stormproject.module b/stormproject/stormproject.module
index 86ddd7c..dd08c01 100644
--- a/stormproject/stormproject.module
+++ b/stormproject/stormproject.module
@@ -420,7 +420,7 @@ function stormproject_form(&$node) {
 
   $form['group1'] = array(
     '#type' => 'markup',
-//    '#theme' => 'storm_form_group',
+    '#theme' => 'storm_form_group',
     '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group1') : -20,
   );
 
@@ -455,7 +455,7 @@ function stormproject_form(&$node) {
 
   $form['group2'] = array(
     '#type' => 'markup',
-//    '#theme' => 'storm_form_group',
+    '#theme' => 'storm_form_group',
     '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group2') : -19,
   );
 
@@ -485,7 +485,7 @@ function stormproject_form(&$node) {
 
   $form['group3'] = array(
     '#type' => 'markup',
-//    '#theme' => 'storm_form_group',
+    '#theme' => 'storm_form_group',
     '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group3') : -18,
   );
 
@@ -520,7 +520,7 @@ function stormproject_form(&$node) {
 
   $form['group4'] = array(
     '#type' => 'markup',
-//    '#theme' => 'storm_form_group',
+    '#theme' => 'storm_form_group',
     '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group4') : -17,
   );
 
@@ -549,7 +549,7 @@ function stormproject_form(&$node) {
 
   $form['group5'] = array(
     '#type' => 'markup',
-//    '#theme' => 'storm_form_group',
+    '#theme' => 'storm_form_group',
     '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group5') : -16,
   );
 
@@ -613,7 +613,7 @@ function stormproject_form(&$node) {
 
   $form['group6'] = array(
     '#type' => 'markup',
-//    '#theme' => 'storm_form_group',
+    '#theme' => 'storm_form_group',
     '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group6') : -15,
   );
 
diff --git a/stormtask/stormtask.module b/stormtask/stormtask.module
index 3125e39..f507c20 100644
--- a/stormtask/stormtask.module
+++ b/stormtask/stormtask.module
@@ -514,7 +514,7 @@ function stormtask_form(&$node) {
 
   $form['group1'] = array(
     '#type' => 'markup',
-//    '#theme' => 'storm_form_group',
+    '#theme' => 'storm_form_group',
     '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group1') : -20,
   );
 
@@ -601,7 +601,7 @@ function stormtask_form(&$node) {
 
   $form['group2'] = array(
     '#type' => 'markup',
-//    '#theme' => 'storm_form_group',
+    '#theme' => 'storm_form_group',
     '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group2') : -17,
   );
 
@@ -631,7 +631,7 @@ function stormtask_form(&$node) {
 
   $form['group3'] = array(
     '#type' => 'markup',
-//    '#theme' => 'storm_form_group',
+    '#theme' => 'storm_form_group',
     '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group3') : -16,
   );
 
@@ -666,7 +666,7 @@ function stormtask_form(&$node) {
 
   $form['group4'] = array(
     '#type' => 'markup',
-//    '#theme' => 'storm_form_group',
+    '#theme' => 'storm_form_group',
     '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group4') : -16,
   );
 
@@ -695,7 +695,7 @@ function stormtask_form(&$node) {
 
   $form['group5'] = array(
     '#type' => 'markup',
-//    '#theme' => 'storm_form_group',
+    '#theme' => 'storm_form_group',
     '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group5') : -16,
   );
 
@@ -710,7 +710,7 @@ function stormtask_form(&$node) {
 
   $form['group6'] = array(
     '#type' => 'markup',
-//    '#theme' => 'storm_form_group',
+    '#theme' => 'storm_form_group',
     '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group6') : -15,
   );
 
diff --git a/stormticket/stormticket.module b/stormticket/stormticket.module
index 8465279..b3afea2 100644
--- a/stormticket/stormticket.module
+++ b/stormticket/stormticket.module
@@ -428,7 +428,7 @@ function stormticket_form(&$node) {
 
   $form['group1'] = array(
     '#type' => 'markup',
-//    '#theme' => 'storm_form_group',
+    '#theme' => 'storm_form_group',
     '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group1') : -20,
   );
 
@@ -493,7 +493,7 @@ function stormticket_form(&$node) {
 
   $form['group2'] = array(
     '#type' => 'markup',
-//    '#theme' => 'storm_form_group',
+    '#theme' => 'storm_form_group',
     '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group2') : -19,
   );
 
@@ -531,7 +531,7 @@ function stormticket_form(&$node) {
 
   $form['group3'] = array(
     '#type' => 'markup',
-//    '#theme' => 'storm_form_group',
+    '#theme' => 'storm_form_group',
     '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group3') : -17,
   );
 
@@ -566,7 +566,7 @@ function stormticket_form(&$node) {
 
   $form['group4'] = array(
     '#type' => 'markup',
-//    '#theme' => 'storm_form_group',
+    '#theme' => 'storm_form_group',
     '#weight' => 3,
     '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group4') : -16,
   );
@@ -596,7 +596,7 @@ function stormticket_form(&$node) {
 
   $form['group5'] = array(
     '#type' => 'markup',
-//    '#theme' => 'storm_form_group',
+    '#theme' => 'storm_form_group',
     '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group5') : -15,
   );
 
@@ -611,7 +611,7 @@ function stormticket_form(&$node) {
 
   $form['group6'] = array(
     '#type' => 'markup',
-//    '#theme' => 'storm_form_group',
+    '#theme' => 'storm_form_group',
     '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group6') : -14,
   );