Index: typo3/sysext/css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php
===================================================================
--- typo3/sysext/css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php	(revision 5385)
+++ typo3/sysext/css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php	(working copy)
@@ -343,25 +343,30 @@
 					// Now, lets render the list!
 				$tRows = array();
 				foreach($filesData as $key => $fileD)	{
+					$rowContent = '';
 
 						// Setting class of table row for odd/even rows:
 					$oddEven = $key%2 ? 'tr-odd' : 'tr-even';
+					$rowWrap = $conf['rowWrap'] ? $conf['rowWrap'] : '<tr class="'.$oddEven.'">|</tr>';
+					
+						// Render row, based on the "layout" setting
+					if($type>0) {
+						$rowContent = $this->cObj->wrap($fileD['linkedFilenameParts'][0], $conf['iconWrap']);
+					}
+					
+					$fileInfo = $this->cObj->wrap($fileD['linkedFilenameParts'][1], $conf['fileNameWrap']);
+					
+					if($fileD['description']) {
+						$fileInfo .= $this->cObj->wrap(htmlspecialchars($fileD['description']), $conf['descriptionWrap']);
+					}
+					
+					$rowContent .= $this->cObj->wrap($fileInfo, $conf['colWrap']);
+					
+					if($this->cObj->data['filelink_size']) {
+						$rowContent .= $this->cObj->wrap($this->cObj->stdWrap($fileD['filesize'], $conf['filesize.']), $conf['fileSizeWrap']);
+					}
+					$tRows[] = $this->cObj->wrap($rowContent, $rowWrap);
 
-						// Render row, based on the "layout" setting
-					$tRows[]='
-					<tr class="'.$oddEven.'">'.($type>0 ? '
-						<td class="csc-uploads-icon">
-							'.$fileD['linkedFilenameParts'][0].'
-						</td>' : '').'
-						<td class="csc-uploads-fileName">
-							<p>'.$fileD['linkedFilenameParts'][1].'</p>'.
-							($fileD['description'] ? '
-							<p class="csc-uploads-description">'.htmlspecialchars($fileD['description']).'</p>' : '').'
-						</td>'.($this->cObj->data['filelink_size'] ? '
-						<td class="csc-uploads-fileSize">
-							<p>' . $this->cObj->stdWrap($fileD['filesize'], $conf['filesize.']) . '</p>
-						</td>' : '').'
-					</tr>';
 				}
 
 					// Table tag params.
@@ -370,10 +375,8 @@
 
 
 					// Compile it all into table tags:
-				$out = '
-				<table '.t3lib_div::implodeAttributes($tableTagParams).'>
-					'.implode('',$tRows).'
-				</table>';
+				$outerWrap = $conf['outerWrap'] ? $conf['outerWrap'] : '<table ' . t3lib_div::implodeAttributes($tableTagParams) . '>|</table>';
+				$out = $this->cObj->wrap(implode('',$tRows),$outerWrap);;
 			}
 
 				// Calling stdWrap:
Index: typo3/sysext/css_styled_content/static/v4.2/setup.txt
===================================================================
--- typo3/sysext/css_styled_content/static/v4.2/setup.txt	(revision 5385)
+++ typo3/sysext/css_styled_content/static/v4.2/setup.txt	(working copy)
@@ -670,6 +670,14 @@
 	20 = USER
 	20.userFunc = tx_cssstyledcontent_pi1->render_uploads
 	20.field = media
+	
+	20 {
+		colWrap = <td class="csc-uploads-fileName">|</td>
+		fileNameWrap = <p>|</p>
+		fileSizeWrap = <td class="csc-uploads-fileSize">|</td>
+		iconWrap = <td class="csc-uploads-icon">|</td>
+		descriptionWrap = <p class="csc-uploads-description">|</p>
+	}
 
 	20.color {
 		default =
Index: typo3/sysext/css_styled_content/static/v3.9/setup.txt
===================================================================
--- typo3/sysext/css_styled_content/static/v3.9/setup.txt	(revision 5385)
+++ typo3/sysext/css_styled_content/static/v3.9/setup.txt	(working copy)
@@ -654,6 +654,14 @@
 	20 = USER
 	20.userFunc = tx_cssstyledcontent_pi1->render_uploads
 	20.field = media
+	
+	20 {
+		colWrap = <td class="csc-uploads-fileName">|</td>
+		fileNameWrap = <p>|</p>
+		fileSizeWrap = <td class="csc-uploads-fileSize">|</td>
+		iconWrap = <td class="csc-uploads-icon">|</td>
+		descriptionWrap = <p class="csc-uploads-description">|</p>
+	}
 
 	20.color {
 		default =
Index: typo3/sysext/css_styled_content/static/v3.8/setup.txt
===================================================================
--- typo3/sysext/css_styled_content/static/v3.8/setup.txt	(revision 5385)
+++ typo3/sysext/css_styled_content/static/v3.8/setup.txt	(working copy)
@@ -563,6 +563,14 @@
 	20.userFunc = tx_cssstyledcontent_pi1->render_uploads
 	20.field = media
 
+	20 {
+		colWrap = <td class="csc-uploads-fileName">|</td>
+		fileNameWrap = <p>|</p>
+		fileSizeWrap = <td class="csc-uploads-fileSize">|</td>
+		iconWrap = <td class="csc-uploads-icon">|</td>
+		descriptionWrap = <p class="csc-uploads-description">|</p>
+	}
+
 	20.color {
 		default =
 		1 = #EDEBF1
Index: typo3/sysext/css_styled_content/static/setup.txt
===================================================================
--- typo3/sysext/css_styled_content/static/setup.txt	(revision 5385)
+++ typo3/sysext/css_styled_content/static/setup.txt	(working copy)
@@ -736,6 +736,14 @@
 	20 = USER
 	20.userFunc = tx_cssstyledcontent_pi1->render_uploads
 	20.field = media
+	
+	20 {
+		colWrap = <td class="csc-uploads-fileName">|</td>
+		fileNameWrap = <p>|</p>
+		fileSizeWrap = <td class="csc-uploads-fileSize">|</td>
+		iconWrap = <td class="csc-uploads-icon">|</td>
+		descriptionWrap = <p class="csc-uploads-description">|</p>
+	}
 
 	20.color {
 		default =