diff --git a/includes/prod_check.admin.inc b/includes/prod_check.admin.inc
index 607f2dd..46f47b9 100755
--- a/includes/prod_check.admin.inc
+++ b/includes/prod_check.admin.inc
@@ -25,7 +25,7 @@ function prod_check_status() {
     }
     $output .= '<h2>' . t($data['title']) . '</h2>' . "\n";
     $output .= '<div class="description"><p><em>' . t($data['description']) . '</em></p></div>' . "\n";
-    $output .= theme('status_report', $result);
+    $output .= theme('prod_check_status_report', $result);
   }

   return $output;
diff --git a/includes/prod_check.theme.inc b/includes/prod_check.theme.inc
new file mode 100644
index 0000000..815e461
--- /dev/null
+++ b/includes/prod_check.theme.inc
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Theme requirements status report.
+ *
+ * @param $requirements
+ *   An array of requirements.
+ * @ingroup themeable
+ */
+function theme_prod_check_status_report($requirements) {
+  $i = 0;
+  $output = '<table class="system-status-report">';
+  foreach ($requirements as $requirement) {
+    if (empty($requirement['#type'])) {
+      $class = ++$i % 2 == 0 ? 'even' : 'odd';
+
+      $classes = array(
+        PROD_CHECK_REQUIREMENT_INFO => 'info',
+        PROD_CHECK_REQUIREMENT_OK => 'ok',
+        PROD_CHECK_REQUIREMENT_WARNING => 'warning',
+        PROD_CHECK_REQUIREMENT_ERROR => 'error',
+      );
+      $class = $classes[isset($requirement['severity']) ? (int)$requirement['severity'] : 0] .' '. $class;
+
+      // Output table row(s)
+      if (!empty($requirement['description'])) {
+        $output .= '<tr class="'. $class .' merge-down"><th>'. $requirement['title'] .'</th><td>'. $requirement['value'] .'</td></tr>';
+        $output .= '<tr class="'. $class .' merge-up"><td colspan="2">'. $requirement['description'] .'</td></tr>';
+      }
+      else {
+        $output .= '<tr class="'. $class .'"><th>'. $requirement['title'] .'</th><td>'. $requirement['value'] .'</td></tr>';
+      }
+    }
+  }
+
+  $output .= '</table>';
+  return $output;
+}
diff --git a/prod_check.module b/prod_check.module
index a472a06..fe83350 100755
--- a/prod_check.module
+++ b/prod_check.module
@@ -7,10 +7,10 @@
  * install.inc file...
  * Let's see if this will pose problems...
  */
-define('REQUIREMENT_INFO', -1);
-define('REQUIREMENT_OK', 0);
-define('REQUIREMENT_WARNING', 1);
-define('REQUIREMENT_ERROR', 2);
+define('PROD_CHECK_REQUIREMENT_INFO', -1);
+define('PROD_CHECK_REQUIREMENT_OK', 0);
+define('PROD_CHECK_REQUIREMENT_WARNING', 1);
+define('PROD_CHECK_REQUIREMENT_ERROR', 2);

 /**
  * This one is for use with the XMLRPC API, so that you have proper links when
@@ -146,6 +146,19 @@ function prod_check_menu() {
 }

 /**
+ * Implementation of hook_theme()
+ */
+function prod_check_theme() {
+  return array(
+    'prod_check_status_report' => array(
+      'arguments' => array('requirements' => NULL),
+      'path' => drupal_get_path('module', 'prod_check') . '/includes',
+      'file' => 'prod_check.theme.inc',
+    ),
+  );
+}
+
+/**
  * Implementation of hook_flush_caches()
  */
 function prod_check_flush_caches() {
@@ -455,7 +468,7 @@ function prod_check_execute_check($checks, $caller, $compatibility = 'all') {
             $result[$key] = array(
               'title' => $checks[$key]['#title'],
               'value' => $checks[$key]['#value_ok'],
-              'severity' => REQUIREMENT_OK,
+              'severity' => PROD_CHECK_REQUIREMENT_OK,
               'description' => $checks[$key]['#description_ok'],
             );
             break;
@@ -623,7 +636,7 @@ function _prod_check_error_reporting($caller = 'internal') {
   $check['prod_check_error_reporting'] = array(
     '#title' => t($title),
     '#state' => variable_get('error_level', 1) != 1,
-    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_CRITICAL : REQUIREMENT_ERROR,
+    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_CRITICAL : PROD_CHECK_REQUIREMENT_ERROR,
     '#value_ok'  => $setting2,
     '#value_nok'  => $setting1,
     '#description_ok'  => prod_check_ok_title($title, $path),
@@ -658,7 +671,7 @@ function _prod_check_user_register($caller = 'internal') {
   $check['prod_check_user_register'] = array(
     '#title' => t($title),
     '#state' => $current != 1,
-    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_WARNING : REQUIREMENT_WARNING,
+    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_WARNING : PROD_CHECK_REQUIREMENT_WARNING,
     '#value_ok'  => $setting[$current],
     '#value_nok'  => $setting[1],
     '#description_ok'  => prod_check_ok_title($title, $path),
@@ -691,7 +704,7 @@ function _prod_check_site_mail($caller = 'internal') {
   $check['prod_check_site_mail'] = array(
     '#title' => t($title),
     '#state' => $site_mail != '' && !preg_match('/' . preg_quote(variable_get('prod_check_sitemail', '')) . '/i', $site_mail),
-    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_CRITICAL : REQUIREMENT_ERROR,
+    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_CRITICAL : PROD_CHECK_REQUIREMENT_ERROR,
     '#value_ok'  => t('Global site e-mail address OK: %mail', $arguments),
     '#value_nok'  => t('Global site e-mail address set to %mail', $arguments),
     '#description_ok'  => prod_check_ok_title($title, $path),
@@ -749,7 +762,7 @@ function _prod_check_apc($caller = 'internal') {
   $check['prod_check_apc'] = array(
     '#title' => t($title),
     '#state' => !$error,
-    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_CRITICAL : REQUIREMENT_ERROR,
+    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_CRITICAL : PROD_CHECK_REQUIREMENT_ERROR,
     '#value_ok'  => t('Enabled'),
     '#value_nok'  => t('Disabled'),
     '#description_ok'  => $desc_ok,
@@ -791,7 +804,7 @@ function _prod_check_release_notes($caller = 'internal') {
   $check['prod_check_release_notes'] = array(
     '#title' => t($title),
     '#state' => !$error,
-    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_WARNING : REQUIREMENT_WARNING,
+    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_WARNING : PROD_CHECK_REQUIREMENT_WARNING,
     '#value_ok'  => t('Release note .txt files have been removed.'),
     '#value_nok'  => t('Release note .txt files still present on your server!'),
     '#description_ok'  => t('Status is OK for production use.'),
@@ -831,7 +844,7 @@ function _prod_check_page_cache($caller = 'internal') {
   $check['prod_check_page_cache'] = array(
     '#title' => t($title),
     '#state' => !$error,
-    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_CRITICAL : REQUIREMENT_ERROR,
+    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_CRITICAL : PROD_CHECK_REQUIREMENT_ERROR,
     '#value_ok'  => t('Enabled'),
     '#value_nok'  => t('Disabled'),
     '#description_ok'  => prod_check_ok_title($title, $path),
@@ -876,7 +889,7 @@ function _prod_check_page_compression($caller = 'internal') {
   $check['prod_check_page_compression'] = array(
     '#title' => t($title),
     '#state' => $status,
-    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_CRITICAL : REQUIREMENT_ERROR,
+    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_CRITICAL : PROD_CHECK_REQUIREMENT_ERROR,
     '#value_ok'  => t('Enabled'),
     '#value_nok'  => t('Disabled'),
     '#description_ok'  => prod_check_ok_title($title, $path),
@@ -907,7 +920,7 @@ function _prod_check_boost($caller = 'internal') {
     $check['prod_check_boost_cache_lifetime'] = array(
       '#title' => t($title.$subtitle),
       '#state' => $var <= 3600,
-      '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_WARNING : REQUIREMENT_WARNING,
+      '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_WARNING : PROD_CHECK_REQUIREMENT_WARNING,
       '#value_ok'  => t('Set to !seconds seconds.', array('!seconds' => $var)),
       '#value_nok'  => t('Set too high?'),
       '#description_ok'  => prod_check_ok_title($subtitle, $path),
@@ -922,7 +935,7 @@ function _prod_check_boost($caller = 'internal') {
     $check['prod_check_boost_expire_cron'] = array(
       '#title' => t($title.$subtitle),
       '#state' => $var,
-      '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_WARNING : REQUIREMENT_WARNING,
+      '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_WARNING : PROD_CHECK_REQUIREMENT_WARNING,
       '#value_ok'  => t('Enabled'),
       '#value_nok'  => t('Disabled'),
       '#description_ok'  => prod_check_ok_title($subtitle, $path),
@@ -937,7 +950,7 @@ function _prod_check_boost($caller = 'internal') {
     $check['prod_check_boost_crawl_on_cron'] = array(
       '#title' => t($title.$subtitle),
       '#state' => $var,
-      '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_WARNING : REQUIREMENT_WARNING,
+      '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_WARNING : PROD_CHECK_REQUIREMENT_WARNING,
       '#value_ok'  => t('Enabled'),
       '#value_nok'  => t('Disabled'),
       '#description_ok'  => prod_check_ok_title($subtitle, $path),
@@ -952,7 +965,7 @@ function _prod_check_boost($caller = 'internal') {
     $check['prod_check_boost_apache_etag'] = array(
       '#title' => t($title.$subtitle),
       '#state' => $var >= 2,
-      '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_WARNING : REQUIREMENT_WARNING,
+      '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_WARNING : PROD_CHECK_REQUIREMENT_WARNING,
       '#value_ok'  => t('Enabled'),
       '#value_nok'  => t('Not properly configured.'),
       '#description_ok'  => prod_check_ok_title($subtitle, $path),
@@ -984,7 +997,7 @@ function _prod_check_block_cache($caller = 'internal') {
   $check['prod_check_block_cache'] = array(
     '#title' => t($title),
     '#state' => variable_get('block_cache', 0) != 0,
-    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_CRITICAL : REQUIREMENT_ERROR,
+    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_CRITICAL : PROD_CHECK_REQUIREMENT_ERROR,
     '#value_ok'  => t('Enabled'),
     '#value_nok'  => t('Disabled'),
     '#description_ok'  => prod_check_ok_title($title, $path),
@@ -1024,7 +1037,7 @@ function _prod_check_preprocess_css($caller = 'internal') {
   $check['prod_check_preprocess_css'] = array(
     '#title' => t($title),
     '#state' => $state,
-    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_CRITICAL : REQUIREMENT_ERROR,
+    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_CRITICAL : PROD_CHECK_REQUIREMENT_ERROR,
     '#value_ok'  => t('Enabled'),
     '#value_nok'  => t('Disabled'),
     '#description_ok'  => prod_check_ok_title($title, $path),
@@ -1064,7 +1077,7 @@ function _prod_check_preprocess_js($caller = 'internal') {
   $check['prod_check_preprocess_js'] = array(
     '#title' => t($title),
     '#state' => $state,
-    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_WARNING : REQUIREMENT_WARNING,
+    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_WARNING : PROD_CHECK_REQUIREMENT_WARNING,
     '#value_ok'  => t('Enabled'),
     '#value_nok'  => t('Disabled'),
     '#description_ok'  => prod_check_ok_title($title, $path),
@@ -1113,7 +1126,7 @@ function _prod_check_node_available($caller = 'internal') {
   $check['prod_check_node_available'] = array(
     '#title' => t($title),
     '#state' => $secure,
-    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_WARNING : REQUIREMENT_WARNING,
+    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_WARNING : PROD_CHECK_REQUIREMENT_WARNING,
     '#value_ok'  => t('Secure'),
     '#value_nok'  => t('Security risk!'),
     '#description_ok'  => t('No security risk found.'),
@@ -1150,7 +1163,7 @@ function _prod_check_user_pass($caller = 'internal') {
   $check['prod_check_user_pass'] = array(
     '#title' => t($title),
     '#state' => $secure,
-    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_CRITICAL : REQUIREMENT_ERROR,
+    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_CRITICAL : PROD_CHECK_REQUIREMENT_ERROR,
     '#value_ok'  => t('Secure'),
     '#value_nok'  => t('Security risk!'),
     '#description_ok'  => t('No security risk found.'),
@@ -1180,7 +1193,7 @@ function _prod_check_anonymous_rights($caller = 'internal') {
   $check['prod_check_anonymous_rights'] = array(
     '#title' => t($title),
     '#state' => $secure,
-    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_CRITICAL : REQUIREMENT_ERROR,
+    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_CRITICAL : PROD_CHECK_REQUIREMENT_ERROR,
     '#value_ok'  => t('Secure'),
     '#value_nok'  => t('Security risk!'),
     '#description_ok'  => t('No security risk found.'),
@@ -1227,7 +1240,7 @@ function _prod_check_contact($caller = 'internal') {
   $check['prod_check_contact'] = array(
     '#title' => t($title),
     '#state' => !$error,
-    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_CRITICAL : REQUIREMENT_ERROR,
+    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_CRITICAL : PROD_CHECK_REQUIREMENT_ERROR,
     '#value_ok'  => t('!contact e-mail addresses are OK.', $arguments),
     '#value_nok'  => t('!contact e-mail addresses are %categories', $arguments),
     '#description_ok'  => prod_check_ok_title($title, $path),
@@ -1277,7 +1290,7 @@ function _prod_check_devel($caller = 'internal') {
     $checks['prod_check_'.$data['name']] = array(
       '#title' => t($title),
       '#state' => !$data['error'],
-      '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_CRITICAL : REQUIREMENT_ERROR,
+      '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_CRITICAL : PROD_CHECK_REQUIREMENT_ERROR,
       '#value_ok'  => t('Disabled'),
       '#value_nok'  => t('Enabled'),
       '#description_ok'  => t('Your settings are OK for production use.'),
@@ -1307,7 +1320,7 @@ function _prod_check_search_config($caller = 'internal') {

   if (!module_exists('search_config')) {
     $error = TRUE;
-    $severity = ($caller == 'nagios') ? NAGIOS_STATUS_WARNING : REQUIREMENT_WARNING;
+    $severity = ($caller == 'nagios') ? NAGIOS_STATUS_WARNING : PROD_CHECK_REQUIREMENT_WARNING;
     $value_nok = t('Disabled');
     $msg_nok = t('You have not enabled the !link module. Please double check if you need this module or not, to be able to hide certain content types from being searched by users.', prod_check_link_array($title, 'http://drupal.org/project/search_config'));
   }
@@ -1321,7 +1334,7 @@ function _prod_check_search_config($caller = 'internal') {
       }
     }
     if ($error) {
-      $severity = ($caller == 'nagios') ? NAGIOS_STATUS_CRITICAL : REQUIREMENT_ERROR;
+      $severity = ($caller == 'nagios') ? NAGIOS_STATUS_CRITICAL : PROD_CHECK_REQUIREMENT_ERROR;
       $value_nok = t('Not properly configured.');
       $msg_nok = t('You have enabled the !link module, but no content types are excluded from being searched!', prod_check_link_array($title, $path));
     }
@@ -1355,7 +1368,7 @@ function _prod_check_update_status($caller = 'internal') {
   $check['prod_check_update_status'] = array(
     '#title' => t($title),
     '#state' => !module_exists('update'),
-    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_WARNING : REQUIREMENT_WARNING,
+    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_WARNING : PROD_CHECK_REQUIREMENT_WARNING,
     '#value_ok'  => t('Disabled'),
     '#value_nok'  => t('Enabled'),
     '#description_ok'  => t('Your settings are OK for production use.'),
@@ -1386,7 +1399,7 @@ function _prod_check_webform($caller = 'internal') {
   $check['prod_check_webform'] = array(
     '#title' => t($title),
     '#state' => $webform_mail != '' && !preg_match('/' . preg_quote(variable_get('prod_check_sitemail', '')) . '/i', $webform_mail),
-    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_CRITICAL : REQUIREMENT_ERROR,
+    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_CRITICAL : PROD_CHECK_REQUIREMENT_ERROR,
     '#value_ok'  => t('!webform default from e-mail address OK: %mail', $arguments),
     '#value_nok'  => t('!webform default from e-mail address set to %mail', $arguments),
     '#description_ok'  => prod_check_ok_title($title, $path),
@@ -1420,13 +1433,13 @@ function _prod_check_googleanalytics($caller = 'internal') {

   if (!module_exists('googleanalytics')) {
     $error = TRUE;
-    $severity = ($caller == 'nagios') ? NAGIOS_STATUS_WARNING : REQUIREMENT_WARNING;
+    $severity = ($caller == 'nagios') ? NAGIOS_STATUS_WARNING : PROD_CHECK_REQUIREMENT_WARNING;
     $value_nok = t('Disabled');
     $msg_nok = t('You have not enabled the !link module. If you wish to track and optimise your site !link is absolutely necessary.', prod_check_link_array($title, 'http://drupal.org/project/google_analytics'));
   }
   else if (empty($ga_account) || $ga_account == 'UA-') {
     $error = TRUE;
-    $severity = ($caller == 'nagios') ? NAGIOS_STATUS_CRITICAL : REQUIREMENT_ERROR;
+    $severity = ($caller == 'nagios') ? NAGIOS_STATUS_CRITICAL : PROD_CHECK_REQUIREMENT_ERROR;
     $value_nok = t('Not properly configured.');
     $msg_nok = t('You did not !link! Tracking will not be functional!', prod_check_link_array('enter a Google Analytics account', $path));
   }
@@ -1461,7 +1474,7 @@ function _prod_check_nodewords($caller = 'internal') {
   $check['prod_check_nodewords'] = array(
     '#title' => t($title),
     '#state' => module_exists('nodewords'),
-    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_WARNING : REQUIREMENT_WARNING,
+    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_WARNING : PROD_CHECK_REQUIREMENT_WARNING,
     '#value_ok'  => t('Enabled'),
     '#value_nok'  => t('Disabled'),
     '#description_ok'  => prod_check_ok_title($title_ok, $path, $text_ok),
@@ -1500,7 +1513,7 @@ function _prod_check_page_title($caller = 'internal') {
   $check['prod_check_page_title'] = array(
     '#title' => t($title),
     '#state' => !$error,
-    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_WARNING : REQUIREMENT_WARNING,
+    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_WARNING : PROD_CHECK_REQUIREMENT_WARNING,
     '#value_ok'  => t('Enabled'),
     '#value_nok'  => $value_nok,
     '#description_ok'  => prod_check_ok_title($title_ok, $path, $text_ok),
@@ -1527,7 +1540,7 @@ function _prod_check_pathauto($caller = 'internal') {
   $check['prod_check_pathauto'] = array(
     '#title' => t($title),
     '#state' => module_exists('pathauto'),
-    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_WARNING : REQUIREMENT_WARNING,
+    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_WARNING : PROD_CHECK_REQUIREMENT_WARNING,
     '#value_ok'  => t('Enabled'),
     '#value_nok'  => t('Disabled'),
     '#description_ok'  => prod_check_ok_title($title_ok, $path, $text_ok),
@@ -1554,7 +1567,7 @@ function _prod_check_path_redirect($caller = 'internal') {
   $check['prod_check_path_redirect'] = array(
     '#title' => t($title),
     '#state' => module_exists('path_redirect'),
-    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_WARNING : REQUIREMENT_WARNING,
+    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_WARNING : PROD_CHECK_REQUIREMENT_WARNING,
     '#value_ok'  => t('Enabled'),
     '#value_nok'  => t('Disabled'),
     '#description_ok'  => prod_check_ok_title($title_ok, $path, $text_ok),
@@ -1581,7 +1594,7 @@ function _prod_check_xmlsitemap($caller = 'internal') {
   $check['prod_check_xmlsitemap'] = array(
     '#title' => t($title),
     '#state' => module_exists('xmlsitemap'),
-    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_WARNING : REQUIREMENT_WARNING,
+    '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_WARNING : PROD_CHECK_REQUIREMENT_WARNING,
     '#value_ok'  => t('Enabled'),
     '#value_nok'  => t('Disabled'),
     '#description_ok'  => prod_check_ok_title($title_ok, $path, $text_ok),