diff --git a/e107_plugins/gallery/gallery.php b/e107_plugins/gallery/gallery.php
index f94ecdd32..221ca2f76 100644
--- a/e107_plugins/gallery/gallery.php
+++ b/e107_plugins/gallery/gallery.php
@@ -33,6 +33,7 @@ if (!getperms("P") || !plugInstalled('gallery'))
 	header('location:'.e_BASE.'index.php');
 	exit;
 }
+e107::getJs()->pluginCSS('gallery', 'gallery_style.css');
 require_once(HEADERF);
 
 
diff --git a/e107_plugins/gallery/gallery_style.css b/e107_plugins/gallery/gallery_style.css
new file mode 100644
index 000000000..d398aa8d8
--- /dev/null
+++ b/e107_plugins/gallery/gallery_style.css
@@ -0,0 +1,25 @@
+
+
+
+/* IMAGE LIST */
+
+.gallery-list-start		{ clear:both; }
+
+.gallery-list-item		{ width:190px; height:180px; float:left; margin:3px; border:1px solid #000000; background-color:#000000 }
+
+.gallery-list-end		{ text-align:center; clear:both; padding-top:20px; }
+
+.gallery-list-caption 	{ display:block; text-align:center; color:#FFFFFF; }
+
+
+/* CATEGORY LIST */
+
+.gallery-cat-start		{ clear:both; }
+
+.gallery-cat-item		{ width:190px; height:180px; float:left; margin:3px; border:1px solid #000000; background-color:#000000; }
+
+.gallery-cat-end		{ text-align:center; clear:both; }
+
+.gallery-cat-title		{ text-align:center; }
+
+
diff --git a/e107_plugins/gallery/shortcodes/batch/gallery_shortcodes.php b/e107_plugins/gallery/shortcodes/batch/gallery_shortcodes.php
index 2e55afb1c..457eddc66 100644
--- a/e107_plugins/gallery/shortcodes/batch/gallery_shortcodes.php
+++ b/e107_plugins/gallery/shortcodes/batch/gallery_shortcodes.php
@@ -13,13 +13,19 @@ class gallery_shortcodes extends e_shortcode
 {		
 	function sc_gallery_caption($parm='')
 	{
-		return $this->eParserVars['media_caption'];
+		$text = "<a href='".e107::getParser()->replaceConstants($this->eParserVars['media_url'])."' rel='external shadowbox' >";
+		$text .= $this->eParserVars['media_caption'];
+		$text .= "</a>";
+		return $text;
 	}
 	
 	function sc_gallery_thumb($parm='')
 	{
 		$att = ($parm) ?$parm : 'aw=190&ah=150';
-		return "<img src='".e107::getParser()->thumbUrl($this->eParserVars['media_url'],$att)."' alt='' />";	
+		$text = "<a href='".e107::getParser()->replaceConstants($this->eParserVars['media_url'])."' rel='external shadowbox' >";
+		$text .= "<img src='".e107::getParser()->thumbUrl($this->eParserVars['media_url'],$att)."' alt='' />";
+		$text .= "</a>";
+		return $text;	
 	}
 	
 	function sc_gallery_cat_title($parm='')
diff --git a/e107_plugins/gallery/templates/gallery_template.php b/e107_plugins/gallery/templates/gallery_template.php
index 77257a977..6d91097b1 100644
--- a/e107_plugins/gallery/templates/gallery_template.php
+++ b/e107_plugins/gallery/templates/gallery_template.php
@@ -1,40 +1,45 @@
 <?php
-
+/*
+* Copyright (c) 2012 e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
+* $Id: e_shortcode.php 12438 2011-12-05 15:12:56Z secretr $
+*
+* Gallery Template 
+*/
 
   
 $GALLERY_TEMPLATE['LIST_START'] = 
-	"<div class='gallery-list-start' style='clear:both'>";
+	"<div class='gallery-list-start'>";
 
 		
 $GALLERY_TEMPLATE['LIST_ITEM'] = 
-	"<div style='width:190px;height:180px;float:left;margin:3px;border:1px solid black;background-color:black'>
+	"<div class='gallery-list-item'>
 	<div>{GALLERY_THUMB}</div>
-	<div style='display:block;text-align:center;color:white;'>{GALLERY_CAPTION}</div>
+	<div class='gallery-list-caption'>{GALLERY_CAPTION}</div>
 	</div>
 	";
 
 $GALLERY_TEMPLATE['LIST_END'] = 
 	"</div>
-	<div class='gallery-list-end' style='text-align:center;clear:both'>
+	<div class='gallery-list-end' >
 	<a href='".e_SELF."'>Back to Categories</a>
 	</div>
 	";
 	
 	
 $GALLERY_TEMPLATE['CAT_START'] = 
-	"<div class='gallery-cat-start' style='clear:both'>";
+	"<div class='gallery-cat-start'>";
 
 		
 $GALLERY_TEMPLATE['CAT_ITEM'] = 
-	"<div style='width:190px;height:180px;float:left;margin:3px;border:1px solid black;background-color:black'>
-	<div>{GALLERY_CAT_THUMB}</div>
-	<div style='text-align:center'><h3>{GALLERY_CAT_TITLE}</h3></div>
+	"<div class='gallery-cat-item'>
+	<div class='gallery-cat-thumb'>{GALLERY_CAT_THUMB}</div>
+	<div class='gallery-cat-title'><h3>{GALLERY_CAT_TITLE}</h3></div>
 	</div>
 	";
 
 $GALLERY_TEMPLATE['CAT_END'] = 
 	"</div>
-	<div class='gallery-cat-end' style='text-align:center;clear:both'>
+	<div class='gallery-cat-end'>
 	</div>
 	";