diff -ruN components/com_phocagallery_2.5.0/views/detail/tmpl/default.php components/com_phocagallery/views/detail/tmpl/default.php
--- components/com_phocagallery_2.5.0/views/detail/tmpl/default.php	2009-07-15 10:47:17.000000000 -0400
+++ components/com_phocagallery/views/detail/tmpl/default.php	2009-07-14 23:41:40.000000000 -0400
@@ -1,11 +1,8 @@
 <?php defined('_JEXEC') or die('Restricted access');
-
-$largeHeight = (int)$this->tmpl['largeheight'] + 6 ;
-
 ?><center style="padding-top:10px">
-<table border="0" width="100%">
-	<tr>
-		<td colspan="6" align="center" valign="middle" height="<?php echo $largeHeight; ?>" >
+<table border="0" width="100%" style="padding: 0px; margin:0px;">
+	<tr style="padding: 0px; margin:0px;">
+		<td colspan="6" align="center" valign="middle" height="<?php echo $this->tmpl['largeheight']; ?>" style="padding: 0px; margin:0px;">
 			<div id="image-box" style="width:<?php echo $this->item->realimagewidth;?>px;"><a  href="#" onclick="<?php echo $this->tmpl['detailwindowclose']; ?>"><?php echo JHTML::_( 'image.site', $this->item->linkthumbnailpath, ''); ?></a><?php
 			
 			$titleDesc = '';
@@ -31,8 +28,8 @@
 	if ($this->tmpl['displaydescriptiondetail'] == 1) {
 	
 		?>
-		<tr>
-			<td colspan="6" align="left" valign="top" height="<?php echo $this->tmpl['descriptiondetailheight']; ?>">
+		<tr style="padding: 0px; margin:0px;">
+			<td colspan="6" align="left" valign="top" height="<?php echo $this->tmpl['descriptiondetailheight']; ?>" style="padding: 0px; margin:0px;">
 				<div style="font-size:<?php echo $this->tmpl['fontsizedesc']; ?>px;height:<?php echo $this->tmpl['descriptiondetailheight']; ?>px;padding:0 20px 0 20px;color:<?php echo $this->tmpl['fontcolordesc']; ?>"><?php echo $titleDesc . $this->item->description ?></div>
 			</td>
 		</tr>
diff -ruN components/com_phocagallery_2.5.0/views/detail/tmpl/default_slideshowjs.php components/com_phocagallery/views/detail/tmpl/default_slideshowjs.php
--- components/com_phocagallery_2.5.0/views/detail/tmpl/default_slideshowjs.php	2009-07-15 10:47:18.000000000 -0400
+++ components/com_phocagallery/views/detail/tmpl/default_slideshowjs.php	2009-07-15 10:32:08.000000000 -0400
@@ -85,8 +85,34 @@
 fadeshow.prototype.populateslide=function(picobj, picindex){
 var slideHTML=""
 if (this.theimages[picindex][1]!="") /*if associated link exists for image*/
-slideHTML='<a HREF="'+this.theimages[picindex][1]+'" target="'+this.theimages[picindex][2]+'">'
-slideHTML+='<table border="0"><tr><td style="text-align:center" align="center" valign="middle" height="<?php echo $this->tmpl['largeheight']; ?>"><img style="vertical-align:middle" SRC="'+this.postimages[picindex].src+'" border="'+this.imageborder+'px"></td></tr></table>'
+slideHTML='<a href="'+this.theimages[picindex][1]+'" target="'+this.theimages[picindex][2]+'">'
+slideHTML+='<table width="100%" border="0" style="padding: 0px; margin:0px;"><tr style="padding: 0px; margin:0px;"><td style="text-align:center; padding: 0px; margin:0px;" align="center" valign="middle" height="<?php echo $this->tmpl['largeheight']; ?>"><img style="vertical-align:middle" src="'+this.postimages[picindex].src+'" border="'+this.imageborder+'px">';
+<?php
+// LIGHTBOX DESCRIPTION
+if ($this->tmpl['displaydescriptiondetail'] == 2) {
+?>
+    if (this.theimages[picindex][3]!="") { /*if image has an associated comment*/
+        slideHTML+='<div id="description-msg" style="background:<?php echo $this->tmpl['descriptionlightboxbgcolor'];?>"><div id="description-text" style="background:<?php echo $this->tmpl['descriptionlightboxbgcolor'];?>;color:<?php echo $this->tmpl['descriptionlightboxfontcolor'];?>;font-size:<?php echo $this->tmpl['descriptionlightboxfontsize'];?>px">' + this.theimages[picindex][3] + '</div></div>';
+    }
+<?php
+}
+?>
+slideHTML+='</td>';
+<?php
+// STANDARD DESCRIPTION
+if ($this->tmpl['displaydescriptiondetail'] == 1) {
+?>
+    if (this.theimages[picindex][3]!="") { /*if image has an associated comment*/
+            slideHTML+='</td></tr><tr style="padding: 0px; margin:0px;">' + 
+                       '<td style="text-align:left; padding: 0px; margin:0px; height: <?php echo $this->tmpl['descriptiondetailheight']; ?>px;" align="left" valign="top" height="<?php echo $this->tmpl['descriptiondetailheight']; ?>">' +
+
+                       '<div style="font-size:<?php echo $this->tmpl['fontsizedesc']; ?>px;height:<?php echo $this->tmpl['descriptiondetailheight']; ?>px; padding:0px; margin:0px; color:<?php echo $this->tmpl['fontcolordesc']; ?>">'+
+                       this.theimages[picindex][3]+'</div></td>'
+    }
+<?php
+}
+?>
+slideHTML+='</tr></table>'
 if (this.theimages[picindex][1]!="") /*if associated link exists for image*/
 slideHTML+='</a>'
 picobj.innerHTML=slideHTML
diff -ruN components/com_phocagallery_2.5.0/views/detail/tmpl/default_slideshow.php components/com_phocagallery/views/detail/tmpl/default_slideshow.php
--- components/com_phocagallery_2.5.0/views/detail/tmpl/default_slideshow.php	2009-07-15 10:47:17.000000000 -0400
+++ components/com_phocagallery/views/detail/tmpl/default_slideshow.php	2009-07-15 10:29:03.000000000 -0400
@@ -1,14 +1,21 @@
 <?php
 defined('_JEXEC') or die('Restricted access'); 
+// STANDARD DESCRIPTION
+if ($this->tmpl['displaydescriptiondetail'] == 1) {
+	$largeHeight = $this->tmpl['largeheight'] + $this->tmpl['descriptiondetailheight'];
+}
+else {
+	$largeHeight = $this->tmpl['largeheight'];
+}
 ?><center style="padding-top:10px;">
-	<table border="0" width="100%">
-		<tr>
-			<td colspan="6" align="center" valign="middle" height="<?php echo $this->tmpl['largeheight']; ?>" style="height:<?php echo $this->tmpl['largeheight']; ?>px" >
+	<table border="0" width="100%" style="padding: 0px; margin:0px;">
+		<tr style="padding: 0px; margin:0px;">
+			<td colspan="6" align="center" valign="middle" height="<?php echo $largeHeight; ?>" style="height:<?php echo $largeHeight; ?>px; padding: 0px; margin:0px;">
 				<script type="text/javascript"><?php			
 				if ( $this->tmpl['slideshowrandom'] == 1 ) {
-					echo 'new fadeshow(fadeimages, '.$this->tmpl['largewidth'] .', '. $this->tmpl['largeheight'] .', 0, '. $this->tmpl['slideshowdelay'] .', '. $this->tmpl['slideshowpause'] .', \'R\')';		
+					echo 'new fadeshow(fadeimages, '.$this->tmpl['largewidth'] .', '. $largeHeight .', 0, '. $this->tmpl['slideshowdelay'] .', '. $this->tmpl['slideshowpause'] .', \'R\')';		
 				} else {						
-					echo 'new fadeshow(fadeimages, '.$this->tmpl['largewidth'] .', '. $this->tmpl['largeheight'] .', 0, '. $this->tmpl['slideshowdelay'] .', '. $this->tmpl['slideshowpause'] .')';		
+					echo 'new fadeshow(fadeimages, '.$this->tmpl['largewidth'] .', '. $largeHeight .', 0, '. $this->tmpl['slideshowdelay'] .', '. $this->tmpl['slideshowpause'] .')';		
 				} ?>
 				</script>
 			</td>
diff -ruN administrator/components/com_phocagallery_2.5.0/libraries/phocagallery/render/renderdetailbutton.php administrator/components/com_phocagallery/libraries/phocagallery/render/renderdetailbutton.php
--- administrator/components/com_phocagallery_2.5.0/libraries/phocagallery/render/renderdetailbutton.php	2009-07-15 10:54:51.000000000 -0400
+++ administrator/components/com_phocagallery/libraries/phocagallery/render/renderdetailbutton.php	2009-07-15 10:22:38.000000000 -0400
@@ -152,22 +152,32 @@
 		$jsSlideshowData['files'] = '';
 		
 		//Get filename of all photos
-		$query = "SELECT filename as filename FROM #__phocagallery WHERE catid=".(int) $catid." AND published=1 ORDER BY ".$imageOrdering;
+		$query = "SELECT filename as filename, title, description FROM #__phocagallery WHERE catid=".(int) $catid." AND published=1 ORDER BY ".$imageOrdering;
 		$db->setQuery($query);
 		$filenameAll = $db->loadObjectList();
 		$countImg = 0;
 		if (!empty($filenameAll)) {
 			
 			foreach ($filenameAll as $key => $value) {
+
+				$titleDesc = '';
+				if ($params->get( 'display_title_description', 0 ) == 1) {
+						$titleDesc .= $value->title;
+						if ($value->description != '' && $titleDesc != '') {
+								$titleDesc .= ' - ';
+						}
+				}
+				$titleDesc = $titleDesc . $value->description;
 				
 				$fileThumbnail = PhocaGalleryFileThumbnail::getThumbnailName($value->filename, 'large');
 				
 				if (JFile::exists($fileThumbnail->abs)) {
-					$jsSlideshowData['files'] .= 'fadeimages['.$countImg.']=["'. JURI::base(true) . '/' . $fileThumbnail->rel.'", "", ""];'; 
+					$fileThumbnail = JURI::base(true) . '/' . $fileThumbnail->rel;
 				} else {
 					$fileThumbnail = JURI::base(true).'/' . "components/com_phocagallery/assets/images/phoca_thumb_l_no_image." . $this->_formaticon;
-					$jsSlideshowData['files'] .= 'fadeimages['.$countImg.']=["'.$fileThumbnail.'", "", ""];';
 				}
+
+				$jsSlideshowData['files'] .= 'fadeimages['.$countImg.']=["'.$fileThumbnail.'", "", "", "'.str_replace('"', '\"', $titleDesc).'"];'."\n";
 				$countImg++;
 			}
 		}