Index: typo3/sysext/scheduler/res/tx_scheduler_be.css
===================================================================
--- typo3/sysext/scheduler/res/tx_scheduler_be.css	(revision 8160)
+++ typo3/sysext/scheduler/res/tx_scheduler_be.css	(working copy)
@@ -13,27 +13,12 @@
 	text-decoration: none;
 }
 
-.tx_scheduler_mod1 .tx_scheduler_task_list {
-	width: 100%;
-}
-
-.tx_scheduler_mod1 td {
-	vertical-align: top;
-}
-.tx_scheduler_mod1 td.cell {
-	padding: 2px 4px;
-}
 .tx_scheduler_mod1 td.right {
 	text-align: right;
 }
 .tx_scheduler_mod1 tr.disabled td {
 	color: #666;
 }
-.tx_scheduler_mod1 .bgColor2 td {
-	text-align: left;
-	font-weight: bold;
-	color: #fff;
-}
 .tx_scheduler_mod1 .late {
 	color: #f00;
 	font-weight: bold;
@@ -42,14 +27,19 @@
 	display: block;
 	width: 200px;
 }
-.tx_scheduler_mod1 input{}
+.tx_scheduler_mod1 table.typo3-usersettings td {
+	padding: 2px;
+}
+.tx_scheduler_mod1 table.typo3-usersettings td.td-input {
+	width: 400px;
+}
 .tx_scheduler_mod1 select {
 	margin-bottom: 1.2em;
 	width: 200px;
 }
 .tx_scheduler_mod1 input.wide,
 .tx_scheduler_mod1 select.wide {
-	width: 400px;
+	width: 350px;
 }
 .tx_scheduler_mod1 input.checkboxes {
 	width: auto;
@@ -67,11 +57,6 @@
 	font-weight: bold;
 }
 
-.tx_scheduler_mod1 th input,
-.tx_scheduler_mod1 td input {
-	margin-bottom: 2px;
-}
-
 /* Definition for BE function "Setup check" */
 .info-block {
 	margin: 25px 0px 0px 0px;
Index: typo3/sysext/scheduler/mod1/index.php
===================================================================
--- typo3/sysext/scheduler/mod1/index.php	(revision 8160)
+++ typo3/sysext/scheduler/mod1/index.php	(working copy)
@@ -471,14 +471,14 @@
 		} else {
 				// Initialise table layout
 			$tableLayout = array (
-				'table' => array ('<table border="0" cellspacing="1" cellpadding="2" style="width:auto;">', '</table>'),
+				'table' => array ('<table border="0" cellspacing="1" cellpadding="2" class="typo3-dblist">', '</table>'),
 				'0' => array (
-					'tr' => array('<tr class="bgColor2" valign="top">', '</tr>'),
-					'defCol' => array('<td class="cell">', '</td>')
+					'tr' => array('<tr class="t3-row-header" valign="top">', '</tr>'),
+					'defCol' => array('<td>', '</td>')
 				),
 				'defRow' => array (
-					'tr' => array('<tr class="bgColor3-20">', '</tr>'),
-					'defCol' => array('<td class="cell">', '</td>')
+					'tr' => array('<tr class="db_list_normal">', '</tr>'),
+					'defCol' => array('<td>', '</td>')
 				)
 			);
 			$table = array();
@@ -727,7 +727,7 @@
 
 			// Define table layout for add/edit form
 		$tableLayout = array (
-			'table' => array ('<table border="0" cellspacing="1" cellpadding="0" id="edit_form">', '</table>'),
+			'table' => array ('<table border="0" cellspacing="0" cellpadding="0" id="edit_form" class="typo3-usersettings">', '</table>'),
 		);
 
 			// Define a style for hiding
@@ -744,23 +744,26 @@
 
 		$table = array();
 		$tr = 0;
-		$defaultCell = array('<td class="bgColor5 cell">', '</td>');
+		$defaultCell = array('<td class="td-input">', '</td>');
 
 			// Disable checkbox
-		$table[$tr][] = t3lib_BEfunc::cshItem($this->cshKey, 'task_disable', $this->backPath, '|', false, 'margin-bottom:0px;');
-		$table[$tr][] = '<label for="task_disable">' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:disable') . '</label>';
+		$cellContent  = t3lib_BEfunc::cshItem($this->cshKey, 'task_disable', $this->backPath, '|', false, 'margin-bottom:0px;');
+		$cellContent .= '<label for="task_disable">' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:disable') . '</label>';
+		$table[$tr][] = $cellContent;
 		$table[$tr][] =
 			'<input type="hidden"   name="tx_scheduler[disable]" value="0" />
 			 <input type="checkbox" name="tx_scheduler[disable]" value="1" id="task_disable"' . ($taskInfo['disable'] == 1 ? ' checked="checked"' : '') . ' />';
 		$tableLayout[$tr] = array (
 			'tr'     => array('<tr id="task_disable_row">', '</tr>'),
-			'defCol' => $defaultCell
+			'defCol' => $defaultCell,
+			'0'      => array('<td class="td-label">', '</td>')
 		);
 		$tr++;
 
 			// Task class selector
-		$table[$tr][] = t3lib_BEfunc::cshItem($this->cshKey, 'task_class', $this->backPath, '|', false, 'margin-bottom:0px;');
-		$table[$tr][] = '<label for="task_class">'.$GLOBALS['LANG']->getLL('label.class').'</label>';
+		$cellContent  = t3lib_BEfunc::cshItem($this->cshKey, 'task_class', $this->backPath, '|', false, 'margin-bottom:0px;');
+		$cellContent .= '<label for="task_class">'.$GLOBALS['LANG']->getLL('label.class').'</label>';
+		$table[$tr][] = $cellContent;
 			// On editing, don't allow changing of the task class, unless it was not valid
 		if ($this->submittedData['uid'] > 0 && !empty($taskInfo['class'])) {
 			$cell = $registeredClasses[$taskInfo['class']]['title'] . ' (' . $registeredClasses[$taskInfo['class']]['extension'] . ')';
@@ -778,13 +781,15 @@
 			// Make sure each row has a unique id, for manipulation with JS
 		$tableLayout[$tr] = array (
 			'tr'     => array('<tr id="task_class_row">', '</tr>'),
-			'defCol' => $defaultCell
+			'defCol' => $defaultCell,
+			'0'      => array('<td class="td-label">', '</td>')
 		);
 		$tr++;
 
 			// Task type selector
-		$table[$tr][] = t3lib_BEfunc::cshItem($this->cshKey, 'task_type', $this->backPath, '|', false, 'margin-bottom:0px;');
-		$table[$tr][] = '<label for="task_type">' . $GLOBALS['LANG']->getLL('label.type') . '</label>';
+		$cellContent  = t3lib_BEfunc::cshItem($this->cshKey, 'task_type', $this->backPath, '|', false, 'margin-bottom:0px;');
+		$cellContent .= '<label for="task_type">' . $GLOBALS['LANG']->getLL('label.type') . '</label>';
+		$table[$tr][] = $cellContent;
 		$table[$tr][] =
 			'<select name="tx_scheduler[type]" id="task_type" onchange="actOnChangedTaskType(this)">' .
 				'<option value="1"' . ($taskInfo['type'] == 1 ? ' selected="selected"' : '') . '>' . $GLOBALS['LANG']->getLL('label.type.single') . '</option>' .
@@ -792,66 +797,75 @@
 			'</select>';
 		$tableLayout[$tr] = array (
 			'tr'     => array('<tr id="task_type_row">', '</tr>'),
-			'defCol' => $defaultCell
+			'defCol' => $defaultCell,
+			'0'      => array('<td class="td-label">', '</td>'),
 		);
 		$tr++;
 
 			// Start date/time field
 			// NOTE: datetime fields need a special id naming scheme
-		$table[$tr][] = t3lib_BEfunc::cshItem($this->cshKey, 'task_start', $this->backPath, '|', false, 'margin-bottom:0px;');
-		$table[$tr][] = '<label for="tceforms-datetimefield-task_start">' . $GLOBALS['LANG']->getLL('label.start') . '</label>';
+		$cellContent  = t3lib_BEfunc::cshItem($this->cshKey, 'task_start', $this->backPath, '|', false, 'margin-bottom:0px;');
+		$cellContent .= '<label for="tceforms-datetimefield-task_start">' . $GLOBALS['LANG']->getLL('label.start') . '</label>';
+		$table[$tr][] = $cellContent;
 		$table[$tr][] = '<input name="tx_scheduler[start]" type="text" id="tceforms-datetimefield-task_start" value="' . strftime('%H:%M %d-%m-%Y', $taskInfo['start']) . '" />' .
 			t3lib_iconWorks::getSpriteIcon(
 				'actions-edit-pick-date',
 				array(
 					'style' => 'cursor:pointer;',
 					'id' => 'picker-tceforms-datetimefield-task_start'
-				));
-
+				)
+			);
 		$tableLayout[$tr] = array (
-				'tr' => array('<tr id="task_start_row">', '</tr>'),
-				'defCol' => $defaultCell
-			);
+			'tr' => array('<tr id="task_start_row">', '</tr>'),
+			'defCol' => $defaultCell,
+			'0'      => array('<td class="td-label">', '</td>')
+		);
 		$tr++;
 
 			// End date/time field
 			// NOTE: datetime fields need a special id naming scheme
-		$table[$tr][] = t3lib_BEfunc::cshItem($this->cshKey, 'task_end', $this->backPath, '|', false, 'margin-bottom:0px;');
-		$table[$tr][] = '<label for="tceforms-datetimefield-task_end">' . $GLOBALS['LANG']->getLL('label.end') . '</label>';
+		$cellContent  = t3lib_BEfunc::cshItem($this->cshKey, 'task_end', $this->backPath, '|', false, 'margin-bottom:0px;');
+		$cellContent .= '<label for="tceforms-datetimefield-task_end">' . $GLOBALS['LANG']->getLL('label.end') . '</label>';
+		$table[$tr][] = $cellContent;
 		$table[$tr][] = '<input name="tx_scheduler[end]" type="text" id="tceforms-datetimefield-task_end" value="' . ((empty($taskInfo['end'])) ? '' : strftime('%H:%M %d-%m-%Y', $taskInfo['end'])) . '" />' .
 			t3lib_iconWorks::getSpriteIcon(
 				'actions-edit-pick-date',
 				array(
 					'style' => 'cursor:pointer;',
 					'id' => 'picker-tceforms-datetimefield-task_end'
-				));
-
+				)
+			);
 		$tableLayout[$tr] = array (
 			'tr'     => array('<tr id="task_end_row"' . $style . '>', '</tr>'),
-			'defCol' => $defaultCell
+			'defCol' => $defaultCell,
+			'0'      => array('<td class="td-label">', '</td>'),
 		);
 		$tr++;
 
 			// Frequency input field
-		$table[$tr][] = t3lib_BEfunc::cshItem($this->cshKey, 'task_frequency', $this->backPath, '|', false, 'margin-bottom:0px;');
-		$table[$tr][] = '<label for="task_frequency">' . $GLOBALS['LANG']->getLL('label.frequency.long') . '</label>';
+		$cellContent  = t3lib_BEfunc::cshItem($this->cshKey, 'task_frequency', $this->backPath, '|', false, 'margin-bottom:0px;');
+		$cellContent .= '<label for="task_frequency">' . $GLOBALS['LANG']->getLL('label.frequency.long') . '</label>';
+		$table[$tr][] = $cellContent;
 		$cell = '<input type="text" name="tx_scheduler[frequency]" id="task_frequency" value="' . $taskInfo['frequency'] . '" />';
 		$table[$tr][] = $cell;
 		$tableLayout[$tr] = array (
 			'tr'     => array('<tr id="task_frequency_row"' . $style . '>', '</tr>'),
-			'defCol' => $defaultCell
+			'defCol' => $defaultCell,
+			'0'      => array('<td class="td-label">', '</td>'),
 		);
 		$tr++;
 
 			// Multiple execution selector
-		$table[$tr][] = t3lib_BEfunc::cshItem($this->cshKey, 'task_multiple', $this->backPath, '|', false, 'margin-bottom:0px;');
-		$table[$tr][] = '<label for="task_multiple">' . $GLOBALS['LANG']->getLL('label.parallel.long') . '</label>';
+		$cellContent  = t3lib_BEfunc::cshItem($this->cshKey, 'task_multiple', $this->backPath, '|', false, 'margin-bottom:0px;');
+		$cellContent .= '<label for="task_multiple">' . $GLOBALS['LANG']->getLL('label.parallel.long') . '</label>';
+		$table[$tr][] = $cellContent;
 		$table[$tr][] =
 			'<input type="hidden"   name="tx_scheduler[multiple]" value="0" />
 			 <input type="checkbox" name="tx_scheduler[multiple]" value="1" id="task_multiple"' . ($taskInfo['multiple'] == 1 ? ' checked="checked"' : '') . ' />';
 		$tableLayout[$tr] = array (
 			'tr'     => array('<tr id="task_multiple_row"' . $style . '>', '</tr>'),
-			'defCol' => $defaultCell
+			'defCol' => $defaultCell,
+			'0'      => array('<td class="td-label">', '</td>')
 		);
 		$tr++;
 
@@ -866,12 +880,14 @@
 				// Add each field to the display, if there are indeed any
 			if (isset($fields) && is_array($fields)) {
 				foreach ($fields as $fieldID => $fieldInfo) {
-					$table[$tr][] = t3lib_BEfunc::cshItem($fieldInfo['cshKey'], $fieldInfo['cshLabel'], $this->backPath, '|', false, 'margin-bottom:0px;');
-					$table[$tr][] = '<label for="' . $fieldID . '">' . $GLOBALS['LANG']->sL($fieldInfo['label']) . '</label>';
+					$cellContent  = t3lib_BEfunc::cshItem($fieldInfo['cshKey'], $fieldInfo['cshLabel'], $this->backPath, '|', false, 'margin-bottom:0px;');
+					$cellContent .= '<label for="' . $fieldID . '">' . $GLOBALS['LANG']->sL($fieldInfo['label']) . '</label>';
+					$table[$tr][] = $cellContent;
 					$table[$tr][] = $fieldInfo['code'];
 					$tableLayout[$tr] = array (
 						'tr'     => array('<tr id="' . $fieldID . '_row"' . $additionalFieldsStyle .' class="extraFields extra_fields_' . $class . '">', '</tr>'),
-						'defCol' => $defaultCell
+						'defCol' => $defaultCell,
+						'0'      => array('<td class="td-label">', '</td>')
 					);
 					$tr++;
 				}
@@ -879,10 +895,12 @@
 		}
 
 			// Render the add/edit task form
+		$content .= '<div style="float: left;"><div class="typo3-dyntabmenu-divs">';
 		$content .= $this->doc->table($table, $tableLayout);
+		$content .= '</div></div>';
 
-		$content .= '<input type="submit" name="save" class="button" value="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:save', TRUE) . '" /> '
-			. '<input type="button" name="cancel" class="button" value="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:cancel', TRUE) . '" onclick="document.location=\'' . $GLOBALS['MCONF']['_'] . '\'" />';
+		$content .= '<div style="padding-top: 20px; clear: both;"></div><div><input type="submit" name="save" class="button" value="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:save', TRUE) . '" /> '
+			. '<input type="button" name="cancel" class="button" value="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:cancel', TRUE) . '" onclick="document.location=\'' . $GLOBALS['MCONF']['_'] . '\'" /></div>';
 
 			// Display information about server time usage
 		$content .= $this->displayServerTime();
@@ -981,32 +999,32 @@
 				// Initialise table layout
 			$tableLayout = array(
 				'table' => array(
-					'<table border="0" cellspacing="1" cellpadding="2" class="tx_scheduler_task_list">', '</table>'
+					'<table border="0" cellspacing="1" cellpadding="2" class="typo3-dblist">', '</table>'
 				),
 				'0'     => array(
-					'tr'     => array('<tr class="bgColor2">', '</tr>'),
-					'defCol' => array('<td class="cell">', '</td>'),
-					'1'      => array('<td style="width: 36px;" class="cell">', '</td>')
+					'tr'     => array('<tr class="t3-row-header">', '</tr>'),
+					'defCol' => array('<td>', '</td>'),
+					'1'      => array('<td style="width: 36px;">', '</td>')
 				),
 				'defRow' => array(
-					'tr'     => array('<tr class="bgColor3-20">', '</tr>'),
-					'defCol' => array('<td class="cell">', '</td>'),
-					'1'		 => array('<td class="cell right">', '</td>'),
-					'2'		 => array('<td class="cell right">', '</td>'),
+					'tr'     => array('<tr class="db_list_normal">', '</tr>'),
+					'defCol' => array('<td>', '</td>'),
+					'1'		 => array('<td class="right">', '</td>'),
+					'2'		 => array('<td class="right">', '</td>'),
 				)
 			);
 			$disabledTaskRow = array (
-				'tr'     => array('<tr class="bgColor3-20 disabled">', '</tr>'),
-				'defCol' => array('<td class="cell">', '</td>'),
-				'1'		 => array('<td class="cell right">', '</td>'),
-				'2'		 => array('<td class="cell right">', '</td>'),
+				'tr'     => array('<tr class="db_list_normal disabled">', '</tr>'),
+				'defCol' => array('<td>', '</td>'),
+				'1'		 => array('<td class="right">', '</td>'),
+				'2'		 => array('<td class="right">', '</td>'),
 			);
 			$rowWithSpan = array (
-				'tr'     => array('<tr class="bgColor3-20">', '</tr>'),
-				'defCol' => array('<td class="cell">', '</td>'),
-				'1'		 => array('<td class="cell right">', '</td>'),
-				'2'		 => array('<td class="cell right">', '</td>'),
-				'3'		 => array('<td class="cell" colspan="6">', '</td>'),
+				'tr'     => array('<tr class="db_list_normal">', '</tr>'),
+				'defCol' => array('<td>', '</td>'),
+				'1'		 => array('<td class="right">', '</td>'),
+				'2'		 => array('<td class="right">', '</td>'),
+				'3'		 => array('<td colspan="6">', '</td>'),
 			);
 			$table = array();
 			$tr = 0;