diff --git a/e107_plugins/gallery/includes/gallery_load.php b/e107_plugins/gallery/includes/gallery_load.php
index d617db27b..615c1d388 100644
--- a/e107_plugins/gallery/includes/gallery_load.php
+++ b/e107_plugins/gallery/includes/gallery_load.php
@@ -50,15 +50,15 @@ function gallery_load_prettyphoto()
 				'overlay_gallery'         => (bool) varset($plugPref['pp_overlay_gallery'], true),
 				'keyboard_shortcuts'      => (bool) varset($plugPref['pp_keyboard_shortcuts'], true),
 				'ie6_fallback'            => (bool) varset($plugPref['pp_ie6_fallback'], true),
-				'markup'                  => $template['prettyphoto']['markup'],
-				'gallery_markup'          => $template['prettyphoto']['gallery_markup'],
-				'image_markup'            => $template['prettyphoto']['image_markup'],
-				'flash_markup'            => $template['prettyphoto']['flash_markup'],
-				'quicktime_markup'        => $template['prettyphoto']['quicktime_markup'],
-				'iframe_markup'           => $template['prettyphoto']['iframe_markup'],
-				'inline_markup'           => $template['prettyphoto']['inline_markup'],
-				'custom_markup'           => $template['prettyphoto']['custom_markup'],
-				'social_tools'            => $template['prettyphoto']['social_tools'],
+				'markup'                  => $template['prettyphoto']['content'],
+				'gallery_markup'          => $template['prettyphoto']['gallery_item'],
+				'image_markup'            => $template['prettyphoto']['image_item'],
+				'flash_markup'            => $template['prettyphoto']['flash_item'],
+				'quicktime_markup'        => $template['prettyphoto']['quicktime_item'],
+				'iframe_markup'           => $template['prettyphoto']['iframe_item'],
+				'inline_markup'           => $template['prettyphoto']['inline_item'],
+				'custom_markup'           => $template['prettyphoto']['custom_item'],
+				'social_tools'            => $template['prettyphoto']['social_item'],
 			),
 		);
 
diff --git a/e107_plugins/gallery/templates/gallery_template.php b/e107_plugins/gallery/templates/gallery_template.php
index 12c758969..6f4c988a3 100644
--- a/e107_plugins/gallery/templates/gallery_template.php
+++ b/e107_plugins/gallery/templates/gallery_template.php
@@ -79,7 +79,7 @@ $GALLERY_TEMPLATE['slideshow_wrapper'] = '
 
 $GALLERY_TEMPLATE['slideshow_slide_item'] = '<span class="gallery-slide-item">{GALLERY_THUMB: w=150&h=120}</span>';
 
-$GALLERY_TEMPLATE['prettyphoto']['markup'] = '
+$GALLERY_TEMPLATE['prettyphoto']['content'] = '
 <div class="pp_pic_holder">
 	<div class="ppt">&nbsp;</div>
 	<div class="pp_top">
@@ -123,7 +123,7 @@ $GALLERY_TEMPLATE['prettyphoto']['markup'] = '
 <div class="pp_overlay"></div>
 ';
 
-$GALLERY_TEMPLATE['prettyphoto']['gallery_markup'] = '
+$GALLERY_TEMPLATE['prettyphoto']['gallery_item'] = '
 <div class="pp_gallery">
 	<a href="#" class="pp_arrow_previous">' . LAN_PREVIOUS . '</a>
 	<div>
@@ -135,11 +135,11 @@ $GALLERY_TEMPLATE['prettyphoto']['gallery_markup'] = '
 </div>
 ';
 
-$GALLERY_TEMPLATE['prettyphoto']['image_markup'] = '
+$GALLERY_TEMPLATE['prettyphoto']['image_item'] = '
 <img id="fullResImage" src="{path}" />
 ';
 
-$GALLERY_TEMPLATE['prettyphoto']['flash_markup'] = '
+$GALLERY_TEMPLATE['prettyphoto']['flash_item'] = '
 <object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="{width}" height="{height}">
 	<param name="wmode" value="{wmode}" />
 	<param name="allowfullscreen" value="true" />
@@ -149,7 +149,7 @@ $GALLERY_TEMPLATE['prettyphoto']['flash_markup'] = '
 </object>
 ';
 
-$GALLERY_TEMPLATE['prettyphoto']['quicktime_markup'] = '
+$GALLERY_TEMPLATE['prettyphoto']['quicktime_item'] = '
 <object classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" codebase="http://www.apple.com/qtactivex/qtplugin.cab" height="{height}" width="{width}">
 	<param name="src" value="{path}">
 	<param name="autoplay" value="{autoplay}">
@@ -158,17 +158,17 @@ $GALLERY_TEMPLATE['prettyphoto']['quicktime_markup'] = '
 </object>
 ';
 
-$GALLERY_TEMPLATE['prettyphoto']['iframe_markup'] = '
+$GALLERY_TEMPLATE['prettyphoto']['iframe_item'] = '
 <iframe src ="{path}" width="{width}" height="{height}" frameborder="no"></iframe>
 ';
 
-$GALLERY_TEMPLATE['prettyphoto']['inline_markup'] = '
+$GALLERY_TEMPLATE['prettyphoto']['inline_item'] = '
 <div class="pp_inline">{content}</div>
 ';
 
-$GALLERY_TEMPLATE['prettyphoto']['custom_markup'] = '';
+$GALLERY_TEMPLATE['prettyphoto']['custom_item'] = '';
 
-$GALLERY_TEMPLATE['prettyphoto']['social_tools'] = '
+$GALLERY_TEMPLATE['prettyphoto']['social_item'] = '
 <div class="pp_social">
 	<div class="twitter">
 		<a href="http://twitter.com/share" class="twitter-share-button" data-count="none">' . LAN_SHARE . '</a>