Index: fusion/fusion_core/template.php
===================================================================
--- fusion/fusion_core/template.php	(revision 6979)
+++ fusion/fusion_core/template.php	(working copy)
@@ -35,9 +35,9 @@
     $vars['sidebar_last'] = '';
   }
   // Set grid info & row widths
-  $grid_name = substr(theme_get_setting('theme_grid'), 0, 7);
-  $grid_type = substr(theme_get_setting('theme_grid'), 7);
-  $grid_width = (int)substr($grid_name, 4, 2);
+  list($grid_name, $grid_type) = explode('-', theme_get_setting('theme_grid'));
+  $grid_width = (int)substr($grid_name, 4);
+  $grid_name .= '-';
   $vars['grid_width'] = $grid_name . $grid_width;
   $sidebar_first_width = ($vars['sidebar_first']) ? theme_get_setting('sidebar_first_width') : 0;
   $sidebar_last_width = ($vars['sidebar_last']) ? theme_get_setting('sidebar_last_width') : 0;
@@ -242,9 +242,10 @@
 
   // Initialize block region grid info once per page
   if (!isset($regions)) {
-    $grid_name = substr(theme_get_setting('theme_grid'), 0, 7);
-    $grid_width = (int)substr($grid_name, 4, 2);
-    $grid_fixed = (substr(theme_get_setting('theme_grid'), 7) != 'fluid') ? 1 : 0;
+    list($grid_name, $grid_type) = explode('-', theme_get_setting('theme_grid'));
+    $grid_width = (int)substr($grid_name, 4);
+    $grid_name .= '-';
+    $grid_fixed = ($grid_type != 'fluid') ? 1 : 0;
     $sidebar_first_width = (block_list('sidebar_first')) ? theme_get_setting('sidebar_first_width') : 0;
     $sidebar_last_width = (block_list('sidebar_last')) ? theme_get_setting('sidebar_last_width') : 0;
     $regions = fusion_core_set_regions($grid_width, $sidebar_first_width, $sidebar_last_width);
Index: fusion/fusion_core/theme-settings.php
===================================================================
--- fusion/fusion_core/theme-settings.php	(revision 6979)
+++ fusion/fusion_core/theme-settings.php	(working copy)
@@ -128,8 +128,11 @@
   $grid_options = array();
   if (isset($info_theme_settings['theme_grid_options'])) {
     foreach ($info_theme_settings['theme_grid_options'] as $grid_option) {
-      $grid_type = (substr($grid_option, 7) == 'fluid') ? t('fluid grid') : t('fixed grid') . ' [' . substr($grid_option, 7) . 'px]';
-      $grid_options[$grid_option] = (int)substr($grid_option, 4, 2) . t(' column ') . $grid_type;
+      list($grid_name, $grid_type) = explode('-', $grid_option);
+      $grid_width = (int) substr($grid_name, 4);
+
+      $grid_type = ($grid_type == 'fluid') ? t('fluid grid') : t('fixed grid') . ' [' . $grid_type . 'px]';
+      $grid_options[$grid_option] = $grid_width . t(' column ') . $grid_type;
     }
   }
   $form['tnt_container']['general_settings']['theme_grid_config']['theme_grid'] = array(
@@ -165,8 +168,8 @@
   );
   $form['tnt_container']['general_settings']['theme_grid_config']['sidebar_layout']['#options'][$defaults['sidebar_layout']] .= t(' - Theme Default');
   // Calculate sidebar width options
-  $grid_width = (int)substr($settings['theme_grid'], 4, 2);
-  $grid_type = substr($settings['theme_grid'], 7);
+  list($grid_name, $grid_type) = explode('-', $settings['theme_grid']);
+  $grid_width = (int) substr($grid_name, 4);
   $width_options = array();
   for ($i = 1; $i <= floor($grid_width / 2); $i++) {
     $grid_units = $i . (($i == 1) ? t(' grid unit: ') : t(' grid units: '));
@@ -274,7 +277,7 @@
     '#title' => t('Display breadcrumb'),
     '#default_value' => $settings['breadcrumb_display'],
   );
-  
+
   // Search Settings
   if (module_exists('search')) {
     $form['tnt_container']['general_settings']['search_container'] = array(