diff --git a/e107_plugins/gallery/admin_gallery.php b/e107_plugins/gallery/admin_gallery.php
index ac533c22d..e09741bdb 100644
--- a/e107_plugins/gallery/admin_gallery.php
+++ b/e107_plugins/gallery/admin_gallery.php
@@ -1,14 +1,11 @@
 <?php
-
-/**
+/*
  * e107 website system
  *
- * Copyright (C) 2008-2009 e107 Inc (e107.org)
+ * Copyright (C) 2008-2016 e107 Inc (e107.org)
  * Released under the terms and conditions of the
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
- * @author e107coders
- *
  * @file
  * Class installations to handle configuration forms on Admin UI.
  */
@@ -272,7 +269,7 @@ class gallery_cat_admin_ui extends e_admin_ui
 	 *  Edit/create form tabs.
 	 */
 	protected $preftabs = array(
-		LAN_GALLERY_ADMIN_02,
+		LAN_GENERAL,
 		LAN_GALLERY_ADMIN_03,
 		LAN_GALLERY_ADMIN_32,
 	);
@@ -457,7 +454,7 @@ class gallery_cat_admin_ui extends e_admin_ui
 			'tab'        => 2,
 		),
 		'pp_theme'                   => array(
-			'title'      => LAN_GALLERY_ADMIN_45,
+			'title'      => LAN_THEME,
 			'type'       => 'dropdown',
 			'data'       => 'str',
 			'writeParms' => array(
diff --git a/e107_plugins/gallery/languages/English/English_admin.php b/e107_plugins/gallery/languages/English/English_admin.php
index 65fd10074..d2678dd88 100644
--- a/e107_plugins/gallery/languages/English/English_admin.php
+++ b/e107_plugins/gallery/languages/English/English_admin.php
@@ -1,12 +1,16 @@
 <?php
-
-/**
- * @file
+/*
+ * e107 website system
+ *
+ * Copyright (C) 2008-2016 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
  * Language file for "gallery" plugin.
  */
 
 define("LAN_GALLERY_ADMIN_01", "[x] is active. Simply import and assign images to the gallery categories using the [y]");
-define("LAN_GALLERY_ADMIN_02", "General");
+//define("LAN_GALLERY_ADMIN_02", "General");//LAN_GENERAL
 define("LAN_GALLERY_ADMIN_03", "Slideshow Menu");
 define("LAN_GALLERY_ADMIN_04", "Image Max. Width");
 define("LAN_GALLERY_ADMIN_05", "Images will be auto-resized if greater than the width given here");
@@ -50,7 +54,7 @@ define("LAN_GALLERY_ADMIN_41", "Default width");
 define("LAN_GALLERY_ADMIN_42", "Default height");
 define("LAN_GALLERY_ADMIN_43", "Counter separator label");
 define("LAN_GALLERY_ADMIN_44", "The separator for the gallery counter 1 \"of\" 2");
-define("LAN_GALLERY_ADMIN_45", "Theme");
+//define("LAN_GALLERY_ADMIN_45", "Theme");//LAN_THEME
 define("LAN_GALLERY_ADMIN_46", "Horizontal padding");
 define("LAN_GALLERY_ADMIN_47", "The padding on each side of the picture.");
 define("LAN_GALLERY_ADMIN_48", "Hide flash");
diff --git a/e107_plugins/gallery/languages/English/English_front.php b/e107_plugins/gallery/languages/English/English_front.php
index 2a967bf10..2fdd4c2b9 100644
--- a/e107_plugins/gallery/languages/English/English_front.php
+++ b/e107_plugins/gallery/languages/English/English_front.php
@@ -6,3 +6,4 @@
  */
 
 define("LAN_GALLERY_FRONT_01", "Right-click > Save Link As");
+define("LAN_GALLERY_FRONT_02", "Expand the image");
\ No newline at end of file
diff --git a/e107_plugins/gallery/templates/gallery_template.php b/e107_plugins/gallery/templates/gallery_template.php
index ac8c8fd8c..39beceb98 100644
--- a/e107_plugins/gallery/templates/gallery_template.php
+++ b/e107_plugins/gallery/templates/gallery_template.php
@@ -1,13 +1,14 @@
 <?php
-
-/**
- * Copyright (c) 2012 e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
+/*
+ * e107 website system
+ *
+ * Copyright (C) 2008-2016 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
- * @file
  * Templates for "gallery" plugin.
  */
 
-
 $GALLERY_TEMPLATE['list']['caption'] = LAN_PLUGIN_GALLERY_TITLE;
 
 $GALLERY_TEMPLATE['list']['start'] = '{GALLERY_BREADCRUMB}
@@ -93,7 +94,7 @@ $GALLERY_TEMPLATE['prettyphoto']['content'] = '
 				<div class="pp_content">
 					<div class="pp_loaderIcon"></div>
 					<div class="pp_fade">
-						<a href="#" class="pp_expand" title="Expand the image">' . LAN_EXPAND . '</a>
+						<a href="#" class="pp_expand" title="'.LAN_GALLERY_FRONT_02.'">'.LAN_EXPAND.'</a>
 						<div class="pp_hoverContainer">
 							<a class="pp_next" href="#">' . LAN_NEXT . '</a>
 							<a class="pp_previous" href="#">' . LAN_PREVIOUS . '</a>