diff --git a/www7/sites/all/modules/markup/markup.module b/www7/sites/all/modules/markup/markup.module
index 8ef750b..6063f0e 100644
--- a/www7/sites/all/modules/markup/markup.module
+++ b/www7/sites/all/modules/markup/markup.module
@@ -50,19 +50,21 @@ function markup_field_settings_form($field, $instance, $has_data) {
   $form = array();
   $settings = $field['settings'];
   $form['markup'] = array(
-    '#type' => 'textarea',
+    '#type' => 'text_format',
     '#title' => t('Markup'),
-    '#default_value' => isset($settings['markup']) ? $settings['markup'] : '',
-    '#required' => TRUE,
+    '#default_value' => isset($settings['markup']['value']) ? $settings['markup']['value'] : '',
+    '#format' => isset($settings['markup']['format']) ? $settings['markup']['format'] : '',
+  	'#required' => TRUE,
     '#rows' => 15,
     '#description' => t('The markup to be displayed. Any HTML is legal here, so be careful not to break your page layout.'),
   );
   $form['instructions'] = array(
     '#markup' => htmlentities(t('This is a special field. It will output the markup below, unfiltered by the system, on the node/edit form for this content type. Consider wrapping any visible output in <div class="form-item"></div> to follow form standards.')),
+
     '#weight' => -1,
   );
   return $form;
-} 
+}
 
 /**
  * Implementation of hook_field_widget_info().
@@ -86,7 +88,8 @@ function markup_field_widget_info() {
 function markup_field_widget_form(&$form, &$form_state, $field, $instance, $langcode, $items, $delta, $element) {
   $element += array(
     'markup' => array(
-      '#markup' => $field['settings']['markup'],
+      '#type' => 'markup',
+      '#markup' => check_markup($field['settings']['markup']['value'],$field['settings']['markup']['format'],FALSE),
     ),
   );
   return $element;
@@ -103,7 +106,7 @@ function markup_field_is_empty($item, $field) {
 function markup_form_alter(&$form, &$form_state, $form_id) {
   if ($form_id == 'field_ui_field_edit_form'){
     if ($form['#field']['module'] == 'markup'){
-      unset($form['field']['cardinality']);  
+      unset($form['field']['cardinality']);
     }
   }
 }