Index: ext_conf_template.txt
===================================================================
--- ext_conf_template.txt	(revision 41220)
+++ ext_conf_template.txt	(working copy)
@@ -1,14 +1,8 @@
-  # cat=basic/enable; type=boolean; label=CType Image: Enable DAM reference field for the content type "Image".
-ctype_image_add_ref = 1
-  # cat=basic/enable; type=boolean; label=CType Image: Enable original file field for the content type "Image" as second image field.
-ctype_image_add_orig_field = 1
-  # cat=basic/enable; type=boolean; label=CType Text w/image: Enable DAM reference field for the content type "Text w/image".
-ctype_textpic_add_ref = 1
-  # cat=basic/enable; type=boolean; label=CType Text w/image: Enable original file field for the content type "Text w/image" as second image field.
-ctype_textpic_add_orig_field = 1
+  # cat=basic/enable; type=boolean; label=DAM for Text w/image and Image: Enable DAM reference field for the content types "Text w/image" and "Image".
+ctypes_textpic_image_add_ref = 1
+  # cat=basic/enable; type=boolean; label=Keep original media fields: Enable original file field for the content types "Text w/image" and "Image" as second image field.
+ctypes_textpic_image_add_orig_field = 1
   # cat=basic/enable; type=boolean; label=Alternative CSS Styled Rendering: Enable alternative rendering for css_styled_content to.
 add_css_styled_hook = 1
-  # cat=basic/enable; type=boolean; label=Page module modifications: Enable modifications to the page module (XCLASS) to enable the display of thumbnails for reference fields.
-add_page_mod_xclass = 1
   # cat=basic/enable; type=boolean; label=Workspace module modifications: Enable modifications to the workspace module (XCLASS) to enable the display of thumbnails for reference fields.
 add_ws_mod_xclass = 1
Index: ext_emconf.php
===================================================================
--- ext_emconf.php	(revision 41220)
+++ ext_emconf.php	(working copy)
@@ -21,7 +21,7 @@
 	'priority' => '',
 	'loadOrder' => '',
 	'module' => '',
-	'state' => 'experimental',
+	'state' => 'stable',
 	'uploadfolder' => 0,
 	'createDirs' => '',
 	'modify_tables' => 'tt_content',
@@ -36,8 +36,8 @@
 		'depends' => array(
 			'cms' => '',
 			'dam' => '1.1.0',
-			'php' => '4.0.0-',
-			'typo3' => '4.2.3-',
+			'php' => '5.2.0-',
+			'typo3' => '4.3.0-',
 		),
 		'conflicts' => array(
 		),
Index: ext_localconf.php
===================================================================
--- ext_localconf.php	(revision 41220)
+++ ext_localconf.php	(working copy)
@@ -3,7 +3,7 @@
 $GLOBALS['T3_VAR']['ext'][$_EXTKEY]['setup'] = unserialize($_EXTCONF);
 
 
-if ($GLOBALS['T3_VAR']['ext'][$_EXTKEY]['setup']['ctype_image_add_ref']) {
+if ($GLOBALS['T3_VAR']['ext'][$_EXTKEY]['setup']['ctypes_textpic_image_add_ref']) {
 
 	t3lib_extMgm::addTypoScript(
 		$_EXTKEY,
@@ -27,18 +27,7 @@
 		tt_content.image.20.imgPath >
 		tt_content.image.20.imgPath =
 
-		',
-		43
-	);
-}
 
-if ($GLOBALS['T3_VAR']['ext'][$_EXTKEY]['setup']['ctype_textpic_add_ref']) {
-
-	t3lib_extMgm::addTypoScript(
-		$_EXTKEY,
-		'setup','
-		includeLibs.tx_damttcontent = EXT:dam/lib/class.tx_dam_tsfe.php
-
 		temp.tx_dam.fileList < tt_content.textpic.20.imgList
 
 		tt_content.textpic.20.imgList >

		
Index: ext_tables.php
===================================================================
--- ext_tables.php	(revision 41220)
+++ ext_tables.php	(working copy)
@@ -12,26 +12,31 @@
 
 $tempSetup = $GLOBALS['T3_VAR']['ext']['dam_ttcontent']['setup'];
 
-## CType image
+## CTypes "text w/image" and "image"
 
-if ($tempSetup['ctype_image_add_ref']) {
+// for TYPO3 < 4.5
+if (($tempSetup['ctypes_textpic_image_add_ref']) && (t3lib_div::int_from_ver(TYPO3_version) < 4005000)) {
 
-	if ($tempSetup['ctype_image_add_orig_field']) {
+	if ($tempSetup['ctypes_textpic_image_add_orig_field']) {
 		t3lib_extMgm::addToAllTCAtypes('tt_content','tx_damttcontent_files','image','after:image');
+        t3lib_extMgm::addToAllTCAtypes('tt_content','tx_damttcontent_files','textpic','after:image');
 	} else {
 		$TCA['tt_content']['types']['image']['showitem'] = str_replace(', image;', ', tx_damttcontent_files;', $TCA['tt_content']['types']['image']['showitem']);
+        $TCA['tt_content']['types']['textpic']['showitem'] = str_replace(', image;', ', tx_damttcontent_files;', $TCA['tt_content']['types']['textpic']['showitem']);
 	}
+
 }
 
-## CType textpic
+// for TYPO3 >= 4.5
+if (($tempSetup['ctypes_textpic_image_add_ref']) && (t3lib_div::int_from_ver(TYPO3_version) >= 4005000)) {
 
-if ($tempSetup['ctype_textpic_add_ref']) {
-
-	if ($tempSetup['ctype_textpic_add_orig_field']) {
-		t3lib_extMgm::addToAllTCAtypes('tt_content','tx_damttcontent_files','textpic','after:image');
+	if ($tempSetup['ctypes_textpic_image_add_orig_field']) {
+		t3lib_extMgm::addToAllTCAtypes('tt_content','tx_damttcontent_files','image','after:image');
+        t3lib_extMgm::addToAllTCAtypes('tt_content','tx_damttcontent_files','textpic','after:image');
 	} else {
-		$TCA['tt_content']['types']['textpic']['showitem'] = str_replace(', image;', ', tx_damttcontent_files;', $TCA['tt_content']['types']['textpic']['showitem']);
+		t3lib_extMgm::addToAllTCAtypes('tt_content','tx_damttcontent_files','textpic','replace:image');
 	}
+
 }
 
 if ($GLOBALS['T3_VAR']['ext']['dam_ttcontent']['setup']['add_css_styled_hook']) {