diff --git a/theme/theme.inc b/theme/theme.inc
index 894e630..7dec86c 100644
--- a/theme/theme.inc
+++ b/theme/theme.inc
@@ -62,17 +62,31 @@ function template_preprocess_views_fluid_grid_plugin_style(&$vars) {
     }
   }
 
-  // Additional CSS classes for individual items. These classes are not styled by
-  // the Views plugin, but are available to style elsewhere.
+  $view = $vars['view'];
+  $rows = $vars['rows'];
+
+  $vars['classes_array'] = array();
   $vars['classes'] = array();
-  foreach (array_keys($vars['rows']) as $id) {
-    // Row classes as in unformatted plugin style.
-    $vars['classes'][$id] = 'views-row views-row-'. ($id + 1) .' views-row-'. ($id % 2 ? 'even' : 'odd');
-  }
-  if (isset($vars['classes'][0])) {
-    $vars['classes'][0] .= ' views-row-first';
-  }
-  if (isset($vars['classes'][$id])) {
-    $vars['classes'][$id] .= ' views-row-last';
+  // Set up striping values.
+  $count = 0;
+  $max = count($rows);
+  foreach ($rows as $id => $row) {
+    $count++;
+    $vars['classes'][$id][] = 'views-row';
+    $vars['classes'][$id][] = 'views-row-' . $count;
+    $vars['classes'][$id][] = 'views-row-' . ($count % 2 ? 'odd' : 'even');
+    if ($count == 1) {
+      $vars['classes'][$id][] = 'views-row-first';
+    }
+    if ($count == $max) {
+      $vars['classes'][$id][] = 'views-row-last';
+    }
+
+    if ($row_class = $view->style_plugin->get_row_class($id)) {
+      $vars['classes'][$id][] = $row_class;
+    }
+
+    // Flatten the classes to a string for each row for the template file.
+    $vars['classes_array'][$id] = implode(' ', $vars['classes'][$id]);
   }
 }
diff --git a/theme/views-fluid-grid-plugin-style.tpl.php b/theme/views-fluid-grid-plugin-style.tpl.php
index c8cf697..429a176 100644
--- a/theme/views-fluid-grid-plugin-style.tpl.php
+++ b/theme/views-fluid-grid-plugin-style.tpl.php
@@ -8,7 +8,7 @@
  * - $title: Title of the view. May be empty.
  * - $rows: Array of items.
  * - $list_class: The class for the items list.
- * - $classes: Array of classes for each item.
+ * - $classes_array: Array of classes for each item.
  *
  * @ingroup views_templates
  */
@@ -19,10 +19,10 @@
   <?php endif; ?>
   <ul class="<?php print $list_class; ?>">
     <?php foreach ($rows as $id => $item): ?>
-      <li class="views-fluid-grid-inline views-fluid-grid-item <?php print $classes[$id]; ?>"><?php print $item; ?></li>
+      <li class="views-fluid-grid-inline views-fluid-grid-item <?php print $classes_array[$id]; ?>"><?php print $item; ?></li>
     <?php endforeach; ?>
     <?php if (!empty($options['list_alignment']) && $options['list_alignment'] == 'justify') : ?>
       <li class="views-fluid-grid-inline views-fluid-grid-justify-last"></li>
     <?php endif; ?>
   </ul>
-</div>
\ No newline at end of file
+</div>
diff --git a/views_fluid_grid.info b/views_fluid_grid.info
index 2a89e7e..71207ea 100644
--- a/views_fluid_grid.info
+++ b/views_fluid_grid.info
@@ -2,4 +2,8 @@ name = Views Fluid Grid
 description = Exposes a views style plugin to render items on a fluid grid.
 dependencies[] = views
 package = Views
-core = 6.x
+core = 7.x
+files[] = views_fluid_grid.module
+files[] = theme/theme.inc
+files[] = views/views_fluid_grid.views.inc
+files[] = views/views_fluid_grid_plugin_style.inc
diff --git a/views_fluid_grid.module b/views_fluid_grid.module
index c8cf69f..33ea23e 100644
--- a/views_fluid_grid.module
+++ b/views_fluid_grid.module
@@ -10,7 +10,7 @@
  */
 function views_fluid_grid_views_api() {
   return array(
-    'api' => 2,
+    'api' => '3.0-alpha1',
     'path' => drupal_get_path('module', 'views_fluid_grid') .'/views',
   );
 }