--- htmlarea.module.orig	2006-01-03 11:57:47.000000000 -0500
+++ htmlarea.module	2006-01-03 17:19:23.000000000 -0500
@@ -526,23 +526,117 @@ function htmlarea_settings_plugins_css()
   $header_css = array(array('data' => t('title')), array('data' => t("css")), array('data' => t('weight')), array('data' => t('delete'), 'align' => 'center'));
   usort($plugins, "_htmlarea_sort");
   foreach ($plugins as $k => $v) {
-    $rows[] = array(array('data' => form_textfield('', "htmlarea_plugins_css][$k][data", $v['data'], 30, 30)), array('data' => form_textfield('', "htmlarea_plugins_css][$k][context", $v['context'], 30, 30)), array('data' => form_weight('', "htmlarea_plugins_css][$k][weight", $v['weight'])), array('data' => form_checkbox('', "htmlarea_plugins_css][$k][delete", 1, 0), 'align' => 'center'));
-    $rows_css = array();
-    if ($v['css']) {
-      foreach ($v['css'] as $ck => $cv) {
-        $rows_css[] = array(array('data' => form_textfield('', "htmlarea_plugins_css][$k][css][$ck][data", $cv['data'], 30, 30)), array('data' => form_textfield('', "htmlarea_plugins_css][$k][css][$ck][value", $cv['value'], 30, 30)), array('data' => form_weight('', "htmlarea_plugins_css][$k][css][$ck][weight", $cv['weight'])), array('data' => form_checkbox('', "htmlarea_plugins_css][$k][css][$ck][delete", 1, 0), 'align' => 'center'));
-      }
-    }
-    $ck = count($v['css'])+1;
-    $rows_css[] = array(array('data' => form_textfield('', "htmlarea_plugins_css][$k][css][$ck][data", "", 30, 30)), array('data' => form_textfield('', "htmlarea_plugins_css][$k][css][$ck][value", '', 30, 30)), array('data' => form_weight('', "htmlarea_plugins_css][$k][css][$ck][weight", 0)), array('data' => '&nbsp'));
-    $output.= form_item($v['data'], theme("table", $header_css, $rows_css));
+	$form['htmlarea_plugins_css'][$k]['data'] = array('#type' => 'textfield', '#title' => '', '#default_value' => $v['data'], '#size' => 30, '#maxlength' => 30);
+	$form['htmlarea_plugins_css'][$k]['context'] = array('#type' => 'textfield', '#title' => '', '#default_value' => $v['context'], '#size' => 30, '#maxlength' => 30);
+	$form['htmlarea_plugins_css'][$k]['weight'] = array('#type' => 'weight', '#title' => '', '#default_value' => $v['weight']);
+	$form['htmlarea_plugins_css'][$k]['delete'] = array('#type' => 'checkbox', '#title' => '', '#return_value' => 1, '#default_value' => 0);
+	$rows_css = array();
+	if ($v['css']) {
+		foreach ($v['css'] as $ck => $cv) {
+			$form['htmlarea_plugins_css'][$k]['css'][$ck]['data'] = array(
+				'#type' => 'textfield',
+				'#title' => '',
+				'#default_value' => $cv['data'],
+				'#size' => 30,
+				'#maxlength' => 30
+			);
+			$form['htmlarea_plugins_css'][$k]['css'][$ck]['value'] = array(
+				'#type' => 'textfield',
+				'#title' => '',
+				'#default_value' => $cv['value'],
+				'#size' => 30,
+				'#maxlength' => 30
+			);
+			$form['htmlarea_plugins_css'][$k]['css'][$ck]['weight'] = array(
+				'#type' => 'weight',
+				'#title' => '',
+				'#default_value' => $cv['weight']
+			);
+			$form['htmlarea_plugins_css'][$k]['css'][$ck]['delete'] = array(
+				'#type' => 'checkbox',
+				'#title' => '',
+				'#return_value' => 1,
+				'#default_value' => 0
+			);
+		}
+		$form['htmlarea_plugins_css'][$k]['item_head'] = array('#type' => 'item', '#title' => $v['data'], '#default_value' => theme('table', $header_css, $rows_css));
+	}
+	$ck = count($v['css'])+1;
+	$form['htmlarea_plugins_css'][$k]['css'][$ck]['data'] = array(
+		'#type' => 'textfield',
+		'#title' => '',
+		'#default_value' => $cv['data'],
+		'#size' => 30,
+		'#maxlength' => 30
+	);
+	$form['htmlarea_plugins_css'][$k]['css'][$ck]['value'] = array(
+		'#type' => 'textfield',
+		'#title' => '',
+		'#default_value' => $cv['value'],
+		'#size' => 30,
+		'#maxlength' => 30
+	);
+	$form['htmlarea_plugins_css'][$k]['css'][$ck]['weight'] = array(
+		'#type' => 'weight',
+		'#title' => '',
+		'#default_value' => $cv['weight']
+	);
+	
   }
   $k = count($plugins)+1;
-  $rows[] = array(array('data' => form_textfield('', "htmlarea_plugins_css][$k][data", "", 30, 30)), array('data' => form_textfield('', "htmlarea_plugins_css][$k][context", "", 30, 30)), array('data' => form_weight('', "htmlarea_plugins_css][$k][weight")), array('data' => ' '));
-  $output = form_item('', theme("table", $header, $rows), t("list of
-  different drop boxes that will be added to the toolbar")) .$output;
-  
-  print theme("page", system_settings_form($output));
+  $form['htmlarea_plugins_css'][$k]['data'] = array('#type' => 'textfield', '#title' => '', '#default_value' => $v['data'], '#size' => 30, '#maxlength' => 30);
+  $form['htmlarea_plugins_css'][$k]['context'] = array('#type' => 'textfield', '#title' => '', '#default_value' => $v['context'], '#size' => 30, '#maxlength' => 30);
+  $form['htmlarea_plugins_css'][$k]['weight'] = array('#type' => 'weight', '#title' => '', '#default_value' => $v['weight']);
+  $form['htmlarea_plugins_css']['item_head'] = array('#type' => 'item',
+	'#title' => '',
+	'#default_value' => theme("table", $header, $rows),
+	'#description' => t("list of different drop boxes that will be added to the toolbar"));
+  print theme("page", system_settings_form('htmlarea_settings_plugins_css', $form));
+}
+
+function theme_htmlarea_settings_plugins_css($form) {
+	$plugins = variable_get("htmlarea_plugins_css", array());
+	
+	$output .= form_render($form['htmlarea_plugins_css']['item_head']);
+
+	$header = array(array('data' => t('dropbox')), array('data' => t('context')), array('data' => t('weight')), array('data' => t('delete'), 'align' => 'center'));
+	$header_css = array(array('data' => t('title')), array('data' => t("css")), array('data' => t('weight')), array('data' => t('delete'), 'align' => 'center'));
+	usort($plugins, "_htmlarea_sort");
+	foreach ($plugins as $k => $v) {
+		$rows[] = array(
+			array('data' => form_render($form['htmlarea_plugins_css'][$k]['data'])),
+			array('data' => form_render($form['htmlarea_plugins_css'][$k]['context'])),
+			array('data' => form_render($form['htmlarea_plugins_css'][$k]['weight'])),
+			array('data' => form_render($form['htmlarea_plugins_css'][$k]['delete']), 'align' => 'center'));
+		$rows_css = array();
+		$output .= form_render($form['htmlarea_plugins_css'][$k]['item_head']);
+		if ($v['css']) {
+			foreach ($v['css'] as $ck => $cv) {
+				$rows_css[] = array(
+					array('data' => form_render($form['htmlarea_plugins_css'][$k]['css'][$ck]['data'])),
+					array('data' => form_render($form['htmlarea_plugins_css'][$k]['css'][$ck]['value'])),
+					array('data' => form_render($form['htmlarea_plugins_css'][$k]['css'][$ck]['weight'])),
+					array('data' => form_render($form['htmlarea_plugins_css'][$k]['css'][$ck]['delete']), 'align' => 'center'));
+			}
+		}
+		$ck = count($v['css'])+1;
+		$rows_css[] = array(
+					array('data' => form_render($form['htmlarea_plugins_css'][$k]['css'][$ck]['data'])),
+					array('data' => form_render($form['htmlarea_plugins_css'][$k]['css'][$ck]['value'])),
+					array('data' => form_render($form['htmlarea_plugins_css'][$k]['css'][$ck]['weight'])),
+					array('data' => '&nbsp', 'align' => 'center'));
+		$output.= theme('table', $header_css, $rows_css);
+	}
+	$k = count($plugins)+1;
+	$rows[] = array(
+			array('data' => form_render($form['htmlarea_plugins_css'][$k]['data'])),
+			array('data' => form_render($form['htmlarea_plugins_css'][$k]['context'])),
+			array('data' => form_render($form['htmlarea_plugins_css'][$k]['weight'])),
+			array('data' => ' ', 'align' => 'center'));
+	$output .= theme('table', $header, $rows);
+	$output .= form_render($form['htmlarea_plugins_css']['item_head']);
+	$output .= form_render($form);
+	return $output;
 }
 
 function htmlarea_settings_plugins_help($plugin) {