diff --git a/sites/all/modules/fullcalendar/fullcalendar.module b/sites/all/modules/fullcalendar/fullcalendar.module
index b07a3ea..cd12a5a 100644
--- a/sites/all/modules/fullcalendar/fullcalendar.module
+++ b/sites/all/modules/fullcalendar/fullcalendar.module
@@ -188,13 +188,12 @@ function theme_fullcalendar_classname($variables) {
  * Passes options to the FullCalendar plugin as JavaScript settings.
  */
 function template_preprocess_views_view_fullcalendar(&$vars) {
- 
   $settings = array(
     'defaultView' => $vars['options']['display']['fc_view'],
     'firstDay' => $vars['options']['display']['fc_firstday'],
     'weekMode' => $vars['options']['display']['fc_weekmode'],
-    'theme' => $vars['options']['visual']['fc_theme'],
-    'colorbox' => $vars['options']['visual']['fc_url_colorbox'],
+    'theme' => $vars['options']['modules']['fc_theme'],
+    'colorbox' => $vars['options']['modules']['fc_url_colorbox'],
     'left' => $vars['options']['header']['fc_left'],
     'center' => $vars['options']['header']['fc_center'],
     'right' => $vars['options']['header']['fc_right'],
diff --git a/sites/all/modules/fullcalendar/views_plugin_node_fullcalendar.inc b/sites/all/modules/fullcalendar/views_plugin_node_fullcalendar.inc
index 6117d01..ee34a4d 100644
--- a/sites/all/modules/fullcalendar/views_plugin_node_fullcalendar.inc
+++ b/sites/all/modules/fullcalendar/views_plugin_node_fullcalendar.inc
@@ -18,10 +18,10 @@ class views_plugin_node_fullcalendar extends views_plugin_row {
 
   function option_definition() {
     $options = parent::option_definition();
-    $options['fullcalendar_custom_title'] = array('default' => 'FALSE');
-    $options['fullcalendar_title_field'] = array('default' => '');
-    $options['fullcalendar_custom_url'] = array('default' => 'FALSE');
     $options['fullcalendar_url_field'] = array('default' => '');
+    $options['fullcalendar_title_field'] = array('default' => '');
+    $options['fullcalendar_custom_url'] = array('default' => FALSE);
+    $options['fullcalendar_custom_title'] = array('default' => FALSE);
     return $options;
   }
 
diff --git a/sites/all/modules/fullcalendar/views_plugin_style_fullcalendar.inc b/sites/all/modules/fullcalendar/views_plugin_style_fullcalendar.inc
index 71aa1f1..1c235b6 100644
--- a/sites/all/modules/fullcalendar/views_plugin_style_fullcalendar.inc
+++ b/sites/all/modules/fullcalendar/views_plugin_style_fullcalendar.inc
@@ -16,6 +16,12 @@ class views_plugin_style_fullcalendar extends views_plugin_style {
         'fc_weekmode' => array('default' => 'fixed'),
       ),
     );
+    $options['modules'] = array(
+      'contains' => array(
+        'fc_theme' => array('default' => FALSE),
+        'fc_url_colorbox' => array('default' => FALSE),
+      ),
+    );
     $options['header'] = array(
       'contains' => array(
         'fc_left' => array('default' => 'today prev,next'),
@@ -28,13 +34,11 @@ class views_plugin_style_fullcalendar extends views_plugin_style {
         'fc_timeformat' => array('default' => 'h:mm{ - h:mm}'),
         'fc_clock' => array('default' => FALSE),
         'fc_default_date' => array('default' => FALSE),
-        'fc_date' => array('default' => array('year' => 2011, 'month' => 1, 'day' => 1)),
-      ),
-    );
-    $options['visual'] = array(
-      'contains' => array(
-        'fc_theme' => array('default' => FALSE),
-        'fc_url_colorbox' => array('default' => FALSE),
+        'fc_date' => array('default' => array(
+          'year' => '',
+          'month' => '',
+          'day' => '',
+        )),
       ),
     );
     return $options;
@@ -58,7 +62,7 @@ class views_plugin_style_fullcalendar extends views_plugin_style {
         'agendaDay' => 'Day (Agenda)',
         'basicDay' => 'Day (Basic)',
       ),
-      '#description' => l(t('[More info]'), 'http://arshaw.com/fullcalendar/docs/views/Available_Views', array('attributes' => array('target' => '_blank'))),
+      '#description' => l(t('More info'), 'http://arshaw.com/fullcalendar/docs/views/Available_Views', array('attributes' => array('target' => '_blank'))),
       '#default_value' => $this->options['display']['fc_view'],
       '#prefix' => '<div class="views-left-30">',
       '#suffix' => '</div>',
@@ -83,14 +87,14 @@ class views_plugin_style_fullcalendar extends views_plugin_style {
         'variable' => 'Variable',
       ),
       '#default_value' => $this->options['display']['fc_weekmode'],
-      '#description' => l(t('[more info]'), 'http://arshaw.com/fullcalendar/docs/display/weekMode', array('attributes' => array('target' => '_blank'))),
+      '#description' => l(t('More info'), 'http://arshaw.com/fullcalendar/docs/display/weekMode', array('attributes' => array('target' => '_blank'))),
       '#prefix' => '<div class="views-left-30">',
       '#suffix' => '</div>',
     );
     $form['header'] = array(
       '#type' => 'fieldset',
       '#title' => t('Header settings'),
-      '#description' => l(t('[more info]'), 'http://arshaw.com/fullcalendar/docs/display/header', array('attributes' => array('target' => '_blank'))),
+      '#description' => l(t('More info'), 'http://arshaw.com/fullcalendar/docs/display/header', array('attributes' => array('target' => '_blank'))),
       '#attributes' => array(
         'class' => 'clear-block',
       ),
@@ -129,7 +133,7 @@ class views_plugin_style_fullcalendar extends views_plugin_style {
     $form['times']['fc_timeformat'] = array(
       '#type' => 'textfield',
       '#title' => t('Time format'),
-      '#description' => l(t('[more info]'), 'http://arshaw.com/fullcalendar/docs/utilities/formatDate', array('attributes' => array('target' => '_blank'))),
+      '#description' => l(t('More info'), 'http://arshaw.com/fullcalendar/docs/utilities/formatDate', array('attributes' => array('target' => '_blank'))),
       '#default_value' => $this->options['times']['fc_timeformat'],
     );
     $form['times']['fc_clock'] = array(
@@ -152,23 +156,23 @@ class views_plugin_style_fullcalendar extends views_plugin_style {
       '#process' => array('form_process_date', 'ctools_dependent_process'),
       '#dependency' => array('edit-style-options-times-fc-default-date' => array(1)),
     );
-    $form['visual'] = array(
+    $form['modules'] = array(
       '#type' => 'fieldset',
       '#title' => t('Visual settings'),
       '#attributes' => array(
         'class' => 'clear-block',
       ),
     );
-    $form['visual']['fc_theme'] = array(
+    $form['modules']['fc_theme'] = array(
       '#type' => 'checkbox',
       '#title' => t('Use jQuery UI Theme'),
-      '#default_value' => $this->options['visual']['fc_theme'],
+      '#default_value' => $this->options['modules']['fc_theme'],
     );
     if(module_exists('colorbox')) {
-      $form['visual']['fc_url_colorbox'] = array(
+      $form['modules']['fc_url_colorbox'] = array(
         '#type' => 'checkbox',
         '#title' => t('Open events in colorbox'),
-        '#default_value' => $this->options['visual']['fc_url_colorbox'],
+        '#default_value' => $this->options['modules']['fc_url_colorbox'],
       );
     }
   }