Index: /views/admin/presentation.phtml
===================================================================
--- /views/admin/presentation.phtml	(revision 6450)
+++ /views/admin/presentation.phtml	(revision 6451)
@@ -32,6 +32,6 @@
 	 			), $this->get_option('wpsg_form_validation')); ?>
 	 			
-				<?php echo wpsg_drawForm_Checkbox('wpsg_imagehandler_basketimage', __('Produktbild im Warenkorb anzeigen', 'wpsg'), $this->shop->get_option('wpsg_imagehandler_basketimage')); ?>
-				<?php echo wpsg_drawForm_Checkbox('wpsg_imagehandler_overviewimage', __('Produktbild in Bestellzusammenfassung anzeigen', 'wpsg'), $this->shop->get_option('wpsg_imagehandler_overviewimage')); ?>
+				<?php echo wpsg_drawForm_Checkbox('wpsg_imagehandler_basketimage', __('Produktbild im Warenkorb anzeigen', 'wpsg'), $this->get_option('wpsg_imagehandler_basketimage')); ?>
+				<?php echo wpsg_drawForm_Checkbox('wpsg_imagehandler_overviewimage', __('Produktbild in Bestellzusammenfassung anzeigen', 'wpsg'), $this->get_option('wpsg_imagehandler_overviewimage')); ?>
 				
 				<?php $this->callMods('admin_presentation'); ?>
Index: /views/mods/mod_productindex/layouts/grid.phtml
===================================================================
--- /views/mods/mod_productindex/layouts/grid.phtml	(revision 6450)
+++ /views/mods/mod_productindex/layouts/grid.phtml	(revision 6451)
@@ -98,19 +98,10 @@
 			<div class="wpsg_mod_productindex_product <?php echo (($i == sizeof($this->view['arProducts']))?'wpsg_mod_productindex_product_last':''); ?> <?php echo (($i == 1)?'wpsg_mod_productindex_product_first':''); ?>" style="width:<?php echo round((100 / $col), 2) ?>%;">
 				<div class="wpsg_mod_productindex_product_inner">
-					<?php if ($this->hasMod('wpsg_mod_produktbilder')) { $arBilder = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($p['id'])); ?>
-					<div class="wpsg_mod_productindex_pic">
-						<?php if (wpsg_isSizedArray($arBilder)) { ?>
-						<a title="<?php echo __('Zur Detailseite des Produkts', 'wpsg'); ?>" href="<?php echo wpsg_url($p['url']); ?>">
-							<?php if ($nPicRand === true) $nPicIndex = array_rand($arBilder); else $nPicIndex = 0; ?>
-
-							<?php
-							$href = wp_get_attachment_image_src($arBilder[$nPicIndex]['post_id'], Array(800, 600));
-							$imgtag = wp_get_attachment_image($arBilder[$nPicIndex]['post_id'], Array($nPicWidth, $nPicHeight));
-							?>
-							<?php echo $imgtag; ?>
-						</a>
-						<?php } ?>
-					</div>
-					<?php } ?>
+					
+					<?php $attachment_id = $this->imagehandler->getAttachmentID($p['product_key']); ?>
+					<?php echo wp_get_attachment_image($attachment_id, array(800, 600)); ?>
+
+				
+					
 					<div class="wpsg_mod_productindex_content">
 						<div class="wpsg_mod_productindex_title">
Index: /views/mods/mod_productindex/layouts/list.phtml
===================================================================
--- /views/mods/mod_productindex/layouts/list.phtml	(revision 6450)
+++ /views/mods/mod_productindex/layouts/list.phtml	(revision 6451)
@@ -91,19 +91,8 @@
 		<?php $i = 0; foreach ($this->view['arProducts'] as $p) { $i ++; ?>
 		<div class="wpsg_mod_productindex_product <?php echo (($i % 2 == 0)?'odd':'even'); ?> <?php echo (($i == sizeof($this->view['arProducts']))?'wpsg_mod_productindex_product_last':''); ?> <?php echo (($i == 1)?'wpsg_mod_productindex_product_first':''); ?>">
-			<?php if ($this->hasMod('wpsg_mod_produktbilder')) { $arBilder = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($p['id'])); ?>
-			<div class="wpsg_mod_productindex_pic">
-				<?php if (wpsg_isSizedArray($arBilder)) { ?>
-				<a title="<?php echo __('Zur Detailseite des Produkts', 'wpsg'); ?>" href="<?php echo wpsg_url($p['url']); ?>">
-					<?php if ($nPicRand === true) $nPicIndex = array_rand($arBilder); else $nPicIndex = 0; ?>
-
-					<?php
-					$href = wp_get_attachment_image_src($arBilder[$nPicIndex]['post_id'], Array(800, 600));
-					$imgtag = wp_get_attachment_image($arBilder[$nPicIndex]['post_id'], Array($nPicWidth, $nPicHeight));
-					?>
-					<?php echo $imgtag; ?>
-				</a>
-				<?php } ?>
-			</div>
-			<?php } ?>
+			
+			<?php $attachment_id = $this->imagehandler->getAttachmentID($p['product_key']); ?>
+			<?php echo wp_get_attachment_image($attachment_id, array(800, 600)); ?>
+			
 			<div class="wpsg_mod_productindex_content">
 				<div class="wpsg_mod_productindex_infos">