Index: /extensions/stripped/admin/admin.inc.php
===================================================================
--- /extensions/stripped/admin/admin.inc.php	(revision 12959)
+++ /extensions/stripped/admin/admin.inc.php	(revision 12960)
@@ -1,10 +1,23 @@
 <?php
-
-// Need upgrade?
 
 global $conf;
 
+// Need upgrade?
 if (!isset($conf['stripped']))
   include(PHPWG_THEMES_PATH.'stripped/admin/upgrade.inc.php');
+
+$stripped = unserialize( $conf['stripped'] );
+
+// Need upgrade from v1.x?
+if (!isset($stripped['themeStyle'])) {
+	include(PHPWG_THEMES_PATH.'stripped/admin/upgrade.inc.php');
+	$stripped = array_merge( unserialize( $conf['stripped'] ), (array)$stripped );
+}
+
+// Need upgrade from v2.x?
+if (!isset($stripped['paramVersion'])) {
+	include(PHPWG_THEMES_PATH.'stripped/admin/upgrade.inc.php');
+	$stripped = array_merge( unserialize( $conf['stripped'] ), (array)$stripped );
+}
 
 load_language('theme.lang', PHPWG_THEMES_PATH.'stripped/');
@@ -14,8 +27,12 @@
 if(isset($_POST['submit_stripped']))
 {
+	$config['paramVersion']='2.1';
+
 	$config['themeStyle']=$_POST['f_themeStyle'];
 	$config['hideMenu']=isset($_POST['f_hideMenu']);
 	$config['animatedMenu']=isset($_POST['f_animatedMenu']);
 	$config['noLowercase']=!isset($_POST['f_forceLowercase']);
+	$config['albumType']=$_POST['f_albumType'];
+	$config['albumFrame']=isset($_POST['f_albumFrame']);
 	$config['thumbFrame']=isset($_POST['f_thumbFrame']);
 	$config['showThumbLegend']=isset($_POST['f_showThumbLegend']);
Index: /extensions/stripped/admin/admin.tpl
===================================================================
--- /extensions/stripped/admin/admin.tpl	(revision 12959)
+++ /extensions/stripped/admin/admin.tpl	(revision 12960)
@@ -27,4 +27,17 @@
 					<span class="property">{'Force text to lowercase'|@translate}</span>&nbsp;
 					<input type="checkbox" name="f_forceLowercase" {if !($options.noLowercase)}checked{/if}>
+				</label></li>
+				<li><label>
+					<span class="property">{'Album list layout'|@translate}</span>&nbsp;
+					<select name="f_albumType" style="min-width:150px;">
+						<option value="small" {if ($options.albumType=="small")}selected{/if}>{'5 albums per row (no album description)'|@translate}</option>
+						<option value="3perline" {if ($options.albumType=="3perline")}selected{/if}>{'3 albums per row (description below thumbnail)'|@translate}</option>
+						<option value="2perline" {if ($options.albumType=="2perline")}selected{/if}>{'2 albums per row (description beside thumbnail)'|@translate}</option>
+						<option value="1perline" {if ($options.albumType=="1perline")}selected{/if}>{'1 album per row (description beside thumbnail)'|@translate}</option>
+					</select>
+				</label></li>
+				<li><label>
+					<span class="property">{'Display frame around albums'|@translate}</span>&nbsp;
+					<input type="checkbox" name="f_albumFrame" {if $options.albumFrame}checked{/if}>
 				</label></li>
 				<li><label>
Index: /extensions/stripped/admin/maintain.inc.php
===================================================================
--- /extensions/stripped/admin/maintain.inc.php	(revision 12959)
+++ /extensions/stripped/admin/maintain.inc.php	(revision 12960)
@@ -8,8 +8,12 @@
   {
     $config = array(
+	'paramVersion' 					=> '2.1',
+	
 	'themeStyle'					=> 'black',
 	'hideMenu'						=> true,
 	'animatedMenu'					=> true,
 	'noLowercase'					=> false,
+	'albumType'						=> 'small',
+	'albumFrame'					=> true,
 	'thumbFrame'					=> true,
 	'showThumbLegend'				=> false,
Index: /extensions/stripped/admin/upgrade.inc.php
===================================================================
--- /extensions/stripped/admin/upgrade.inc.php	(revision 12959)
+++ /extensions/stripped/admin/upgrade.inc.php	(revision 12960)
@@ -8,8 +8,12 @@
 {
     $config = array(
+	'paramVersion' 					=> '2.1',
+	
 	'themeStyle'					=> 'black',
 	'hideMenu'						=> true,
 	'animatedMenu'					=> true,
 	'noLowercase'					=> false,
+	'albumType'						=> 'small',
+	'albumFrame'					=> true,
 	'thumbFrame'					=> true,
 	'showThumbLegend'				=> false,
@@ -65,6 +69,18 @@
 		conf_update_param('stripped', pwg_db_real_escape_string(serialize($config)));
 	
+	} else {
+		if (isset($stripped['themeStyle']) & (!isset($stripped['paramVersion']))) {
+
+			$config = $stripped;
+			$config['paramVersion']='2.1';
+			$config['albumType']='small';
+			$config['albumFrame']=$config['thumbFrame'];
+			  
+			conf_update_param('stripped', pwg_db_real_escape_string(serialize($config)));
+		
+		}
+
 	}
-}
 
+	}
 ?>
Index: /extensions/stripped/js/scripts-tpp.js
===================================================================
--- /extensions/stripped/js/scripts-tpp.js	(revision 12959)
+++ /extensions/stripped/js/scripts-tpp.js	(revision 12960)
@@ -49,5 +49,5 @@
 	var tab_start = null;
 	
-	if (options.defaultTab) {
+	if ( (options.defaultTab) && (options.themeStyle == "original") ) {
 		if (options.defaultTab != "none") tab_start = options.defaultTab;
 		if (options.defaultTab == "last") tab_start = jQuery.cookie("tabactive");
@@ -92,8 +92,11 @@
 					var tab_title = jQuery(this);
 					tab_blocks.each(function(index2) {
-						if ((index1 == index2) && (options.animatedTabs)) {
-							jQuery(this).slideUp(delay, function() {tab_title.removeClass("tabSelected");});
-						} else {
-							jQuery(this).hide();
+						if (index1 == index2) {
+							if (options.animatedTabs) {
+								jQuery(this).slideUp(delay, function() {tab_title.removeClass("tabSelected");});
+							} else {
+								jQuery(this).hide();
+								tab_title.removeClass("tabSelected");
+							}
 						}
 					});
@@ -126,4 +129,27 @@
 			});
 		}); 
+		
+		if (options.themeStyle != "original") {
+			jQuery(".hideTabs").click(function() {
+				
+				tab_titles.each(function(index1) {
+					if (jQuery(this).hasClass("tabSelected")) {
+						var tab_title = jQuery(this);
+						tab_blocks.each(function(index2) {
+							if (index1 == index2) {
+								if (options.animatedTabs) {
+									jQuery(this).slideUp(delay, function() {tab_title.removeClass("tabSelected");});
+								} else {
+									jQuery(this).hide();
+									tab_title.removeClass("tabSelected");
+								}
+							}
+						});
+						jQuery.cookie("tabactive",null);
+					} 
+				});
+			
+			});
+		}
 	}
 
Index: /extensions/stripped/language/en_UK/theme.lang.php
===================================================================
--- /extensions/stripped/language/en_UK/theme.lang.php	(revision 12959)
+++ /extensions/stripped/language/en_UK/theme.lang.php	(revision 12960)
@@ -11,4 +11,10 @@
 $lang['Animate menu']='Animate menu';
 $lang['Force text to lowercase']='Force text to lowercase';
+$lang['Album list layout']='Album list layout';
+$lang['5 albums per row (no album description)']='5 albums per row (no album description)';
+$lang['3 albums per row (description below thumbnail)']='3 albums per row (description below thumbnail)';
+$lang['2 albums per row (description beside thumbnail)']='2 albums per row (description beside thumbnail)';
+$lang['1 album per row (description beside thumbnail)']='1 album per row (description beside thumbnail)';
+$lang['Display frame around albums'] = 'Display frame around albums';
 $lang['Display frame around thumbnails']='Display frame around thumbnails';
 $lang['Show thumbnail caption']='Show thumbnail caption';
Index: /extensions/stripped/language/fr_FR/theme.lang.php
===================================================================
--- /extensions/stripped/language/fr_FR/theme.lang.php	(revision 12959)
+++ /extensions/stripped/language/fr_FR/theme.lang.php	(revision 12960)
@@ -11,4 +11,10 @@
 $lang['Animate menu']='Menu anim&eacute;';
 $lang['Force text to lowercase']='Affichage forc&eacute; en minuscules';
+$lang['Album list layout']='Disposition des albums';
+$lang['5 albums per row (no album description)']='5 albums par ligne (pas de description)';
+$lang['3 albums per row (description below thumbnail)']='3 albums par ligne (description sous la miniature)';
+$lang['2 albums per row (description beside thumbnail)']='2 albums par ligne (description &agrave; c&ocirc;t&eacute; de la miniature)';
+$lang['1 album per row (description beside thumbnail)']='1 album par ligne (description &agrave; c&ocirc;t&eacute; de la miniature)';
+$lang['Display frame around albums'] = 'Afficher un cadre autour des albums';
 $lang['Display frame around thumbnails']='Afficher un cadre autour des miniatures';
 $lang['Show thumbnail caption']='Afficher la l&eacute;gende sous les miniatures';
@@ -19,5 +25,5 @@
 $lang['Use navigation arrows on picture']='Utiliser des fl&egrave;ches de navigation sur l\'image';
 $lang['Use navigation arrows outside picture']='Utiliser des fl&egrave;ches de navigation autour de l\'image';
-$lang['Property to display below picture']='Propri&eacute; &agrave; afficher en dessous de l\'image';
+$lang['Property to display below picture']='Propri&eacute;t&eacute; &agrave; afficher en dessous de l\'image';
 $lang['Title']='Titre';
 $lang['HD picture default display']='Affichage par d&eacute;faut de l\'image HD';
Index: /extensions/stripped/local_head.tpl
===================================================================
--- /extensions/stripped/local_head.tpl	(revision 12959)
+++ /extensions/stripped/local_head.tpl	(revision 12960)
@@ -33,14 +33,10 @@
 {/if}
 
-{if $BODY_ID=='theCategoryPage' || $BODY_ID=='thePicturePage'}
-	{include file='config.js.tpl'}
-{/if}
-
-{if ($BODY_ID=='theCategoryPage')}
-	{combine_script id='scripts-tcp' load='header' require='jquery.effects.blind' path='themes/stripped/js/scripts-tcp.js'}
-{/if}
+{include file='config.js.tpl'}
 
 {if $BODY_ID=='thePicturePage'}
 	{combine_script id='scripts-tpp' load='header' require='jquery' path='themes/stripped/js/scripts-tpp.js'}
+{else}
+	{combine_script id='scripts-tcp' load='header' require='jquery.effects.blind' path='themes/stripped/js/scripts-tcp.js'}
 {/if}
 
@@ -52,10 +48,2 @@
 	document.documentElement.className = 'js';
 </script>
-
-{if !$stripped.thumbFrame}
-	<script type="text/javascript">
-		document.documentElement.className = 'ntfd';
-		document.documentElement.className = 'js ntf';
-	</script>
-{/if}
-	
Index: /extensions/stripped/lowercase.css
===================================================================
--- /extensions/stripped/lowercase.css	(revision 12959)
+++ /extensions/stripped/lowercase.css	(revision 12960)
@@ -1,2 +1,3 @@
+input[type="submit"], input[type="reset"],
 #the_page  {
 	text-transform:lowercase;
Index: /extensions/stripped/readme.txt
===================================================================
--- /extensions/stripped/readme.txt	(revision 12959)
+++ /extensions/stripped/readme.txt	(revision 12960)
@@ -31,4 +31,10 @@
 Changelog
 ---------
+
+*** version 2.1.0
+
+- new options to choose album layout (it is now possible to display album descriptions)
+- menu is now available on all pages (except on image page)
+- several bug fixes
 
 *** version 2.0.4
Index: /extensions/stripped/template/about.tpl
===================================================================
--- /extensions/stripped/template/about.tpl	(revision 12959)
+++ /extensions/stripped/template/about.tpl	(revision 12960)
@@ -5,15 +5,30 @@
 <div class="titrePage">
 	<div class="browsePath">
-		<h2><a href="{$U_HOME}" title="{'return to homepage'|@translate}">{'Home'|@translate}</a>{$LEVEL_SEPARATOR}{'About'|@translate}</h2>
+		<h2>
+			{if isset($MENUBAR)}
+				<span id="menuswitcher" title="{'Show/hide menu'|@translate}">{'Menu'|@translate}</span><span class="arrow"> »</span>
+			{/if}
+			<a href="{$U_HOME}">{'Home'|@translate}</a>
+			{$LEVEL_SEPARATOR}{'About'|@translate}
+		</h2>
 	</div>
 </div>
 <div id="content">
-	<div id="piwigoAbout">
-		{$ABOUT_MESSAGE}
-		{if isset($THEME_ABOUT) }
-			<ul>
-				<li>{$THEME_ABOUT}</li>
-			</ul>
-		{/if}
+	{if isset($MENUBAR)}{$MENUBAR}{/if}
+	<div id="content_cell">
+		<div id="piwigoAbout" class="content_block">
+			{$ABOUT_MESSAGE}
+			{if isset($THEME_ABOUT) }
+				<ul>
+					<li>{$THEME_ABOUT}</li>
+				</ul>
+			{/if}
+			{if not empty($about_msgs)}
+				{foreach from=$about_msgs item=elt}
+					{$elt}
+				{/foreach}
+			{/if}
+		</div>
 	</div>
+	<div style="clear: both;"></div>
 </div>
Index: /extensions/stripped/template/comment_list.tpl
===================================================================
--- /extensions/stripped/template/comment_list.tpl	(revision 12959)
+++ /extensions/stripped/template/comment_list.tpl	(revision 12960)
@@ -9,24 +9,24 @@
 			{/if}
 			<div class="description">
-			{if isset($comment.U_DELETE) or isset($comment.U_VALIDATE) or isset($comment.U_EDIT) }
-				<div class="actions">
-					{if isset($comment.U_DELETE)}
-						<a href="{$comment.U_DELETE}" title="{'delete this comment'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');">
-							[{'Delete'|@translate}]
-						</a>
-					{/if}
-					{if isset($comment.U_EDIT) and !isset($comment.IN_EDIT)}
-						<a class="editComment" href="{$comment.U_EDIT}#edit_comment" title="{'edit this comment'|@translate}">
-							[{'edit'|@translate}]
-						</a>
-					{/if}
-					{if isset($comment.U_VALIDATE)}
-						<a href="{$comment.U_VALIDATE}" title="{'validate this comment'|@translate}">
-							[{'validate'|@translate}]
-						</a>
-					{/if}
-				</div>
-			{/if}
-			<span class="author">{$comment.AUTHOR}</span> - <span class="date">{$comment.DATE}</span>
+				{if isset($comment.U_DELETE) or isset($comment.U_VALIDATE) or isset($comment.U_EDIT) }
+					<div class="actions">
+						{if isset($comment.U_DELETE)}
+							<a href="{$comment.U_DELETE}" title="{'delete this comment'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');">
+								[{'Delete'|@translate}]
+							</a>
+						{/if}
+						{if isset($comment.U_EDIT) and !isset($comment.IN_EDIT)}
+							<a class="editComment" href="{$comment.U_EDIT}#edit_comment" title="{'edit this comment'|@translate}">
+								[{'edit'|@translate}]
+							</a>
+						{/if}
+						{if isset($comment.U_VALIDATE)}
+							<a href="{$comment.U_VALIDATE}" title="{'validate this comment'|@translate}">
+								[{'validate'|@translate}]
+							</a>
+						{/if}
+					</div>
+				{/if}
+				<span class="author">{$comment.AUTHOR}</span> - <span class="date">{$comment.DATE}</span>
 				{if isset($comment.IN_EDIT)}
 					<a name="edit_comment"></a>
Index: /extensions/stripped/template/comments.tpl
===================================================================
--- /extensions/stripped/template/comments.tpl	(revision 12959)
+++ /extensions/stripped/template/comments.tpl	(revision 12960)
@@ -6,55 +6,66 @@
 <div class="titrePage">
 	<div class="browsePath">
-		<h2><a href="{$U_HOME}" title="{'Home'|@translate}">{'Home'|@translate}</a>{$LEVEL_SEPARATOR}{'User comments'|@translate}</h2>
+		<h2>
+			{if isset($MENUBAR)}
+				<span id="menuswitcher" title="{'Show/hide menu'|@translate}">{'Menu'|@translate}</span><span class="arrow"> »</span>
+			{/if}
+			<a href="{$U_HOME}">{'Home'|@translate}</a>
+			{$LEVEL_SEPARATOR}{'User comments'|@translate}
+		</h2>
 	</div>
 </div>
 <div id="content">
-	<form class="filter" action="{$F_ACTION}" method="get">
-		<fieldset>
-			<legend>{'Filter'|@translate}</legend>
-			<label>{'Keyword'|@translate}&nbsp;<input type="text" name="keyword" value="{$F_KEYWORD}">&nbsp;&nbsp;</label>
-			<label>{'Author'|@translate}&nbsp;<input type="text" name="author" value="{$F_AUTHOR}">&nbsp;&nbsp;</label>
-			<label>
-				{'Album'|@translate}
-				<select name="cat">
-					<option value="0">------------</option>
-					{html_options options=$categories selected=$categories_selected}
-				</select>&nbsp;
-			</label>
-			<label>
-				{'Since'|@translate}
-				<select name="since">
-					{html_options options=$since_options selected=$since_options_selected}
-				</select>
-			</label>
-		</fieldset>
-		<fieldset>
-			<legend>{'Display'|@translate}</legend>
-			<label>
-				{'Sort by'|@translate}
-				<select name="sort_by">
-					{html_options options=$sort_by_options selected=$sort_by_options_selected}
-				</select>&nbsp;
-			</label>
-			<label>
-				{'Sort order'|@translate}
-				<select name="sort_order">
-					{html_options options=$sort_order_options selected=$sort_order_options_selected}
-				</select>&nbsp;
-			</label>
-			<label>
-				{'Number of items'|@translate}
-				<select name="items_number">
-					{html_options options=$item_number_options selected=$item_number_options_selected}
-				</select>
-			</label>
-		</fieldset>
-		<p><input class="submit" type="submit" value="{'Filter and display'|@translate}"></p>
-	</form>
-	{if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
-	{if isset($comments)}
-		<div id="comments">
-			{include file='comment_list.tpl'}
+	{if isset($MENUBAR)}{$MENUBAR}{/if}
+	<div id="content_cell">
+		<div class="content_block">
+			<form class="filter" action="{$F_ACTION}" method="get">
+				<fieldset>
+					<legend>{'Filter'|@translate}</legend>
+					<label>{'Keyword'|@translate}&nbsp;<input type="text" name="keyword" value="{$F_KEYWORD}">&nbsp;&nbsp;</label>
+					<label>{'Author'|@translate}&nbsp;<input type="text" name="author" value="{$F_AUTHOR}">&nbsp;&nbsp;</label>
+					<label>
+						{'Album'|@translate}
+						<select name="cat">
+							<option value="0">------------</option>
+							{html_options options=$categories selected=$categories_selected}
+						</select>&nbsp;
+					</label>
+					<label>
+						{'Since'|@translate}
+						<select name="since">
+							{html_options options=$since_options selected=$since_options_selected}
+						</select>
+					</label>
+				</fieldset>
+				<fieldset>
+					<legend>{'Display'|@translate}</legend>
+					<label>
+						{'Sort by'|@translate}
+						<select name="sort_by">
+							{html_options options=$sort_by_options selected=$sort_by_options_selected}
+						</select>&nbsp;
+					</label>
+					<label>
+						{'Sort order'|@translate}
+						<select name="sort_order">
+							{html_options options=$sort_order_options selected=$sort_order_options_selected}
+						</select>&nbsp;
+					</label>
+					<label>
+						{'Number of items'|@translate}
+						<select name="items_number">
+							{html_options options=$item_number_options selected=$item_number_options_selected}
+						</select>
+					</label>
+				</fieldset>
+				<p><input class="submit" type="submit" value="{'Filter and display'|@translate}"></p>
+			</form>
+			{if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
+			{if isset($comments)}
+				<div id="comments">
+					{include file='comment_list.tpl'}
+				</div>
+			{/if}
 		</div>
-	{/if}
+	</div>
 </div> <!-- content -->
Index: /extensions/stripped/template/config.js.tpl
===================================================================
--- /extensions/stripped/template/config.js.tpl	(revision 12959)
+++ /extensions/stripped/template/config.js.tpl	(revision 12960)
@@ -7,7 +7,4 @@
 	imageAutosizeMargin:{$stripped.imageAutosizeMargin},
 	imageAutosizeMinHeight:{$stripped.imageAutosizeMinHeight},
-{if $BODY_ID=='theCategoryPage'}
-	animatedMenu:{if $stripped.animatedMenu}true{else}false{/if}
-{/if}
 {if $BODY_ID=='thePicturePage'}
 	themeStyle:"{$stripped.themeStyle}",
@@ -19,4 +16,6 @@
 	highResClickMode:"{$stripped.highResClickMode}",
 	navArrows:{if $stripped.navArrows}true{else}false{/if}
+{else}
+	animatedMenu:{if $stripped.animatedMenu}true{else}false{/if}
 {/if} 
 {literal}
Index: /extensions/stripped/template/footer.tpl
===================================================================
--- /extensions/stripped/template/footer.tpl	(revision 12959)
+++ /extensions/stripped/template/footer.tpl	(revision 12960)
@@ -1,78 +1,71 @@
-<div id="footer">
-	<div id="footer_left">
-		
-		<a name="EoP"></a> <!-- End of Page -->
-		
-		{if isset($USERNAME)}
-			<div class="footer_login">
-				{if isset($U_PROFILE)}
-					 <div class="footer_customize">
-						[<a href="{$U_PROFILE}" title="{'customize the appareance of the gallery'|@translate}">{$USERNAME}</a>]&nbsp;
-					</div>
-				{else}
-					[{$USERNAME}]&nbsp;
-				{/if}
+			<div id="footer">
+				<div id="footer_left">
+					{if isset($USERNAME)}
+						<div class="footer_login">
+							{if isset($U_PROFILE)}
+								<div class="footer_customize">
+									[<a href="{$U_PROFILE}" title="{'customize the appareance of the gallery'|@translate}">{$USERNAME}</a>]&nbsp;
+								</div>
+							{else}
+								[{$USERNAME}]&nbsp;
+							{/if}
+						</div>
+					{/if}
+
+					{if isset($U_LOGIN)}
+						<a href="{$U_LOGIN}" rel="nofollow">{'Login'|@translate}</a>
+					{/if}
+
+					{if (isset($U_LOGIN) && isset($U_REGISTER))}-{/if}
+					
+					{if isset($U_REGISTER)}
+						<a href="{$U_REGISTER}" title="{'Create a new account'|@translate}" rel="nofollow">{'Register'|@translate}</a>
+					{/if}
+
+					{if isset($U_LOGOUT)}
+						<a href="{$U_LOGOUT}">{'Logout'|@translate}</a>
+					{/if}
+
+					{if (isset($U_LOGOUT) && isset($U_ADMIN))}-{/if}
+
+					{if isset($U_ADMIN)}
+						<a href="{$U_ADMIN}" title="{'available for administrators only'|@translate}">{'Administration'|@translate}</a>
+					{/if}
+
+					{get_combined_scripts load='footer'}
+
+					{if isset($footer_elements)}
+						{foreach from=$footer_elements item=v}
+							{$v}
+						{/foreach}
+					{/if}
+				</div>
+				
+				<div id="copyright">
+					{*
+						Please, do not remove this copyright. If you really want to,
+								contact us on http://piwigo.org to find a solution on how
+								to show the origin of the script...
+					*}
+					{'Powered by'|@translate}
+					<a href="{$PHPWG_URL}" class="Piwigo"><span class="Piwigo">Piwigo</span></a>
+					{$VERSION}
+
+					{if isset($CONTACT_MAIL)}
+						 - {'Contact'|@translate}
+						<a href="mailto:{$CONTACT_MAIL}?subject={'A comment on your site'|@translate|@escape:url}">{'Webmaster'|@translate} </a>
+					{/if}
+
+					{if isset($debug.TIME) }
+					 - {'Page generated in'|@translate} {$debug.TIME} ({$debug.NB_QUERIES} {'SQL queries in'|@translate} {$debug.SQL_TIME})
+					{/if}
+				</div>{* copyright *}
+			</div>
+		</div>{* the_page *}
+		{if isset($debug.QUERIES_LIST)}
+			<div id="debug">
+				{$debug.QUERIES_LIST}
 			</div>
 		{/if}
-
-		{if isset($U_LOGIN)}
-			<a href="{$U_LOGIN}" rel="nofollow">{'Login'|@translate}</a>
-		{/if}
-
-		{if (isset($U_LOGIN) && isset($U_REGISTER))}-{/if}
-		
-		{if isset($U_REGISTER)}
-			<a href="{$U_REGISTER}" title="{'Create a new account'|@translate}" rel="nofollow">{'Register'|@translate}</a>
-		{/if}
-
-		{if isset($U_LOGOUT)}
-			<a href="{$U_LOGOUT}">{'Logout'|@translate}</a>
-		{/if}
-
-		{if (isset($U_LOGOUT) && isset($U_ADMIN))}-{/if}
-
-		{if isset($U_ADMIN)}
-			<a href="{$U_ADMIN}" title="{'available for administrators only'|@translate}">{'Administration'|@translate}</a>
-		{/if}
-
-	</div>
-
-	{get_combined_scripts load='footer'}
-
-	{if isset($footer_elements)}
-	{foreach from=$footer_elements item=v}
-	{$v}
-	{/foreach}
-	{/if}
-	
-	<div id="copyright">
-	 {* Please, do not remove this copyright. If you really want to,
-		  contact us on http://piwigo.org to find a solution on how
-		  to show the origin of the script...
-	  *}
-
-	  {'Powered by'|@translate}
-	  <a href="{$PHPWG_URL}" class="Piwigo">
-	  <span class="Piwigo">Piwigo</span></a>
-	  {$VERSION}
-
-	  {if isset($CONTACT_MAIL)}
-	  {'Contact'|@translate}
-	  <a href="mailto:{$CONTACT_MAIL}?subject={'A comment on your site'|@translate|@escape:url}">- {'Webmaster'|@translate} </a>
-	  {/if}
-
-	  {if isset($debug.TIME) }
-	 - {'Page generated in'|@translate} {$debug.TIME} ({$debug.NB_QUERIES} {'SQL queries in'|@translate} {$debug.SQL_TIME})
-	 {/if}
-
-
-	</div>
-</div>
-</div><!-- the_page -->
-{if isset($debug.QUERIES_LIST)}
-<div id="debug">
-{$debug.QUERIES_LIST}
-</div>
-{/if}
-</body>
+	</body>
 </html>
Index: /extensions/stripped/template/header.tpl
===================================================================
--- /extensions/stripped/template/header.tpl	(revision 12959)
+++ /extensions/stripped/template/header.tpl	(revision 12960)
@@ -56,5 +56,12 @@
 </head>
 
-<body id="{$BODY_ID}">
+<body id="{$BODY_ID}" class={strip}"
+	{if !$stripped.thumbFrame} ntf{/if}
+	{if !$stripped.albumFrame} naf{/if}
+	{if ($stripped.albumType == 'small')} ats{else} atd{/if}
+	{if ($stripped.albumType == '1perline')} at1{/if}
+	{if ($stripped.albumType == '2perline')} at2{/if}
+	{if ($stripped.albumType == '3perline')} at3{/if}
+"{/strip}>
 <div id="the_page">
 
Index: /extensions/stripped/template/identification.tpl
===================================================================
--- /extensions/stripped/template/identification.tpl	(revision 12959)
+++ /extensions/stripped/template/identification.tpl	(revision 12960)
@@ -3,58 +3,70 @@
 	$this->assign('LEVEL_SEPARATOR', $conf[ 'level_separator' ]);
 {/php}
+
 <div class="titrePage">
 	<div class="browsePath">
-		<h2><a href="{$U_HOME}" title="{'Go through the gallery as a visitor'|@translate}">{'Home'|@translate}</a>{$LEVEL_SEPARATOR}{'Identification'|@translate}</h2>
+		<h2>
+			{if isset($MENUBAR)}
+				<span id="menuswitcher" title="{'Show/hide menu'|@translate}">{'Menu'|@translate}</span><span class="arrow"> »</span>
+			{/if}
+			<a href="{$U_HOME}">{'Home'|@translate}</a>
+			{$LEVEL_SEPARATOR}{'Identification'|@translate}
+		</h2>
 	</div>
 </div>
 <div id="content">
-	{if isset($errors) }
-		<div class="errors">
-			<ul>
-				{foreach from=$errors item=error}
-					<li>{$error}</li>
-				{/foreach}
-			</ul>
+	{if isset($MENUBAR)}{$MENUBAR}{/if}
+	<div id="content_cell">
+		<div class="content_block">
+			{if isset($errors) }
+				<div class="errors">
+					<ul>
+						{foreach from=$errors item=error}
+							<li>{$error}</li>
+						{/foreach}
+					</ul>
+				</div>
+			{/if}
+			<form action="{$F_LOGIN_ACTION}" method="post" name="login_form">
+				<fieldset>
+					<legend>{'Connection settings'|@translate}</legend>
+					<input type="hidden" name="redirect" value="{$U_REDIRECT|urlencode}">
+					<ul>
+						<li>
+							<span class="property">
+								<label for="username">{'Username'|@translate}</label>
+							</span>
+							<input tabindex="1" class="login" type="text" name="username" id="username" size="25" maxlength="40">
+						</li>
+						<li>
+							<span class="property">
+								<label for="password">{'Password'|@translate}</label>
+							</span>
+							<input tabindex="2" class="login" type="password" name="password" id="password" size="25" maxlength="25">
+						</li>
+						{if $authorize_remembering }
+							<li>
+								<span class="property">
+									<label for="Auto login">{'Auto login'|@translate}</label>
+								</span>
+								<input tabindex="3" type="checkbox" name="remember_me" id="remember_me" value="1">
+							</li>
+						{/if}
+					</ul>
+				</fieldset>
+				<p><input class="submit" tabindex="4" type="submit" name="login" value="{'Submit'|@translate}"></p>
+				<p>
+					{if isset($U_REGISTER) }
+						<a href="{$U_REGISTER}" title="{'Register'|@translate}">{'Register'|@translate}</a>&nbsp;-
+					{/if}
+					<a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}">{'Forgot your password?'|@translate}</a>
+				</p>
+			</form>
+			<script type="text/javascript">
+				<!--
+				document.login_form.username.focus();
+				//-->
+			</script>
 		</div>
-	{/if}
-	<form action="{$F_LOGIN_ACTION}" method="post" name="login_form">
-		<fieldset>
-			<legend>{'Connection settings'|@translate}</legend>
-			<input type="hidden" name="redirect" value="{$U_REDIRECT|urlencode}">
-			<ul>
-				<li>
-					<span class="property">
-						<label for="username">{'Username'|@translate}</label>
-					</span>
-					<input tabindex="1" class="login" type="text" name="username" id="username" size="25" maxlength="40">
-				</li>
-				<li>
-					<span class="property">
-						<label for="password">{'Password'|@translate}</label>
-					</span>
-					<input tabindex="2" class="login" type="password" name="password" id="password" size="25" maxlength="25">
-				</li>
-				{if $authorize_remembering }
-					<li>
-						<span class="property">
-							<label for="Auto login">{'Auto login'|@translate}</label>
-						</span>
-						<input tabindex="3" type="checkbox" name="remember_me" id="remember_me" value="1">
-					</li>
-				{/if}
-			</ul>
-		</fieldset>
-		<p><input class="submit" tabindex="4" type="submit" name="login" value="{'Submit'|@translate}"></p>
-		<p>
-			{if isset($U_REGISTER) }
-				<a href="{$U_REGISTER}" title="{'Register'|@translate}">{'Register'|@translate}</a>&nbsp;-
-			{/if}
-			<a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}">{'Forgot your password?'|@translate}</a>
-		</p>
-	</form>
-	<script type="text/javascript">
-		<!--
-		document.login_form.username.focus();
-		//-->
-	</script>
+	</div>
 </div> <!-- content -->
Index: /extensions/stripped/template/index.tpl
===================================================================
--- /extensions/stripped/template/index.tpl	(revision 12959)
+++ /extensions/stripped/template/index.tpl	(revision 12960)
@@ -13,4 +13,8 @@
 			<ul class="categoryActions group1">
 				{if !empty($PLUGIN_INDEX_ACTIONS)}{$PLUGIN_INDEX_ACTIONS}{/if}
+				{if isset($U_SEARCH_RULES)}
+					{combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'}
+					<li><a href="{$U_SEARCH_RULES}" onclick="popuphelp(this.href); return false;" title="{'Search rules'|@translate}" rel="nofollow">{'Help'|@translate}</a></li>
+				{/if}
 				{if isset($U_SLIDESHOW)}
 					<li class="mainAction"><a href="{$U_SLIDESHOW}" title="{'slideshow'|@translate}" rel="nofollow">{'slideshow'|@translate}</a></li>
Index: /extensions/stripped/template/mainpage_categories.tpl
===================================================================
--- /extensions/stripped/template/mainpage_categories.tpl	(revision 12959)
+++ /extensions/stripped/template/mainpage_categories.tpl	(revision 12960)
@@ -1,5 +1,9 @@
+{php}
+	global $stripped;
+	$this->assign( 'stripped', $stripped );
+{/php}
 <ul class="thumbnailCategories">
-  {foreach from=$category_thumbnails item=cat}
-  <li>
+  {foreach from=$category_thumbnails item=cat name=catloop}
+  <li class="odd{if ($smarty.foreach.catloop.iteration-1) % 2 == 0}0{else}1{/if}" {if ($stripped.albumFrame)}onclick="window.location='{$cat.URL}';"{/if}>
 	<div class="thumbnailCategory">
 		<div class="illustration">
@@ -12,14 +16,14 @@
 				<a href="{$cat.URL}">{$cat.NAME}</a>
 				{if !empty($cat.icon_ts)}
-				<img title="{$cat.icon_ts.TITLE}" src="{$ROOT_URL}{$themeconf.icon_dir}/recent_album{if $cat.icon_ts.IS_CHILD_DATE}_by_child{/if}.png" class="icon" alt="(!)">
+				<img title="{$cat.icon_ts.TITLE}" src="{$ROOT_URL}{$themeconf.icon_dir}/recent{if $cat.icon_ts.IS_CHILD_DATE}_by_child{/if}.png" alt="(!)">
 				{/if}
 			</h3>
-			<div class="text">
+			<div class="text" {if !$stripped.albumFrame}onclick="window.location='{$cat.URL}';"{/if}>
 				  {if isset($cat.INFO_DATES) }
-				  <p class="thumbCatDescNfoDate">{$cat.INFO_DATES}</p>
+				  <p class="dates">{$cat.INFO_DATES}</p>
 				  {/if}
-				  <p class="thumbCatDescNbImg">{$cat.CAPTION_NB_IMAGES}</p>
+				  <p class="Nb_images">{$cat.CAPTION_NB_IMAGES}</p>
 				  {if not empty($cat.DESCRIPTION)}
-				  <p class="thumbCatDesc">{$cat.DESCRIPTION}</p>
+				  <p>{$cat.DESCRIPTION}</p>
 				  {/if}
 			</div>
Index: /extensions/stripped/template/menubar.tpl
===================================================================
--- /extensions/stripped/template/menubar.tpl	(revision 12959)
+++ /extensions/stripped/template/menubar.tpl	(revision 12960)
@@ -2,13 +2,11 @@
 <div id="menubar">
 	{foreach from=$blocks key=id item=block}
-		{if ( not empty($block->template) or not empty($block->raw_content) )}
-			<dl id="{$id}">
-				{if not empty($block->template)}
-					{include file=$block->template|@get_extent:$id }
-				{else}
-					{$block->raw_content}
-				{/if}
-			</dl>
+	<dl id="{$id}">
+		{if not empty($block->template)}
+			{include file=$block->template|@get_extent:$id }
+		{else}
+			{$block->raw_content}
 		{/if}
+	</dl>
 	{/foreach}
 </div>
Index: /extensions/stripped/template/menubar_categories.tpl
===================================================================
--- /extensions/stripped/template/menubar_categories.tpl	(revision 12959)
+++ /extensions/stripped/template/menubar_categories.tpl	(revision 12960)
@@ -3,23 +3,23 @@
 </dt>
 <dd>
-{assign var='ref_level' value=0}
-{foreach from=$block->data.MENU_CATEGORIES item=cat}
-  {if $cat.LEVEL > $ref_level}
-  <ul>
-  {else}
-    </li>
-    {'</ul></li>'|@str_repeat:$ref_level-$cat.LEVEL}
-  {/if}
-    <li {if $cat.SELECTED}class="selected"{/if}>
-      <a href="{$cat.URL}" {if $cat.IS_UPPERCAT}rel="up"{/if} title="{$cat.TITLE}">{$cat.NAME}</a>
-      {if !empty($cat.icon_ts)}
-      <img title="{$cat.icon_ts.TITLE}" src="{$ROOT_URL}{$themeconf.icon_dir}/recent{if $cat.icon_ts.IS_CHILD_DATE}_by_child{/if}.png" class="icon" alt="(!)">
-      {/if}
-      {if $cat.count_images > 0}
-      <span class="{if $cat.nb_images > 0}menuInfoCat{else}menuInfoCatByChild{/if}" title="{$cat.TITLE}">[{$cat.count_images}]</span>
-      {/if}
-  {assign var='ref_level' value=$cat.LEVEL}
-{/foreach}
-{'</li></ul>'|@str_repeat:$ref_level}
+	{assign var='ref_level' value=0}
+	{foreach from=$block->data.MENU_CATEGORIES item=cat}
+		{if $cat.LEVEL > $ref_level}
+			<ul>
+		{else}
+			</li>
+			{'</ul></li>'|@str_repeat:$ref_level-$cat.LEVEL}
+		{/if}
+		<li {if $cat.SELECTED}class="selected"{/if}>
+			<a href="{$cat.URL}" {if $cat.IS_UPPERCAT}rel="up"{/if} title="{$cat.TITLE}">{$cat.NAME}</a>
+			{if !empty($cat.icon_ts)}
+				<img title="{$cat.icon_ts.TITLE}" src="{$ROOT_URL}{$themeconf.icon_dir}/recent{if $cat.icon_ts.IS_CHILD_DATE}_by_child{/if}.png" class="icon" alt="(!)">
+			{/if}
+			{if $cat.count_images > 0}
+				<span class="{if $cat.nb_images > 0}menuInfoCat{else}menuInfoCatByChild{/if}" title="{$cat.TITLE}">[{$cat.count_images}]</span>
+			{/if}
+			{assign var='ref_level' value=$cat.LEVEL}
+	{/foreach}
+	{'</li></ul>'|@str_repeat:$ref_level}
 
 	<p class="totalImages">{$pwg->l10n_dec('%d photo', '%d photos', $block->data.NB_PICTURE)}</p>
Index: /extensions/stripped/template/menubar_identification.tpl
===================================================================
--- /extensions/stripped/template/menubar_identification.tpl	(revision 12959)
+++ /extensions/stripped/template/menubar_identification.tpl	(revision 12960)
@@ -1,19 +1,15 @@
 {if isset($U_LOGIN)}
-<dt>{'Quick connect'|@translate}</dt>
-<dd>
+	<dt>{'Quick connect'|@translate}</dt>
+	<dd>
 		<form method="post" action="{$U_LOGIN}" id="quickconnect">
-{*		<fieldset>*}
-		<div>
-			<label for="username">{'Username'|@translate}</label><br>
-			<input type="text" name="username" id="username" value="">
-		</div>
-		<p>
-		<div>
-			<label for="password">{'Password'|@translate}</label>
-			<input type="password" name="password" id="password" value="">
-		</div>
-
+			<div>
+				<label for="username">{'Username'|@translate}</label>
+				<input type="text" name="username" id="username" value="">
+			</div>
+			<div>
+				<label for="password">{'Password'|@translate}</label>
+				<input type="password" name="password" id="password" value="">
+			</div>
 			{if $AUTHORIZE_REMEMBERING}
-				<p>
 				<div>
 					<label for="remember_me">{'Auto login'|@translate}
@@ -22,17 +18,13 @@
 				</div>
 			{/if}
-		<p>
-		<p>
-		<div class="submit_block">
-			<input type="hidden" name="redirect" value="{$smarty.server.REQUEST_URI|@urlencode}">
-			<input class="submit" type="submit" name="login" value="{'Submit'|@translate}">
-			<ul class="actions">
-				<li><a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}" rel="nofollow">{'Forgot your password?'|@translate}</a></li>
-			</ul>
-		</div>
-
-{*		</fieldset>*}
+			<div class="submit_block">
+				<input type="hidden" name="redirect" value="{$smarty.server.REQUEST_URI|@urlencode}">
+				<input class="submit" type="submit" name="login" value="{'Submit'|@translate}">
+				<ul class="actions">
+					<li><a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}" rel="nofollow">{'Forgot your password?'|@translate}</a></li>
+				</ul>
+			</div>
 		</form>
-</dd>
+	</dd>
 {/if}
 
Index: /extensions/stripped/template/menubar_links.tpl
===================================================================
--- /extensions/stripped/template/menubar_links.tpl	(revision 12959)
+++ /extensions/stripped/template/menubar_links.tpl	(revision 12960)
@@ -1,15 +1,12 @@
 <dt>{'Links'|@translate}</dt>
 <dd>
-	<ul>
+	<ul>{strip}
 		{foreach from=$block->data item=link}
 			<li>
-				<a href="{$link.URL}" class="external" 
-					{if isset($link.new_window) } onclick="window.open(this.href, '{$link.new_window.NAME}','{$link.new_window.FEATURES}'); return false;"{/if}
-				>
+				<a href="{$link.URL}" class="external"{if isset($link.new_window)} onclick="window.open(this.href, '{$link.new_window.NAME}','{$link.new_window.FEATURES}'); return false;"{/if}>
 				{$link.LABEL}
 				</a>
 			</li>
 		{/foreach}
-	</ul>
+	{/strip}</ul>
 </dd>
-
Index: /extensions/stripped/template/menubar_menu.tpl
===================================================================
--- /extensions/stripped/template/menubar_menu.tpl	(revision 12959)
+++ /extensions/stripped/template/menubar_menu.tpl	(revision 12960)
@@ -1,20 +1,18 @@
 <dt>{'Menu'|@translate}</dt>
 <dd>
-  {if isset($block->data.qsearch) and  $block->data.qsearch==true}
-    <form action="{$ROOT_URL}qsearch.php" method="get" id="quicksearch" onsubmit="return this.q.value!='' && this.q.value!=qsearch_prompt;">
-      <p style="margin:0;padding:0"{*this <p> is for html validation only - does not affect positioning*}>
-        <input type="text" name="q" id="qsearchInput" onfocus="if (value==qsearch_prompt) value='';" onblur="if (value=='') value=qsearch_prompt;">
-      </p>
-    </form>
-    <script type="text/javascript">var qsearch_prompt="{'Quick search'|@translate|@escape:'javascript'}"; document.getElementById('qsearchInput').value=qsearch_prompt;</script>
-  {/if}
-
-	<ul>
+{if isset($block->data.qsearch) and  $block->data.qsearch==true}
+	<form action="{$ROOT_URL}qsearch.php" method="get" id="quicksearch" onsubmit="return this.q.value!='' && this.q.value!=qsearch_prompt;">
+		<p style="margin:0;padding:0"{*this <p> is for html validation only - does not affect positioning*}>
+			<input type="text" name="q" id="qsearchInput" onfocus="if (value==qsearch_prompt) value='';" onblur="if (value=='') value=qsearch_prompt;" style="width:90%">
+		</p>
+	</form>
+	<script type="text/javascript">var qsearch_prompt="{'Quick search'|@translate|@escape:'javascript'}"; document.getElementById('qsearchInput').value=qsearch_prompt;</script>
+{/if}
+	<ul>{strip}
 	{foreach from=$block->data item=link}
 		{if is_array($link)}
-			<li><a href="{$link.URL}" title="{$link.TITLE}" {if isset($link.REL)}{$link.REL}{/if}>{$link.NAME}</a></li>
+			<li><a href="{$link.URL}" title="{$link.TITLE}"{if isset($link.REL)} {$link.REL}{/if}>{$link.NAME}</a></li>
 		{/if}
 	{/foreach}
-	</ul>
+	{/strip}</ul>
 </dd>
-
Index: /extensions/stripped/template/menubar_specials.tpl
===================================================================
--- /extensions/stripped/template/menubar_specials.tpl	(revision 12959)
+++ /extensions/stripped/template/menubar_specials.tpl	(revision 12960)
@@ -1,9 +1,8 @@
 <dt>{'Specials'|@translate}</dt>
 <dd>
-	<ul>
+	<ul>{strip}
 		{foreach from=$block->data item=link}
-		<li><a href="{$link.URL}" title="{$link.TITLE}" {if isset($link.REL)}{$link.REL}{/if}>{$link.NAME}</a></li>
+		<li><a href="{$link.URL}" title="{$link.TITLE}"{if isset($link.REL)} {$link.REL}{/if}>{$link.NAME}</a></li>
 		{/foreach}
-	</ul>
+	{/strip}</ul>
 </dd>
-
Index: /extensions/stripped/template/menubar_tags.tpl
===================================================================
--- /extensions/stripped/template/menubar_tags.tpl	(revision 12959)
+++ /extensions/stripped/template/menubar_tags.tpl	(revision 12960)
@@ -3,15 +3,12 @@
 	<div id="menuTagCloud">
 		{foreach from=$block->data item=tag}
-		<span>
-			<a class="tagLevel{$tag.level}"
+		<span>{strip}
+			<a class="tagLevel{$tag.level}" href=
 			{if isset($tag.U_ADD)}
-				href="{$tag.U_ADD}"
-				title="{$pwg->l10n_dec('%d photo is also linked to current tags', '%d photos are also linked to current tags', $tag.counter)}"
-				rel="nofollow">+
+				"{$tag.U_ADD}" title="{$pwg->l10n_dec('%d photo is also linked to current tags', '%d photos are also linked to current tags', $tag.counter)}" rel="nofollow">+
 			{else}
-				href="{$tag.URL}"
-				title="{'display photos linked to this tag'|@translate}">
+				"{$tag.URL}" title="{'display photos linked to this tag'|@translate}">
 			{/if}
-				{$tag.name}</a></span>
+				{$tag.name}</a></span>{/strip}
 {* ABOVE there should be no space between text, </a> and </span> elements to avoid IE8 bug https://connect.microsoft.com/IE/feedback/ViewFeedback.aspx?FeedbackID=366567 *}
 		{/foreach}
Index: /extensions/stripped/template/month_calendar.tpl
===================================================================
--- /extensions/stripped/template/month_calendar.tpl	(revision 12959)
+++ /extensions/stripped/template/month_calendar.tpl	(revision 12960)
@@ -1,86 +1,86 @@
 <div id="calendar_block">
-{if !empty($chronology_navigation_bars) }
-{foreach from=$chronology_navigation_bars item=bar}
-<div class="calendarBar">
-	{if isset($bar.previous)}
-		<div style="float:left">&laquo; <a href="{$bar.previous.URL}">{$bar.previous.LABEL}</a></div>
-	{/if}
-	{if isset($bar.next)}
-		<div style="float:right"><a href="{$bar.next.URL}">{$bar.next.LABEL}</a> &raquo;</div>
-	{/if}
-	{if empty($bar.items)}
-		&nbsp;
-	{else}
-		{foreach from=$bar.items item=item}
-		<span class="calItem{if !isset($item.URL)}Empty{/if}" {if isset($item.NB_IMAGES)}title="{$pwg->l10n_dec('%d photo', '%d photos', $item.NB_IMAGES)}"{/if}>
-		{if isset($item.URL)}
-		<a href="{$item.URL}">{$item.LABEL}</a>
-		{else}
-		{$item.LABEL}
-		{/if}
-		</span>
+	{if !empty($chronology_navigation_bars) }
+		{foreach from=$chronology_navigation_bars item=bar}
+			<div class="calendarBar">
+				{if isset($bar.previous)}
+					<div style="float:left">&laquo; <a href="{$bar.previous.URL}">{$bar.previous.LABEL}</a></div>
+				{/if}
+				{if isset($bar.next)}
+					<div style="float:right"><a href="{$bar.next.URL}">{$bar.next.LABEL}</a> &raquo;</div>
+				{/if}
+				{if empty($bar.items)}
+					&nbsp;
+				{else}
+					{foreach from=$bar.items item=item}
+						<span class="calItem{if !isset($item.URL)}Empty{/if}" {if isset($item.NB_IMAGES)}title="{$pwg->l10n_dec('%d photo', '%d photos', $item.NB_IMAGES)}"{/if}>
+							{if isset($item.URL)}
+								<a href="{$item.URL}">{$item.LABEL}</a>
+							{else}
+								{$item.LABEL}
+							{/if}
+						</span>
+					{/foreach}
+				{/if}
+			</div>
 		{/foreach}
 	{/if}
+
+	{if !empty($chronology_calendar.calendar_bars) }
+		{foreach from=$chronology_calendar.calendar_bars item=bar}
+			<div class="calendarCalBar">
+				<span class="calCalHead"><a href="{$bar.U_HEAD}">{$bar.HEAD_LABEL}</a>  ({$bar.NB_IMAGES})</span><br>
+				{foreach from=$bar.items item=item}
+					<span class="calCal{if !isset($item.URL)}Empty{/if}">
+						{if isset($item.URL)}
+							<a href="{$item.URL}">{$item.LABEL}</a>
+						{else}
+							{$item.LABEL}
+						{/if}
+						{if isset($item.NB_IMAGES)}({$item.NB_IMAGES}){/if}
+					</span>
+				{/foreach}
+			</div>
+		{/foreach}
+	{/if}
+
+	{if isset($chronology_calendar.month_view) }
+		<table class="calMonth">
+			<thead>
+				<tr>
+					{foreach from=$chronology_calendar.month_view.wday_labels item=wday}
+						<td class="calDayHead">{$wday}</td>
+					{/foreach}
+				</tr>
+			</thead>
+			{html_head} {*add the style to html head for strict standard compliance*}
+				<style type="text/css">
+					TABLE.calMonth TBODY TD, TABLE.calMonth TBODY TD DIV.calImg {ldelim}
+					width:{$chronology_calendar.month_view.CELL_WIDTH}px;height:{$chronology_calendar.month_view.CELL_HEIGHT}px;
+					}
+				</style>
+			{/html_head}
+			{foreach from=$chronology_calendar.month_view.weeks item=week}
+				<tr>
+					{foreach from=$week item=day}
+						{if !empty($day)}
+							{if isset($day.IMAGE)}
+								<td class="calDayCellFull">
+									<div class="calBackDate">{$day.DAY}</div><div class="calForeDate">{$day.DAY}</div>
+									<div class="calImg">
+										<a href="{$day.U_IMG_LINK}">
+											<img style="{$day.IMAGE_STYLE}" src="{$day.IMAGE}" alt="{$day.IMAGE_ALT}" title="{$pwg->l10n_dec('%d photo','%d photos', $day.NB_ELEMENTS)}">
+										</a>
+									</div>
+							{else}
+								<td class="calDayCellEmpty">{$day.DAY}
+							{/if}
+						{else}
+							<td class="calDayCellBlank">
+						{/if}
+						</td>
+					{/foreach} {*day in week*}
+				</tr>
+			{/foreach}  {*week in month*}
+		</table>
+	{/if}
 </div>
-{/foreach}
-{/if}
-
-{if !empty($chronology_calendar.calendar_bars) }
-{foreach from=$chronology_calendar.calendar_bars item=bar}
-<div class="calendarCalBar">
-	<span class="calCalHead"><a href="{$bar.U_HEAD}">{$bar.HEAD_LABEL}</a>  ({$bar.NB_IMAGES})</span><br>
-	{foreach from=$bar.items item=item}
-	<span class="calCal{if !isset($item.URL)}Empty{/if}">
-	{if isset($item.URL)}
-	<a href="{$item.URL}">{$item.LABEL}</a>
-	{else}
-	{$item.LABEL}
-	{/if}
-	{if isset($item.NB_IMAGES)}({$item.NB_IMAGES}){/if}
-	</span>
-	{/foreach}
-</div>
-{/foreach}
-{/if}
-
-{if isset($chronology_calendar.month_view) }
-<table class="calMonth">
- <thead>
- <tr>
- {foreach from=$chronology_calendar.month_view.wday_labels item=wday}
-	<td class="calDayHead">{$wday}</td>
- {/foreach}
- </tr>
- </thead>
-{html_head} {*add the style to html head for strict standard compliance*}
-<style type="text/css">
-TABLE.calMonth TBODY TD, TABLE.calMonth TBODY TD DIV.calImg {ldelim}
-  width:{$chronology_calendar.month_view.CELL_WIDTH}px;height:{$chronology_calendar.month_view.CELL_HEIGHT}px;
-}
-</style>
-{/html_head}
- {foreach from=$chronology_calendar.month_view.weeks item=week}
- <tr>
- 	{foreach from=$week item=day}
- 	{if !empty($day)}
- 		{if isset($day.IMAGE)}
- 			<td class="calDayCellFull">
-	 			<div class="calBackDate">{$day.DAY}</div><div class="calForeDate">{$day.DAY}</div>
-	 			<div class="calImg">
-					<a href="{$day.U_IMG_LINK}">
-			  			<img style="{$day.IMAGE_STYLE}" src="{$day.IMAGE}" alt="{$day.IMAGE_ALT}" title="{$pwg->l10n_dec('%d photo','%d photos', $day.NB_ELEMENTS)}">
-					</a>
-				</div>
- 		{else}
- 			<td class="calDayCellEmpty">{$day.DAY}
- 		{/if}
- 	{else}
- 		<td class="calDayCellBlank">
- 	{/if}
- 	</td>
- 	{/foreach} {*day in week*}
- </tr>
- {/foreach}  {*week in month*}
-</table>
-{/if}
-</div>
Index: /extensions/stripped/template/nbm.tpl
===================================================================
--- /extensions/stripped/template/nbm.tpl	(revision 12959)
+++ /extensions/stripped/template/nbm.tpl	(revision 12960)
@@ -5,25 +5,36 @@
 <div class="titrePage">
 	<div class="browsePath">
-		<h2><a href="{$U_HOME}" title="{'Go through the gallery as a visitor'|@translate}">{'Home'|@translate}</a>{$LEVEL_SEPARATOR}{'Notification'|@translate}</h2>
+		<h2>
+			{if isset($MENUBAR)}
+				<span id="menuswitcher" title="{'Show/hide menu'|@translate}">{'Menu'|@translate}</span><span class="arrow"> »</span>
+			{/if}
+			<a href="{$U_HOME}">{'Home'|@translate}</a>
+			{$LEVEL_SEPARATOR}{'Notification'|@translate}
+		</h2>
 	</div>
 </div>
 <div id="content">
-	{if not empty($errors)}
-		<div class="errors">
-			<ul>
-				{foreach from=$errors item=error}
-					<li>{$error}</li>
-				{/foreach}
-			</ul>
+	{if isset($MENUBAR)}{$MENUBAR}{/if}
+	<div id="content_cell">
+		<div class="content_block">
+			{if not empty($errors)}
+				<div class="errors">
+					<ul>
+						{foreach from=$errors item=error}
+							<li>{$error}</li>
+						{/foreach}
+					</ul>
+				</div>
+			{/if}
+			{if not empty($infos)}
+				<div class="infos">
+					<ul>
+						{foreach from=$infos item=info}
+							<li>{$info}</li>
+						{/foreach}
+					</ul>
+				</div>
+			{/if}
 		</div>
-	{/if}
-	{if not empty($infos)}
-		<div class="infos">
-			<ul>
-				{foreach from=$infos item=info}
-					<li>{$info}</li>
-				{/foreach}
-			</ul>
-		</div>
-	{/if}
+	</div>
 </div>
Index: /extensions/stripped/template/notification.tpl
===================================================================
--- /extensions/stripped/template/notification.tpl	(revision 12959)
+++ /extensions/stripped/template/notification.tpl	(revision 12960)
@@ -9,12 +9,23 @@
 <div class="titrePage">
 	<div class="browsePath">
-		<h2><a href="{$U_HOME}" title="{'Go through the gallery as a visitor'|@translate}">{'Home'|@translate}</a>{$LEVEL_SEPARATOR}{'Notification'|@translate}</h2>
+		<h2>
+			{if isset($MENUBAR)}
+				<span id="menuswitcher" title="{'Show/hide menu'|@translate}">{'Menu'|@translate}</span><span class="arrow"> »</span>
+			{/if}
+			<a href="{$U_HOME}">{'Home'|@translate}</a>
+			{$LEVEL_SEPARATOR}{'Notification'|@translate}
+		</h2>
 	</div>
 </div>
 <div id="content">
-	<p>{'The RSS notification feed provides notification on news from this website : new photos, updated albums, new comments. Use a RSS feed reader.'|@translate}</p>
-	<ul>
-		<li><a href="{$U_FEED_IMAGE_ONLY}">{'Photos only RSS feed'|@translate}</a></li>
-		<li><a href="{$U_FEED}">{'Complete RSS feed (photos, comments)'|@translate}</a></li>
-	</ul>
+	{if isset($MENUBAR)}{$MENUBAR}{/if}
+	<div id="content_cell">
+		<div class="content_block notification">
+			<p>{'The RSS notification feed provides notification on news from this website : new photos, updated albums, new comments. Use a RSS feed reader.'|@translate}</p>
+			<ul>
+				<li><a href="{$U_FEED_IMAGE_ONLY}">{'Photos only RSS feed'|@translate}</a></li>
+				<li><a href="{$U_FEED}">{'Complete RSS feed (photos, comments)'|@translate}</a></li>
+			</ul>
+		</div>
+	</div>
 </div>
Index: /extensions/stripped/template/password.tpl
===================================================================
--- /extensions/stripped/template/password.tpl	(revision 12959)
+++ /extensions/stripped/template/password.tpl	(revision 12960)
@@ -5,75 +5,77 @@
 <div class="titrePage">
 	<div class="browsePath">
-		<h2><a href="{$U_HOME}" title="{'Go through the gallery as a visitor'|@translate}">{'Home'|@translate}</a>{$LEVEL_SEPARATOR}{$title}</h2>
+		<h2>
+			{if isset($MENUBAR)}
+				<span id="menuswitcher" title="{'Show/hide menu'|@translate}">{'Menu'|@translate}</span><span class="arrow"> »</span>
+			{/if}
+			<a href="{$U_HOME}">{'Home'|@translate}</a>
+			{$LEVEL_SEPARATOR}{$title}
+		</h2>
 	</div>
 </div>
 <div id="content">
-	{if count($errors)}
-		<div class="errors">
-			<ul>
-				{foreach from=$errors item=error}
-					<li>{$error}</li>
-				{/foreach}
-			</ul>
+	{if isset($MENUBAR)}{$MENUBAR}{/if}
+	<div id="content_cell">
+		<div class="content_block">
+			{if count($errors)}
+				<div class="errors">
+					<ul>
+						{foreach from=$errors item=error}
+							<li>{$error}</li>
+						{/foreach}
+					</ul>
+				</div>
+			{/if}
+			{if count($infos)}
+				<div class="infos">
+					<ul>
+						{foreach from=$infos item=info}
+							<li>{$info}</li>
+						{/foreach}
+					</ul>
+				</div>
+			{/if}
+			{if $action ne 'none'}
+				<form id="lostPassword" action="{$form_action}?action={$action}{if isset($key)}&amp;key={$key}{/if}" method="post">
+					<input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
+					{if $action eq 'lost'}
+						<div class="message">{'Please enter your username or email address.'|@translate} {'You will receive a link to create a new password via email.'|@translate}</div>
+						<p>
+							<label>
+								{'Username or email'|@translate}
+								<br>
+								<input type="text" id="username_or_email" name="username_or_email" size="40" maxlength="40"{if isset($username_or_email)} value="{$username_or_email}"{/if}>
+							</label>
+						</p>
+						<p class="bottomButtons"><input class="submit" type="submit" name="submit" value="{'Change my password'|@translate}"></p>
+					{elseif $action eq 'reset'}
+						<div class="message">{'Hello'|@translate} <em>{$username}</em>. {'Enter your new password below.'|@translate}</div>
+						<p>
+							<label>
+								{'New password'|@translate}
+								<br>
+								<input type="password" name="use_new_pwd" id="use_new_pwd" value="">
+							</label>
+						</p>
+						<p>
+							<label>
+								{'Confirm Password'|@translate}
+								<br>
+								<input type="password" name="passwordConf" id="passwordConf" value="">
+							</label>
+						</p>
+						<p class="bottomButtons"><input class="submit" type="submit" name="submit" value="{'Submit'|@translate}"></p>
+					 {/if}
+				</form>
+			{/if} {* $action ne 'none' *}
+
+			<script type="text/javascript">
+				{if $action eq 'lost'}
+					{literal}try{document.getElementById('username_or_email').focus();}catch(e){}{/literal}
+				{elseif $action eq 'reset'}
+					{literal}try{document.getElementById('use_new_pwd').focus();}catch(e){}{/literal}
+				{/if}
+			</script>
 		</div>
-	{/if}
-	{if count($infos)}
-		<div class="infos">
-			<ul>
-				{foreach from=$infos item=info}
-					<li>{$info}</li>
-				{/foreach}
-			</ul>
-		</div>
-	{/if}
-{if $action ne 'none'}
-<form id="lostPassword" action="{$form_action}?action={$action}{if isset($key)}&amp;key={$key}{/if}" method="post">
-  <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
-
-  {if $action eq 'lost'}
-  <div class="message">{'Please enter your username or email address.'|@translate} {'You will receive a link to create a new password via email.'|@translate}</div>
-
-  <p>
-    <label>
-      {'Username or email'|@translate}
-      <br>
-      <input type="text" id="username_or_email" name="username_or_email" size="40" maxlength="40"{if isset($username_or_email)} value="{$username_or_email}"{/if}>
-    </label>
-  </p>
-
-  <p class="bottomButtons"><input class="submit" type="submit" name="submit" value="{'Change my password'|@translate}"></p>
-  {elseif $action eq 'reset'}
-
-  <div class="message">{'Hello'|@translate} <em>{$username}</em>. {'Enter your new password below.'|@translate}</div>
-
-  <p>
-    <label>
-      {'New password'|@translate}
-      <br>
-      <input type="password" name="use_new_pwd" id="use_new_pwd" value="">
-    </label>
-  </p>
-
-  <p>
-    <label>
-      {'Confirm Password'|@translate}
-      <br>
-      <input type="password" name="passwordConf" id="passwordConf" value="">
-    </label>
-  </p>
-
-  <p class="bottomButtons"><input class="submit" type="submit" name="submit" value="{'Submit'|@translate}"></p>
-  {/if}
-
-</form>
-{/if} {* $action ne 'none' *}
-
-<script type="text/javascript">
-{if $action eq 'lost'}
-{literal}try{document.getElementById('username_or_email').focus();}catch(e){}{/literal}
-{elseif $action eq 'reset'}
-{literal}try{document.getElementById('use_new_pwd').focus();}catch(e){}{/literal}
-{/if}
-</script>
-
+	</div>
 </div> <!-- content -->
Index: /extensions/stripped/template/picture.tpl
===================================================================
--- /extensions/stripped/template/picture.tpl	(revision 12959)
+++ /extensions/stripped/template/picture.tpl	(revision 12960)
@@ -86,4 +86,5 @@
 {if !empty($PLUGIN_PICTURE_BEFORE)}{$PLUGIN_PICTURE_BEFORE}{/if}
 <div id="content">
+	<div class="hideTabsZone hideTabs">&nbsp;</div>
 
  <!-- Image HD --> 
@@ -118,9 +119,10 @@
 
 <div id="theImageAndTitle">
-	<div id="theImageBox">
+	<div id="theImageBox" >
+		<div class="hideTabsZone hideTabs">&nbsp;</div>
 		{if (isset($previous) && $stripped.navArrows) }
 			<a href="{$previous.U_IMG}" id="imgprev">&nbsp;</a>
 		{/if}
-		<div id="theImage">
+		<div id="theImage" style="width:auto;">
 			{$ELEMENT_CONTENT}
 		</div>
Index: /extensions/stripped/template/picture_content.tpl
===================================================================
--- /extensions/stripped/template/picture_content.tpl	(revision 12959)
+++ /extensions/stripped/template/picture_content.tpl	(revision 12960)
@@ -28,4 +28,4 @@
 		{/if}
 	{/if}
-	<img src="{$SRC_IMG}" style="width:{$WIDTH_IMG}px;height:{$HEIGHT_IMG}px;" alt="{$ALT_IMG}" id="theMainImage">
+	<img src="{$SRC_IMG}" style="width:{$WIDTH_IMG}px;height:{$HEIGHT_IMG}px;" alt="{$ALT_IMG}" id="theMainImage" class="hideTabs">
 </div>
Index: /extensions/stripped/template/popuphelp.tpl
===================================================================
--- /extensions/stripped/template/popuphelp.tpl	(revision 12959)
+++ /extensions/stripped/template/popuphelp.tpl	(revision 12960)
@@ -1,6 +1,19 @@
 <div class="titrePage">
-   <a href="#" onclick="window.close();" title="{'Close this window'|@translate}">{'Close this window'|@translate}</a>
+	<div class="browsePath">
+		<h2>{$PAGE_TITLE}</h2>
+	</div>
+	<div class="categoryActionsContainer">
+		<ul class="categoryActions">
+			<li><a href="#" onclick="window.close();" title="{'Close this window'|@translate}" class="pwg-state-default pwg-button">
+				<span class="pwg-icon pwg-icon-close">&nbsp;</span><span class="pwg-button-text">{'Close this window'|@translate}</span>
+			</a></li>
+		</ul>
+	</div>
 </div>
 <div id="content">
-{$HELP_CONTENT}
-</div>
+	<div id="content_cell">
+		<div class="content_block">
+			{$HELP_CONTENT}
+		</div>
+	</div>
+</div> <!-- content -->
Index: /extensions/stripped/template/profile.tpl
===================================================================
--- /extensions/stripped/template/profile.tpl	(revision 12959)
+++ /extensions/stripped/template/profile.tpl	(revision 12960)
@@ -5,17 +5,28 @@
 <div class="titrePage">
 	<div class="browsePath">
-		<h2><a href="{$U_HOME}" title="{'return to homepage'|@translate}">{'Home'|@translate}</a>{$LEVEL_SEPARATOR}{'Profile'|@translate}</h2>
+		<h2>
+			{if isset($MENUBAR)}
+				<span id="menuswitcher" title="{'Show/hide menu'|@translate}">{'Menu'|@translate}</span><span class="arrow"> »</span>
+			{/if}
+			<a href="{$U_HOME}">{'Home'|@translate}</a>
+			{$LEVEL_SEPARATOR}{'Profile'|@translate}
+		</h2>
 	</div>
 </div>
 <div id="content">
-	{if isset($errors)}
-		<div class="errors">
-			<ul>
-				{foreach from=$errors item=error}
-					<li>{$error}</li>
-				{/foreach}
-			</ul>
+	{if isset($MENUBAR)}{$MENUBAR}{/if}
+	<div id="content_cell">
+		<div class="content_block">
+			{if isset($errors)}
+				<div class="errors">
+					<ul>
+						{foreach from=$errors item=error}
+							<li>{$error}</li>
+						{/foreach}
+					</ul>
+				</div>
+			{/if}
+			{$PROFILE_CONTENT}
 		</div>
-	{/if}
-	{$PROFILE_CONTENT}
+	</div>
 </div> <!-- content -->
Index: /extensions/stripped/template/redirect.tpl
===================================================================
--- /extensions/stripped/template/redirect.tpl	(revision 12959)
+++ /extensions/stripped/template/redirect.tpl	(revision 12960)
@@ -1,2 +1,14 @@
-<p>{$REDIRECT_MSG}</p>
-<p><a href="{$page_refresh.U_REFRESH}">{'Click here if your browser does not automatically forward you'|@translate}</a></p>
+<div class="titrePage">
+	<div class="browsePath">
+		<h2>{$REDIRECT_MSG}</h2>
+	</div>
+</div>
+<div id="content">
+	<div id="content_cell">
+		<div class="content_block">
+			<p><a href="{$page_refresh.U_REFRESH}">
+				{'Click here if your browser does not automatically forward you'|@translate}
+			</a></p>
+		</div>
+	</div>
+</div>
Index: /extensions/stripped/template/register.tpl
===================================================================
--- /extensions/stripped/template/register.tpl	(revision 12959)
+++ /extensions/stripped/template/register.tpl	(revision 12960)
@@ -5,59 +5,70 @@
 <div class="titrePage">
 	<div class="browsePath">
-		<h2><a href="{$U_HOME}" title="{'Home'|@translate}">{'Home'|@translate}</a>{$LEVEL_SEPARATOR}{'Registration'|@translate}</h2>
+		<h2>
+			{if isset($MENUBAR)}
+				<span id="menuswitcher" title="{'Show/hide menu'|@translate}">{'Menu'|@translate}</span><span class="arrow"> »</span>
+			{/if}
+			<a href="{$U_HOME}">{'Home'|@translate}</a>
+			{$LEVEL_SEPARATOR}{'Registration'|@translate}
+		</h2>
 	</div>
 </div>
 <div id="content">
-	{if isset($errors)}
-		<div class="errors">
-			<ul>
-				{foreach from=$errors item=error}
-					<li>{$error}</li>
-				{/foreach}
-			</ul>
+	{if isset($MENUBAR)}{$MENUBAR}{/if}
+	<div id="content_cell">
+		<div class="content_block">
+			{if isset($errors)}
+				<div class="errors">
+					<ul>
+						{foreach from=$errors item=error}
+							<li>{$error}</li>
+						{/foreach}
+					</ul>
+				</div>
+			{/if}
+			<form method="post" action="{$F_ACTION}" class="properties" name="register_form">
+				<fieldset>
+					<legend>{'Enter your personnal informations'|@translate}</legend>
+					<ul>
+						<li>
+							<span class="property">
+								<label for="login">{'Username'|@translate}</label>
+							</span>
+							<input type="text" name="login" id="login" value="{$F_LOGIN}" >&nbsp;<span class="mandatorystar">*</span>
+						</li>
+						<li>
+							<span class="property">
+								<label for="password">{'Password'|@translate}</label>
+							</span>
+							<input type="password" name="password" id="password" >&nbsp;<span class="mandatorystar">*</span>
+						</li>
+						<li>
+							<span class="property">
+								<label for="password_conf">{'Confirm Password'|@translate}</label>
+							</span>
+							<input type="password" name="password_conf" id="password_conf" >&nbsp;<span class="mandatorystar">*</span>
+						</li>
+						<li>
+							<span class="property">
+								<label for="mail_address">{'Mail address'|@translate}</label>
+							</span>
+							<input type="text" name="mail_address" id="mail_address" value="{$F_EMAIL}" >
+							({'useful when password forgotten'|@translate})
+						</li>
+					</ul>
+				</fieldset>
+				<p class="bottomButtons">
+					<input type="hidden" name="key" value="{$F_KEY}" >
+					<input class="submit" type="submit" name="submit" value="{'Register'|@translate}">
+					<input class="submit" type="reset" value="{'Reset'|@translate}">
+				</p>
+			</form>
+			<p><span class="mandatorystar">*</span> : {'obligatory'|@translate}</p>
+			<script type="text/javascript">
+				<!--
+				document.register_form.login.focus();
+				//-->
+			</script>
 		</div>
-	{/if}
-	<form method="post" action="{$F_ACTION}" class="properties" name="register_form">
-		<fieldset>
-			<legend>{'Enter your personnal informations'|@translate}</legend>
-			<ul>
-				<li>
-					<span class="property">
-						<label for="login">{'Username'|@translate}</label>
-					</span>
-					<input type="text" name="login" id="login" value="{$F_LOGIN}" >&nbsp;<span class="mandatorystar">*</span>
-				</li>
-				<li>
-					<span class="property">
-						<label for="password">{'Password'|@translate}</label>
-					</span>
-					<input type="password" name="password" id="password" >&nbsp;<span class="mandatorystar">*</span>
-				</li>
-				<li>
-					<span class="property">
-						<label for="password_conf">{'Confirm Password'|@translate}</label>
-					</span>
-					<input type="password" name="password_conf" id="password_conf" >&nbsp;<span class="mandatorystar">*</span>
-				</li>
-				<li>
-					<span class="property">
-						<label for="mail_address">{'Mail address'|@translate}</label>
-					</span>
-					<input type="text" name="mail_address" id="mail_address" value="{$F_EMAIL}" >
-					({'useful when password forgotten'|@translate})
-				</li>
-			</ul>
-		</fieldset>
-		<p class="bottomButtons">
-			<input type="hidden" name="key" value="{$F_KEY}" >
-			<input class="submit" type="submit" name="submit" value="{'Register'|@translate}">
-			<input class="submit" type="reset" value="{'Reset'|@translate}">
-		</p>
-	</form>
-	<p><span class="mandatorystar">*</span> : {'obligatory'|@translate}</p>
-	<script type="text/javascript">
-		<!--
-		document.register_form.login.focus();
-		//-->
-	</script>
+	</div>
 </div> <!-- content -->
Index: /extensions/stripped/template/search.tpl
===================================================================
--- /extensions/stripped/template/search.tpl	(revision 12959)
+++ /extensions/stripped/template/search.tpl	(revision 12960)
@@ -5,119 +5,137 @@
 <div class="titrePage">
 	<div class="browsePath">
-		<h2><a href="{$U_HOME}" title="{'Home'|@translate}">{'Home'|@translate}</a>{$LEVEL_SEPARATOR}{'Search'|@translate}</h2>
+		<h2>
+			{if isset($MENUBAR)}
+				<span id="menuswitcher" title="{'Show/hide menu'|@translate}">{'Menu'|@translate}</span><span class="arrow"> »</span>
+			{/if}
+			<a href="{$U_HOME}">{'Home'|@translate}</a>
+			{$LEVEL_SEPARATOR}{'Search'|@translate}
+		</h2>
+	</div>
+	<div class="categoryActionsContainer">
+		<ul class="categoryActions">
+			<li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}" class="pwg-state-default pwg-button">
+				<span class="pwg-icon pwg-icon-help">&nbsp;</span><span class="pwg-button-text">{'Help'|@translate}</span>
+			</a></li>
+		</ul>
 	</div>
 </div>
 <div id="content">
-	{if isset($errors) }
-		<div class="errors">
-			<ul>
-				{foreach from=$errors item=error}
-					<li>{$error}</li>
-				{/foreach}
-			</ul>
+	{if isset($MENUBAR)}{$MENUBAR}{/if}
+	<div id="content_cell">
+		<div class="content_block">
+			{if isset($errors) }
+				<div class="errors">
+					<ul>
+						{foreach from=$errors item=error}
+							<li>{$error}</li>
+						{/foreach}
+					</ul>
+				</div>
+			{/if}
+			<form class="filter" method="post" name="search" action="{$F_SEARCH_ACTION}">
+				<fieldset>
+					<legend>{'Filter'|@translate}</legend>
+					<label>{'Search for words'|@translate}
+						<input type="text" style="width: 300px" name="search_allwords" size="30"  />
+					</label>
+					<ul>
+						<li><label>
+							<input type="radio" name="mode" value="AND" checked="checked" />{'Search for all terms'|@translate}
+						</label></li>
+						<li><label>
+							<input type="radio" name="mode" value="OR" />{'Search for any terms'|@translate}
+						</label></li>
+					</ul>
+					<label>{'Search for Author'|@translate}
+						<input type="text" style="width: 300px" name="search_author" size="30"  />
+					</label>
+				</fieldset>
+				{if isset($TAG_SELECTION)}
+					<fieldset>
+						<legend>{'Search tags'|@translate}</legend>
+						{$TAG_SELECTION}
+						<label><span><input type="radio" name="tag_mode" value="AND" checked="checked" /> {'All tags'|@translate}</span></label>
+						<label><span><input type="radio" name="tag_mode" value="OR" /> {'Any tag'|@translate}</span></label>
+					</fieldset>
+				{/if}
+				<fieldset>
+					<legend>{'Search by Date'|@translate}</legend>
+					<ul>
+						<li><label>{'Kind of date'|@translate}</label></li>
+						<li><label>
+							<input type="radio" name="date_type" value="date_creation" checked="checked" />{'Creation date'|@translate}
+						</label></li>
+						<li><label>
+							<input type="radio" name="date_type" value="date_available" />{'Post date'|@translate}
+						</label></li>
+					</ul>
+					<ul>
+						<li><label>{'Date'|@translate}</label></li>
+						<li>
+							<select id="start_day" name="start_day">
+								<option value="0">--</option>
+								{section name=day start=1 loop=32}
+									<option value="{$smarty.section.day.index}" {if $smarty.section.day.index==$START_DAY_SELECTED}selected="selected"{/if}>{$smarty.section.day.index}</option>
+								{/section}
+							</select>
+							<select id="start_month" name="start_month">
+								{html_options options=$month_list selected=$START_MONTH_SELECTED}
+							</select>
+							<input id="start_year" name="start_year" type="text" size="4" maxlength="4" >
+							<input id="start_linked_date" name="start_linked_date" type="hidden" size="10" disabled="disabled">
+						</li>
+						<li>
+							<a class="date_today" href="#" onClick="document.search.start_day.value={$smarty.now|date_format:"%d"};document.search.start_month.value={$smarty.now|date_format:"%m"};document.search.start_year.value={$smarty.now|date_format:"%Y"};return false;">{'today'|@translate}</a>
+						</li>
+					</ul>
+					<ul>
+						<li><label>{'End-Date'|@translate}</label></li>
+						<li>
+							<select id="end_day" name="end_day">
+								<option value="0">--</option>
+								{section name=day start=1 loop=32}
+									<option value="{$smarty.section.day.index}" {if $smarty.section.day.index==$END_DAY_SELECTED}selected="selected"{/if}>{$smarty.section.day.index}</option>
+								{/section}
+							</select>
+							<select id="end_month" name="end_month">
+								{html_options options=$month_list selected=$END_MONTH_SELECTED}
+							</select>
+							<input id="end_year" name="end_year" type="text" size="4" maxlength="4" >
+							<input id="end_linked_date" name="end_linked_date" type="hidden" size="10" disabled="disabled">
+						</li>
+						<li>
+							<a class="date_today" href="#" onClick="document.search.end_day.value={$smarty.now|date_format:"%d"};document.search.end_month.value={$smarty.now|date_format:"%m"};document.search.end_year.value={$smarty.now|date_format:"%Y"};return false;">{'today'|@translate}</a>
+						</li>
+					</ul>
+				</fieldset>
+				<fieldset>
+					<legend>{'Search Options'|@translate}</legend>
+					<label>{'Search in Categories'|@translate}
+						<select class="categoryList" name="cat[]" multiple="multiple" >
+							{html_options options=$category_options selected=$category_options_selected}
+						</select>
+					</label>
+					<ul>
+						<li><label>{'Search in subcategories'|@translate}</label></li>
+						<li><label>
+							<input type="radio" name="subcats-included" value="1" checked="checked" />{'Yes'|@translate}
+						</label></li>
+						<li><label>
+							<input type="radio" name="subcats-included" value="0" />{'No'|@translate}
+						</label></li>
+					</ul>
+				</fieldset>
+				<p>
+					<input class="submit" type="submit" name="submit" value="{'Submit'|@translate}" />
+					<input class="submit" type="reset" value="{'Reset'|@translate}" />
+				</p>
+			</form>
+			<script type="text/javascript">
+				<!--
+				document.search.search_allwords.focus();
+				//-->
+			</script>
 		</div>
-	{/if}
-	<form class="filter" method="post" name="search" action="{$F_SEARCH_ACTION}">
-		<fieldset>
-			<legend>{'Filter'|@translate}</legend>
-			<label>{'Search for words'|@translate}
-				<input type="text" style="width: 300px" name="search_allwords" size="30"  />
-			</label>
-			<ul>
-				<li><label>
-					<input type="radio" name="mode" value="AND" checked="checked" />{'Search for all terms'|@translate}
-				</label></li>
-				<li><label>
-					<input type="radio" name="mode" value="OR" />{'Search for any terms'|@translate}
-				</label></li>
-			</ul>
-			<label>{'Search for Author'|@translate}
-				<input type="text" style="width: 300px" name="search_author" size="30"  />
-			</label>
-		</fieldset>
-		{if isset($TAG_SELECTION)}
-			<fieldset>
-				<legend>{'Search tags'|@translate}</legend>
-				{$TAG_SELECTION}
-				<label><span><input type="radio" name="tag_mode" value="AND" checked="checked" /> {'All tags'|@translate}</span></label>
-				<label><span><input type="radio" name="tag_mode" value="OR" /> {'Any tag'|@translate}</span></label>
-			</fieldset>
-		{/if}
-		<fieldset>
-			<legend>{'Search by Date'|@translate}</legend>
-			<ul>
-				<li><label>{'Kind of date'|@translate}</label></li>
-				<li><label>
-					<input type="radio" name="date_type" value="date_creation" checked="checked" />{'Creation date'|@translate}
-				</label></li>
-				<li><label>
-					<input type="radio" name="date_type" value="date_available" />{'Post date'|@translate}
-				</label></li>
-			</ul>
-			<ul>
-				<li><label>{'Date'|@translate}</label></li>
-				<li>
-					<select id="start_day" name="start_day">
-						<option value="0">--</option>
-						{section name=day start=1 loop=32}
-							<option value="{$smarty.section.day.index}" {if $smarty.section.day.index==$START_DAY_SELECTED}selected="selected"{/if}>{$smarty.section.day.index}</option>
-						{/section}
-					</select>
-					<select id="start_month" name="start_month">
-						{html_options options=$month_list selected=$START_MONTH_SELECTED}
-					</select>
-					<input id="start_year" name="start_year" type="text" size="4" maxlength="4" >
-					<input id="start_linked_date" name="start_linked_date" type="hidden" size="10" disabled="disabled">
-				</li>
-				<li>
-					<a class="date_today" href="#" onClick="document.search.start_day.value={$smarty.now|date_format:"%d"};document.search.start_month.value={$smarty.now|date_format:"%m"};document.search.start_year.value={$smarty.now|date_format:"%Y"};return false;">{'today'|@translate}</a>
-				</li>
-			</ul>
-			<ul>
-				<li><label>{'End-Date'|@translate}</label></li>
-				<li>
-					<select id="end_day" name="end_day">
-						<option value="0">--</option>
-						{section name=day start=1 loop=32}
-							<option value="{$smarty.section.day.index}" {if $smarty.section.day.index==$END_DAY_SELECTED}selected="selected"{/if}>{$smarty.section.day.index}</option>
-						{/section}
-					</select>
-					<select id="end_month" name="end_month">
-						{html_options options=$month_list selected=$END_MONTH_SELECTED}
-					</select>
-					<input id="end_year" name="end_year" type="text" size="4" maxlength="4" >
-					<input id="end_linked_date" name="end_linked_date" type="hidden" size="10" disabled="disabled">
-				</li>
-				<li>
-					<a class="date_today" href="#" onClick="document.search.end_day.value={$smarty.now|date_format:"%d"};document.search.end_month.value={$smarty.now|date_format:"%m"};document.search.end_year.value={$smarty.now|date_format:"%Y"};return false;">{'today'|@translate}</a>
-				</li>
-			</ul>
-		</fieldset>
-		<fieldset>
-			<legend>{'Search Options'|@translate}</legend>
-			<label>{'Search in Categories'|@translate}
-				<select class="categoryList" name="cat[]" multiple="multiple" >
-					{html_options options=$category_options selected=$category_options_selected}
-				</select>
-			</label>
-			<ul>
-				<li><label>{'Search in subcategories'|@translate}</label></li>
-				<li><label>
-					<input type="radio" name="subcats-included" value="1" checked="checked" />{'Yes'|@translate}
-				</label></li>
-				<li><label>
-					<input type="radio" name="subcats-included" value="0" />{'No'|@translate}
-				</label></li>
-			</ul>
-		</fieldset>
-		<p>
-			<input class="submit" type="submit" name="submit" value="{'Submit'|@translate}" />
-			<input class="submit" type="reset" value="{'Reset'|@translate}" />
-		</p>
-	</form>
-	<script type="text/javascript">
-		<!--
-		document.search.search_allwords.focus();
-		//-->
-	</script>
+	</div>
 </div> <!-- content -->
Index: /extensions/stripped/template/search_rules.tpl
===================================================================
--- /extensions/stripped/template/search_rules.tpl	(revision 12959)
+++ /extensions/stripped/template/search_rules.tpl	(revision 12960)
@@ -1,44 +1,54 @@
 <div class="titrePage">
-  <ul class="categoryActions">
-    <li><a href="#" onclick="window.close();" title="{'Close this window'|@translate}">{'Close this window'|@translate}</a></li>
-  </ul>
-  <h2>{'Search rules'|@translate}</h2>
+	<div class="browsePath">
+		<h2>{'Search rules'|@translate}</h2>
+	</div>
+	<div class="categoryActionsContainer">
+		<ul class="categoryActions">
+			<li><a href="#" onclick="window.close();" title="{'Close this window'|@translate}" class="pwg-state-default pwg-button">
+				<span class="pwg-icon pwg-icon-close">&nbsp;</span><span class="pwg-button-text">{'Close this window'|@translate}</span>
+			</a></li>
+		</ul>
+	</div>
 </div>
 <div id="content">
-  {if isset($INTRODUCTION) }
-  <p>{$INTRODUCTION}</p>
-  {/if}
-  <ul>
-    {if isset($search_words) }
-    {foreach from=$search_words item=v}
-    <li>{$v}</li>
-    {/foreach}
-    {/if}
-    {if isset($SEARCH_TAGS_MODE) }
-    <li>
-    <p>{if 'AND'==$SEARCH_TAGS_MODE}{'At least one tag must match'|@translate}{else}{'At least one tag must match'|@translate}{/if}</p>
-      <ul>
-        {foreach from=$search_tags item=v}
-        <li>{$v}</li>
-        {/foreach}
-      </ul>
-    </li>
-    {/if}
-    {if isset($DATE_CREATION) }
-    <li>{$DATE_CREATION}</li>
-    {/if}
-    {if isset($DATE_AVAILABLE) }
-    <li>{$DATE_AVAILABLE}</li>
-    {/if}
-    {if isset($search_categories) }
-    <li>
-      <p>{'Categories'|@translate}</p>
-      <ul>
-        {foreach from=$search_categories item=v}
-        <li>{$v}</li>
-        {/foreach}
-      </ul>
-    </li>
-    {/if}
-  </ul>
+	<div id="content_cell">
+		<div class="content_block">
+			{if isset($INTRODUCTION) }
+				<p>{$INTRODUCTION}</p>
+			{/if}
+			<ul>
+				{if isset($search_words) }
+					{foreach from=$search_words item=v}
+						<li>{$v}</li>
+					{/foreach}
+				{/if}
+				{if isset($SEARCH_TAGS_MODE) }
+					<li>
+						<p>{if 'AND'==$SEARCH_TAGS_MODE}{'At least one tag must match'|@translate}{else}{'At least one tag must match'|@translate}{/if}</p>
+						<ul>
+							{foreach from=$search_tags item=v}
+								<li>{$v}</li>
+							{/foreach}
+						</ul>
+					</li>
+				{/if}
+				{if isset($DATE_CREATION) }
+					<li>{$DATE_CREATION}</li>
+				{/if}
+				{if isset($DATE_AVAILABLE) }
+					<li>{$DATE_AVAILABLE}</li>
+				{/if}
+				{if isset($search_categories) }
+					<li>
+						<p>{'Categories'|@translate}</p>
+						<ul>
+							{foreach from=$search_categories item=v}
+								<li>{$v}</li>
+							{/foreach}
+						</ul>
+					</li>
+				{/if}
+			</ul>
+		</div>
+	</div>
 </div> <!-- content -->
Index: /extensions/stripped/template/tags.tpl
===================================================================
--- /extensions/stripped/template/tags.tpl	(revision 12959)
+++ /extensions/stripped/template/tags.tpl	(revision 12960)
@@ -5,49 +5,62 @@
 <div class="titrePage">
 	<div class="browsePath">
-		<h2><a href="{$U_HOME}" title="{'Home'|@translate}">{'Home'|@translate}</a>{$LEVEL_SEPARATOR}{'Tags'|@translate}</h2>
+		<h2>
+			{if isset($MENUBAR)}
+				<span id="menuswitcher" title="{'Show/hide menu'|@translate}">{'Menu'|@translate}</span><span class="arrow"> »</span>
+			{/if}
+			<a href="{$U_HOME}">{'Home'|@translate}</a>
+			{$LEVEL_SEPARATOR}{'Tags'|@translate}
+		</h2>
 	</div>
-	<ul class="categoryActions">
-		{if $display_mode == 'letters'}
-			<li><a href="{$U_CLOUD}" title="{'show tag cloud'|@translate}">{'show tag cloud'|@translate}</a></li>
-		{/if}
-		{if $display_mode == 'cloud'}
-			<li><a href="{$U_LETTERS}" title="{'group by letters'|@translate}">{'group by letters'|@translate}</a></li>
-		{/if}
-	</ul>
+	<div class="categoryActionsContainer">
+		<ul class="categoryActions">
+			{if $display_mode == 'letters'}
+				<li><a href="{$U_CLOUD}" title="{'show tag cloud'|@translate}">{'show tag cloud'|@translate}</a></li>
+			{/if}
+			{if $display_mode == 'cloud'}
+				<li><a href="{$U_LETTERS}" title="{'group by letters'|@translate}">{'group by letters'|@translate}</a></li>
+			{/if}
+		</ul>
+	</div>
 </div>
 <div id="content">
-	{if isset($tags)}
-		{if $display_mode == 'cloud'}
-			<div id="fullTagCloud">
-				{foreach from=$tags item=tag}
-					<span><a href="{$tag.URL}" class="tagLevel{$tag.level}" title="{$pwg->l10n_dec('%d photo', '%d photos', $tag.counter)}">{$tag.name}</a></span>
-				{/foreach}
-			</div>
-		{/if}
-		{if $display_mode == 'letters'}
-			<table>
-				<tr>
-					<td valign="top">
-						{foreach from=$letters item=letter}
-							<fieldset class="tagLetter">
-								<legend class="tagLetterLegend">{$letter.TITLE}</legend>
-								<table class="tagLetterContent">
-									{foreach from=$letter.tags item=tag}
-										<tr class="tagLine">
-										<td><a href="{$tag.URL}">{$tag.name}</a></td>
-										<td class="nbEntries">{$pwg->l10n_dec('%d photo', '%d photos', $tag.counter)}</td>
-										</tr>
-									{/foreach}
-								</table>
-							</fieldset>
-							{if isset($letter.CHANGE_COLUMN) }
-								</td>
-								<td valign="top">
-							{/if}
+	{if isset($MENUBAR)}{$MENUBAR}{/if}
+	<div id="content_cell">
+		<div class="content_block">
+			{if isset($tags)}
+				{if $display_mode == 'cloud'}
+					<div id="fullTagCloud">
+						{foreach from=$tags item=tag}
+							<span><a href="{$tag.URL}" class="tagLevel{$tag.level}" title="{$pwg->l10n_dec('%d photo', '%d photos', $tag.counter)}">{$tag.name}</a></span>
 						{/foreach}
-					</td>
-				</tr>
-			 </table>
-		{/if}
-	{/if}
+					</div>
+				{/if}
+				{if $display_mode == 'letters'}
+					<table>
+						<tr>
+							<td valign="top">
+								{foreach from=$letters item=letter}
+									<fieldset class="tagLetter">
+										<legend class="tagLetterLegend">{$letter.TITLE}</legend>
+										<table class="tagLetterContent">
+											{foreach from=$letter.tags item=tag}
+												<tr class="tagLine">
+												<td><a href="{$tag.URL}">{$tag.name}</a></td>
+												<td class="nbEntries">{$pwg->l10n_dec('%d photo', '%d photos', $tag.counter)}</td>
+												</tr>
+											{/foreach}
+										</table>
+									</fieldset>
+									{if isset($letter.CHANGE_COLUMN) }
+										</td>
+										<td valign="top">
+									{/if}
+								{/foreach}
+							</td>
+						</tr>
+					 </table>
+				{/if}
+			{/if}
+		</div>
+	</div>
 </div> <!-- content -->
Index: /extensions/stripped/theme-black.css
===================================================================
--- /extensions/stripped/theme-black.css	(revision 12959)
+++ /extensions/stripped/theme-black.css	(revision 12960)
@@ -1,8 +1,6 @@
 /* General rules ------------------------------------------------------------------------------- */
 
-body {
-	background-color: #000;
-	color: #666;
-}
+html , body 	{ background-color: #000;}
+body 		{ color: #666;}
 
 #thePicturePage .left_block,
@@ -24,93 +22,65 @@
 /* Content ------------------------------------------------------------------------------------- */
 
-.content_block .additional_info {
-	color:#999;
-	background-color:#404040;
-}
-
-.additional_info p a {color:#ddd;}
-.additional_info p a:hover {color:#fff;}
+.content_block .additional_info { background-color:#404040;}
+.content_block 			{ color:#999;}
+.content_block a 		{ color:#ddd;}
+.content_block a:hover  	{ color:#fff;}
 
 /* Menubar ------------------------------------------------------------------------------------- */
 
-#menuswitcher 		{ color: #999;}
-#menuswitcher:hover 	{ color: #ccc;}
+#menuswitcher 			{ color: #999;}
+#menuswitcher:hover 		{ color: #ccc;}
 
 /* Category thumbnails ------------------------------------------------------------------------- */
-
-.stuffs_block .personal_block ul.thumbnailCategories li,
-.thumbnailCategories li {
-	background: transparent url(images/back_30.png) 0 0 no-repeat;
-	color:#999;
-}
-
-.stuffs_block .personal_block ul.thumbnailCategories li:hover,
-.thumbnailCategories li:hover {
-	background: transparent url(images/back_30.png) 0 -170px no-repeat;
-	color:#666;
-}
-
-.subcontent  .stuffs_block .personal_block ul.thumbnailCategories li {
-	background: transparent url(images/back_40.png) 0 0 no-repeat;
-}
-
-.subcontent  .stuffs_block .personal_block ul.thumbnailCategories li:hover {
-	background: transparent url(images/back_40.png) 0 -170px no-repeat;
-	color:#666;
-}
+.thumbnailCategories li 				{ color:#999;}
+.ats .thumbnailCategories li 			{ background: transparent url(images/back_30.png) 0 0 no-repeat;}
+.at3 .thumbnailCategories li 			{ background: transparent url(images/m_back_30.png) 0 0 no-repeat;}
+.at2 .thumbnailCategories li 			{ background: transparent url(images/l_back_30.png) 0 0 no-repeat;}
+.at1 .thumbnailCategories li 			{ background: transparent url(images/xl_back_30.png) 0 0 no-repeat;}
+
+.thumbnailCategories li:hover 		{ color:#666;}
+.ats .thumbnailCategories li:hover	{ background: transparent url(images/back_30.png) 0 -170px no-repeat;}
+.at3 .thumbnailCategories li:hover 	{ background: transparent url(images/m_back_30.png) 0 -290px no-repeat;}
+.at2 .thumbnailCategories li:hover 	{ background: transparent url(images/l_back_30.png) 0 -170px no-repeat;}
+.at1 .thumbnailCategories li:hover 	{ background: transparent url(images/xl_back_30.png) 0 -170px no-repeat;}
 
 .thumbnailCategory .illustration img 			{ border: 1px solid #555;}
 .thumbnailCategory .illustration img:hover 	{ border: 1px solid #101010;}
 
+.atd .thumbnailCategory .description h3  								{ border-color:#555;}
+.naf .thumbnailCategories .thumbnailCategory:hover .description h3 	{ border-color:#555;}
+.atd .thumbnailCategory:hover .description h3 						{ border-color:#999;}	
+
+.stuffs_block .personal_block ul.thumbnailCategories li,
+.stuffs_block .personal_block ul.thumbnailCategories li:hover,
+.subcontent  .stuffs_block .personal_block ul.thumbnailCategories li,
+.subcontent  .stuffs_block .personal_block ul.thumbnailCategories li:hover {
+	border-radius:10px;
+	-moz-border-radius:10px;
+	-webkit-border-radius:10px;
+}
+
+.stuffs_block .personal_block ul.thumbnailCategories li 					{ background: #303030 none 0 0 no-repeat;}
+.stuffs_block .personal_block ul.thumbnailCategories li:hover				{ background: #c0c0c0 none 0 0 no-repeat;}
+.subcontent  .stuffs_block .personal_block ul.thumbnailCategories li 		{ background: #404040 none 0 0 no-repeat;}
+.subcontent  .stuffs_block .personal_block ul.thumbnailCategories li:hover	{ background: #c0c0c0 none 0 0 no-repeat;}
+
 /* Images Thumbnails --------------------------------------------------------------------------- */
 
-.thumbnails li,
-#thumbnails li 			{
-	background: transparent url(images/back_40.png) 0 0 no-repeat;
-}
-
-.thumbnails li:hover,
-#thumbnails li:hover {
-	background: transparent url(images/back_40.png) 0 -170px no-repeat;
-}
-
-.stuffs_block li {
-	background: transparent url(images/back_50.png) 0 -0 no-repeat;
-}
-
-.stuffs_block li:hover {
-	background: transparent url(images/back_50.png) 0 -170px no-repeat;
-}
-
+.thumbnails li, #thumbnails li  				{ background: transparent url(images/back_40.png) 0 0 no-repeat;}
+.thumbnails li:hover, #thumbnails li:hover	{ background: transparent url(images/back_40.png) 0 -170px no-repeat;}
+.stuffs_block li 							{ background: transparent url(images/back_50.png) 0 -0 no-repeat;}
+.stuffs_block li:hover 					{ background: transparent url(images/back_50.png) 0 -170px no-repeat;}
+.wrap1 .thumbLegend 						{ color:#888;}
 .wrap1 .wrap2 .thumbnail ,
-.wrap1 .wrap2 .thumbnail:hover {
-	border:solid 1px #404040;
-}
-
-.wrap1 .thumbLegend {
-	color:#888;
-}
+.wrap1 .wrap2 .thumbnail:hover 			{ border:solid 1px #404040;}
 
 /* Navigation Bar ------------------------------------------------------------------------------ */
 
-#thumb_navigation {
-	color:#666;
-}
-
-#thumb_navigation #tn_prev {
-	background: transparent url(icon/arrows.png) 0 0 no-repeat;
-}
-
-#thumb_navigation #tn_next {
-	background: transparent url(icon/arrows.png) -20px 0 no-repeat;
-}
-
-#thumb_navigation a#tn_prev:hover {
-	background: transparent url(icon/arrows.png) 0 -150px no-repeat;
-}
-
-#thumb_navigation a#tn_next:hover {
-	background: transparent url(icon/arrows.png) -20px -150px no-repeat;
-}
+#thumb_navigation 					{ color:#666;}
+#thumb_navigation #tn_prev			{ background: transparent url(icon/arrows.png) 0 0 no-repeat;}
+#thumb_navigation #tn_next			{ background: transparent url(icon/arrows.png) -20px 0 no-repeat;}
+#thumb_navigation a#tn_prev:hover	{ background: transparent url(icon/arrows.png) 0 -150px no-repeat;}
+#thumb_navigation a#tn_next:hover	{ background: transparent url(icon/arrows.png) -20px -150px no-repeat;}
 
 /* Picture Page -------------------------------------------------------------------------------- */
@@ -183,7 +153,7 @@
 /* Navigation Arrows --------------------------------------------------------------------------- */
 
-#theImageBox 	{ position: static;}
-#imgprev 		{ background: transparent url(icon/arrows.png) 0 0 no-repeat;}
-#imgnext 		{ background: transparent url(icon/arrows.png) -20px 0 no-repeat;}
+#theImageBox 	{ position: relative;}
+#imgprev 		{ position: fixed; background: transparent url(icon/arrows.png) 0 0 no-repeat;}
+#imgnext 		{ position: fixed; background: transparent url(icon/arrows.png) -20px 0 no-repeat;}
 #imgprev:hover 	{ background: transparent url(icon/arrows.png) 0 -150px no-repeat;}
 #imgnext:hover	{ background: transparent url(icon/arrows.png) -20px -150px no-repeat;}
@@ -421,19 +391,19 @@
 /* No Thumb Frame CSS -------------------------------------------------------------------------- */
 
-.ntf .stuffs_block .personal_block ul.thumbnailCategories li,
-.ntf .thumbnailCategories li ,
-.ntf .subcontent  .stuffs_block .personal_block ul.thumbnailCategories li {
+.naf .stuffs_block .personal_block ul.thumbnailCategories li,
+.naf .thumbnailCategories li ,
+.naf .subcontent  .stuffs_block .personal_block ul.thumbnailCategories li {
 	background: none;
 }
 
-.ntf .stuffs_block .personal_block ul.thumbnailCategories li:hover,
-.ntf .thumbnailCategories li:hover,
-.ntf .subcontent  .stuffs_block .personal_block ul.thumbnailCategories li:hover {
+.naf .stuffs_block .personal_block ul.thumbnailCategories li:hover,
+.naf .thumbnailCategories li:hover,
+.naf .subcontent  .stuffs_block .personal_block ul.thumbnailCategories li:hover {
 	background: none;
 	color: #c0c0c0;
 }
 
-.ntf .thumbnailCategory .illustration img 			{ border: 1px solid #777;}
-.ntf .thumbnailCategory .illustration img:hover 	{ border: 1px solid #c0c0c0;}
+.naf .thumbnailCategory .illustration img 			{ border: 1px solid #777;}
+.naf .thumbnailCategory .illustration img:hover 	{ border: 1px solid #c0c0c0;}
 
 .ntf .wrap1 .wrap2 .thumbnail {
Index: /extensions/stripped/theme-original.css
===================================================================
--- /extensions/stripped/theme-original.css	(revision 12959)
+++ /extensions/stripped/theme-original.css	(revision 12960)
@@ -1,8 +1,6 @@
 /* General rules ------------------------------------------------------------------------------- */
 
-body {
-	background-color: #101010;
-	color: #666;
-}
+html , body 	{ background-color: #101010;}
+body 		{ color: #666;}
 
 #thePicturePage .left_block,
@@ -24,102 +22,70 @@
 /* Content ------------------------------------------------------------------------------------- */
 
-.content_block .additional_info {
-	color:#999;
-	background-color:#404040;
-}
-
-.additional_info p a {color:#ddd;}
-.additional_info p a:hover {color:#fff;}
+.content_block .additional_info { background-color:#404040;}
+.content_block 			{ color:#999;}
+.content_block a 		{ color:#ddd;}
+.content_block a:hover 	{ color:#fff;}
 
 /* Menubar ------------------------------------------------------------------------------------- */
 
-#menuswitcher 		{ color: #999;}
-#menuswitcher:hover 	{ color: #ccc;}
+#menuswitcher 			{ color: #999;}
+#menuswitcher:hover 		{ color: #ccc;}
 
 /* Category thumbnails ------------------------------------------------------------------------- */
 
-.stuffs_block .personal_block ul.thumbnailCategories li,
-.thumbnailCategories li {
-	background: transparent url(images/back_30.png) 0 0 no-repeat;
-	color:#999;
-}
-
-.stuffs_block .personal_block ul.thumbnailCategories li:hover,
-.thumbnailCategories li:hover {
-	background: transparent url(images/back_30.png) 0 -170px no-repeat;
-	color:#666;
-}
-
-.subcontent  .stuffs_block .personal_block ul.thumbnailCategories li {
-	background: transparent url(images/back_40.png) 0 0 no-repeat;
-}
-
-.subcontent  .stuffs_block .personal_block ul.thumbnailCategories li:hover {
-	background: transparent url(images/back_40.png) 0 -170px no-repeat;
-	color:#666;
-}
+.thumbnailCategories li 				{ color:#999;}
+.ats .thumbnailCategories li 			{ background: transparent url(images/back_30.png) 0 0 no-repeat;}
+.at3 .thumbnailCategories li 			{ background: transparent url(images/m_back_30.png) 0 0 no-repeat;}
+.at2 .thumbnailCategories li 			{ background: transparent url(images/l_back_30.png) 0 0 no-repeat;}
+.at1 .thumbnailCategories li 			{ background: transparent url(images/xl_back_30.png) 0 0 no-repeat;}
+
+.thumbnailCategories li:hover 		{ color:#666;}
+.ats .thumbnailCategories li:hover	{ background: transparent url(images/back_30.png) 0 -170px no-repeat;}
+.at3 .thumbnailCategories li:hover 	{ background: transparent url(images/m_back_30.png) 0 -290px no-repeat;}
+.at2 .thumbnailCategories li:hover 	{ background: transparent url(images/l_back_30.png) 0 -170px no-repeat;}
+.at1 .thumbnailCategories li:hover 	{ background: transparent url(images/xl_back_30.png) 0 -170px no-repeat;}
 
 .thumbnailCategory .illustration img 			{ border: 1px solid #555;}
 .thumbnailCategory .illustration img:hover 	{ border: 1px solid #101010;}
 
-/* Images Thumbnails --------------------------------------------------------------------------- */
-
-.thumbnails li,
-#thumbnails li 			{
-	background: transparent url(images/back_40.png) 0 0 no-repeat;
-}
-
-.thumbnails li:hover,
-#thumbnails li:hover {
-	background: transparent url(images/back_40.png) 0 -170px no-repeat;
-}
-
-.stuffs_block li {
-	background: transparent url(images/back_50.png) 0 -0 no-repeat;
-}
-
-.stuffs_block li:hover {
-	background: transparent url(images/back_50.png) 0 -170px no-repeat;
-}
-
-.wrap1 .wrap2 .thumbnail ,
-.wrap1 .wrap2 .thumbnail:hover {
-	border:solid 1px #404040;
-}
-
-.wrap1 .thumbLegend {
-	color:#888;
-}
-
-/* Navigation Bar ------------------------------------------------------------------------------ */
-
-#thumb_navigation {
-	color:#666;
-}
-
-#thumb_navigation #tn_prev {
-	background: transparent url(icon/arrows.png) 0 0 no-repeat;
-}
-
-#thumb_navigation #tn_next {
-	background: transparent url(icon/arrows.png) -20px 0 no-repeat;
-}
-
-#thumb_navigation a#tn_prev:hover {
-	background: transparent url(icon/arrows.png) 0 -150px no-repeat;
-}
-
-#thumb_navigation a#tn_next:hover {
-	background: transparent url(icon/arrows.png) -20px -150px no-repeat;
-}
-
-/* Picture Page -------------------------------------------------------------------------------- */
-
-#imageTitle {
-/*	padding: 6px;
+.atd .thumbnailCategory .description h3  								{ border-color:#555;}
+.naf .thumbnailCategories .thumbnailCategory:hover .description h3 	{ border-color:#555;}
+.atd .thumbnailCategory:hover .description h3 						{ border-color:#999;}	
+
+.stuffs_block .personal_block ul.thumbnailCategories li,
+.stuffs_block .personal_block ul.thumbnailCategories li:hover,
+.subcontent  .stuffs_block .personal_block ul.thumbnailCategories li,
+.subcontent  .stuffs_block .personal_block ul.thumbnailCategories li:hover {
+	border-radius:10px;
 	-moz-border-radius:10px;
 	-webkit-border-radius:10px;
-	border-radius:10px;
-	background: #303030;*/
+}
+
+.stuffs_block .personal_block ul.thumbnailCategories li 					{ background: #303030 none 0 0 no-repeat;}
+.stuffs_block .personal_block ul.thumbnailCategories li:hover				{ background: #c0c0c0 none 0 0 no-repeat;}
+.subcontent  .stuffs_block .personal_block ul.thumbnailCategories li 		{ background: #404040 none 0 0 no-repeat;}
+.subcontent  .stuffs_block .personal_block ul.thumbnailCategories li:hover	{ background: #c0c0c0 none 0 0 no-repeat;}
+
+/* Images Thumbnails --------------------------------------------------------------------------- */
+
+.thumbnails li, #thumbnails li  				{ background: transparent url(images/back_40.png) 0 0 no-repeat;}
+.thumbnails li:hover, #thumbnails li:hover	{ background: transparent url(images/back_40.png) 0 -170px no-repeat;}
+.stuffs_block li 							{ background: transparent url(images/back_50.png) 0 -0 no-repeat;}
+.stuffs_block li:hover 					{ background: transparent url(images/back_50.png) 0 -170px no-repeat;}
+.wrap1 .thumbLegend 						{ color:#888;}
+.wrap1 .wrap2 .thumbnail ,
+.wrap1 .wrap2 .thumbnail:hover 			{ border:solid 1px #404040;}
+
+/* Navigation Bar ------------------------------------------------------------------------------ */
+
+#thumb_navigation 					{ color:#666;}
+#thumb_navigation #tn_prev			{ background: transparent url(icon/arrows.png) 0 0 no-repeat;}
+#thumb_navigation #tn_next 			{ background: transparent url(icon/arrows.png) -20px 0 no-repeat;}
+#thumb_navigation a#tn_prev:hover 	{ background: transparent url(icon/arrows.png) 0 -150px no-repeat;}
+#thumb_navigation a#tn_next:hover	{ background: transparent url(icon/arrows.png) -20px -150px no-repeat;}
+
+/* Picture Page -------------------------------------------------------------------------------- */
+
+#imageTitle {
 	font-weight:bold;
 	color:#888;
@@ -131,5 +97,5 @@
 }
 
-#theImage { 	margin-bottom: 11px;}
+#theImage { margin-bottom: 11px;}
 
 .img_frame #theMainImage {
@@ -137,4 +103,6 @@
 	padding:2px;
 }
+
+.hideTabsZone { display:none;}
 
 /* Image Nav Arrows ---------------------------------------------------------------------------- */
@@ -334,19 +302,19 @@
 /* No Thumb France CSS ------------------------------------------------------------------------- */
 
-.ntf .stuffs_block .personal_block ul.thumbnailCategories li,
-.ntf .thumbnailCategories li ,
-.ntf .subcontent  .stuffs_block .personal_block ul.thumbnailCategories li {
+.naf .stuffs_block .personal_block ul.thumbnailCategories li,
+.naf .thumbnailCategories li ,
+.naf .subcontent  .stuffs_block .personal_block ul.thumbnailCategories li {
 	background: none;
 }
 
-.ntf .stuffs_block .personal_block ul.thumbnailCategories li:hover,
-.ntf .thumbnailCategories li:hover,
-.ntf .subcontent  .stuffs_block .personal_block ul.thumbnailCategories li:hover {
+.naf .stuffs_block .personal_block ul.thumbnailCategories li:hover,
+.naf .thumbnailCategories li:hover,
+.naf .subcontent  .stuffs_block .personal_block ul.thumbnailCategories li:hover {
 	background: none;
 	color: #c0c0c0;
 }
 
-.ntf .thumbnailCategory .illustration img 			{ border: 1px solid #777;}
-.ntf .thumbnailCategory .illustration img:hover 	{ border: 1px solid #c0c0c0;}
+.naf .thumbnailCategory .illustration img 			{ border: 1px solid #777;}
+.naf .thumbnailCategory .illustration img:hover 	{ border: 1px solid #c0c0c0;}
 
 .ntf .wrap1 .wrap2 .thumbnail {
Index: /extensions/stripped/theme-white.css
===================================================================
--- /extensions/stripped/theme-white.css	(revision 12959)
+++ /extensions/stripped/theme-white.css	(revision 12960)
@@ -1,8 +1,6 @@
 /* General rules ------------------------------------------------------------------------------- */
 
-body {
-	background-color: #fff;
-	color: #888;
-}
+html , body 	{ background-color: #fff;}
+body 		{ color: #888;}
 
 #thePicturePage .left_block,
@@ -24,12 +22,8 @@
 /* Content ------------------------------------------------------------------------------------- */
 
-.content_block .additional_info {
-	color: #666;
-	background-color: #eee;
-	border: none;
-}
-
-.additional_info p a {color:#222;}
-.additional_info p a:hover {color:#000;}
+.content_block .additional_info { background-color:#eee; border:none;}
+.content_block 			{color:#666;}
+.content_block a			{color:#222;}
+.content_block a:hover 	{color:#00;}
 
 /* Menubar ------------------------------------------------------------------------------------- */
@@ -40,33 +34,19 @@
 /* Category thumbnails ------------------------------------------------------------------------- */
 
+.thumbnailCategories li,
+.thumbnailCategories li:hover,
 .stuffs_block .personal_block ul.thumbnailCategories li,
-.thumbnailCategories li {
-	background: #eee none 0 0 no-repeat;
-	border-radius:10px;
-	-moz-border-radius:10px;
-	-webkit-border-radius:10px;
-}
-
 .stuffs_block .personal_block ul.thumbnailCategories li:hover,
-.thumbnailCategories li:hover {
-	background: #ccc none 0 0 no-repeat;
-	border-radius:10px;
-	-moz-border-radius:10px;
-	-webkit-border-radius:10px;
-}
-
-.subcontent  .stuffs_block .personal_block ul.thumbnailCategories li {
-	background: #fbfbfb none 0 0 no-repeat;
-	border-radius:10px;
-	-moz-border-radius:10px;
-	-webkit-border-radius:10px;
-}
-
+.subcontent  .stuffs_block .personal_block ul.thumbnailCategories li,
 .subcontent  .stuffs_block .personal_block ul.thumbnailCategories li:hover {
-	background: #ddd none 0 0 no-repeat;
-	border-radius:10px;
-	-moz-border-radius:10px;
-	-webkit-border-radius:10px;
-}
+	border-radius:10px;
+	-moz-border-radius:10px;
+	-webkit-border-radius:10px;
+}
+
+.stuffs_block .personal_block ul.thumbnailCategories li, .thumbnailCategories li				{ background: #eee none 0 0 no-repeat;}
+.stuffs_block .personal_block ul.thumbnailCategories li:hover, .thumbnailCategories li:hover	{ background: #ccc none 0 0 no-repeat;}
+.subcontent  .stuffs_block .personal_block ul.thumbnailCategories li							{ background: #fbfbfb none 0 0 no-repeat;}
+.subcontent  .stuffs_block .personal_block ul.thumbnailCategories li:hover					{ background: #ddd none 0 0 no-repeat;}
 
 .thumbnailCategory .illustration img 			{ border: 1px solid #555;}
@@ -75,4 +55,8 @@
 .thumbnailCategories li 					{ color:#666;}
 .thumbnailCategories li:hover				{ color:#444;}
+
+.atd .thumbnailCategory .description h3 { border-color:#999;}
+.naf .thumbnailCategories .thumbnailCategory:hover .description h3  { border-color:#999;}
+.atd .thumbnailCategory:hover .description h3 { border-color:#666;}	
 
 /* Images Thumbnails --------------------------------------------------------------------------- */
@@ -216,7 +200,7 @@
 /* Navigation Arrows --------------------------------------------------------------------------- */
 
-#theImageBox 	{ position: static;}
-#imgprev 		{ background: transparent url(icon/arrows-white.png) 0 0 no-repeat;}
-#imgnext 		{ background: transparent url(icon/arrows-white.png) -20px 0 no-repeat;}
+#theImageBox 	{ position: relative;}
+#imgprev 		{ position: fixed; background: transparent url(icon/arrows-white.png) 0 0 no-repeat;}
+#imgnext 		{ position: fixed; background: transparent url(icon/arrows-white.png) -20px 0 no-repeat;}
 #imgprev:hover 	{ background: transparent url(icon/arrows-white.png) 0 -150px no-repeat;}
 #imgnext:hover	{ background: transparent url(icon/arrows-white.png) -20px -150px no-repeat;}
@@ -462,19 +446,19 @@
 /* No Thumb Frame CSS -------------------------------------------------------------------------- */
 
-.ntf .stuffs_block .personal_block ul.thumbnailCategories li,
-.ntf .thumbnailCategories li ,
-.ntf .subcontent  .stuffs_block .personal_block ul.thumbnailCategories li {
+.naf .stuffs_block .personal_block ul.thumbnailCategories li,
+.naf .thumbnailCategories li ,
+.naf .subcontent  .stuffs_block .personal_block ul.thumbnailCategories li {
 	background: none;
 }
 
-.ntf .stuffs_block .personal_block ul.thumbnailCategories li:hover,
-.ntf .thumbnailCategories li:hover,
-.ntf .subcontent  .stuffs_block .personal_block ul.thumbnailCategories li:hover {
+.naf .stuffs_block .personal_block ul.thumbnailCategories li:hover,
+.naf .thumbnailCategories li:hover,
+.naf .subcontent  .stuffs_block .personal_block ul.thumbnailCategories li:hover {
 	background: none;
 	color:#222;
 }
 
-.ntf .thumbnailCategory .illustration img 			{ border: 1px solid #777;}
-.ntf .thumbnailCategory .illustration img:hover 	{ border: 1px solid #111;}
+.naf .thumbnailCategory .illustration img 			{ border: 1px solid #777;}
+.naf .thumbnailCategory .illustration img:hover 	{ border: 1px solid #111;}
 
 .ntf .wrap1 .wrap2 .thumbnail {
Index: /extensions/stripped/theme.css
===================================================================
--- /extensions/stripped/theme.css	(revision 12959)
+++ /extensions/stripped/theme.css	(revision 12960)
@@ -83,9 +83,18 @@
 }
 
-#theCategoryPage #content {
+ #content {
 	max-width:1120px;
 	padding:12px 0;
+	display:table;
+}
+
+#thePicturePage #content {
+	max-width:none;
+	padding:0;
+	display:block;
+}
+
+#theCategoryPage #content {
 	text-align:center;
-	display:table;
 }
 
@@ -142,4 +151,8 @@
 }
 
+input, select, textarea { margin: 1px 0;}
+
+.content_block h2 { font-size: 115.385%;}
+
 /* Page title ---------------------------------------------------------------------------------- */
 
@@ -227,22 +240,4 @@
 }
 
-.stuffs_block .titrePage {
-	margin: 0
-}
-
-#thePicturePage .stuffs {
-	margin:3px 0;
-}
-
-#thePicturePage .stuffs_block {
-	max-width:1120px;
-	padding:0;
-	text-align:center;
-}
-
-#thePicturePage .stuffs_block p {
-	text-align:left;
-}
-
 /* Menubar ------------------------------------------------------------------------------------- */
 
@@ -301,7 +296,6 @@
 }
 
-#menubar #mbIdentification p {
-	margin: 0 0 6px 0;
-}
+#menubar #mbIdentification div { margin-bottom: 6px;}
+#menubar #mbIdentification .submit_block { margin-bottom: 0;}
 
 #menubar dd.randompicdd {
@@ -319,4 +313,10 @@
 
 /* Category thumbnails ------------------------------------------------------------------------- */
+
+.js  ul.thumbnailCategories li { cursor:pointer;}
+.js  .naf ul.thumbnailCategories li { cursor:default;}
+.js  .naf ul.thumbnailCategories li .text { cursor:pointer;}
+.js  .stuffs ul.thumbnailCategories li, .js  .stuffs ul.thumbnailCategories li .text { cursor:default;}
+
 
 .stuffs_block .personal_block ul.thumbnailCategories,
@@ -330,22 +330,23 @@
 	float: left;
 	overflow: hidden;
- 	height:170px;
-	width:170px;
 	text-align:center;
 	margin:5px;
 }
 
-.stuffs_block .personal_block ul.thumbnailCategories li {
-	width:170px!important;
-}
+.ats ul.thumbnailCategories li { width: 170px; height: 170px;}
+.at3 ul.thumbnailCategories li { width: 290px; height: 290px;}
+.at2 ul.thumbnailCategories li { width: 440px; height: 170px;}
+.at1 ul.thumbnailCategories li { width: 890px; height: 170px;}
+
+.ats .stuffs_block .personal_block ul.thumbnailCategories li { width:170px!important;}
+.at3 .stuffs_block .personal_block ul.thumbnailCategories li { width:273px!important; height:273px;}
+.at2 .stuffs_block .personal_block ul.thumbnailCategories li { width:415px!important;}
+.at1 .stuffs_block .personal_block ul.thumbnailCategories li { width:840px!important;}
 
 .thumbnailCategory {
 	display:inline-block;
-	height:170px;
 }
 
 .thumbnailCategory .illustration {
-	margin:5px 0 0;
-	height:130px;
 	vertical-align:middle;
 	border:none;
@@ -356,8 +357,21 @@
 }
 
+.ats .thumbnailCategory .illustration { height:130px;}
+.at3 .thumbnailCategory .illustration { height:130px;}
+.at2 .thumbnailCategory .illustration { height:170px;}
+.at1 .thumbnailCategory .illustration { height:170px;}
+.at2 .thumbnailCategory .illustration, .at1 .thumbnailCategory .illustration  { float: left;}
+.at3 .thumbnailCategory .illustration a { width:280px;}
+.at3 .stuffs_block .thumbnailCategory .illustration a { width:263px;}
+.at3 .thumbnailCategory .illustration a  { vertical-align:bottom;}
+
+.ats .thumbnailCategory .illustration { margin:5px 0 0;}
+.at3 .thumbnailCategory .illustration { margin:5px 5px 0 5px;}
+.at2 .thumbnailCategory .illustration { margin:0 5px;}
+.at1 .thumbnailCategory .illustration { margin:0 10px;}
+
 .thumbnailCategory .illustration a {
 	display:table-cell;
 	width:170px;
-	height:130px;
 	vertical-align:middle;
 	overflow:hidden;
@@ -367,20 +381,74 @@
 	display:block;
 	margin:auto;
-	max-height:128px;
 	max-width:160px;
 }
 
-.thumbnailCategory .description p {
-	display:none!important;
-}
-
-.thumbnailCategory .description {
+.ats .thumbnailCategory .illustration img { max-height:128px;}
+.at3 .thumbnailCategory .illustration img { max-height:128px;}
+.at2 .thumbnailCategory .illustration img { max-height:160px;}
+.at1 .thumbnailCategory .illustration img { max-height:160px;}
+
+.ats .thumbnailCategory .description p { display:none!important;}
+.atd .thumbnailCategory .description .text p.dates { display:none!important;}
+
+.atd  #content .thumbnailCategory .description .text p.Nb_images {
+	display:block;
+	font-style:italic;
+	font-size:76.923%;
+	text-align:right;
+	width:100%;
+	margin:0;
+}
+
+.atd  #content .thumbnailCategory .description .text p {
+	font-size:92.307%;
+	display:block;
+	text-align:justify;
+	width:100%;
+	margin-top:5px;
+	overflow:hidden;
+}	
+
+.ats .thumbnailCategory .description {
+	overflow: hidden;
+	display: table-cell;
+	vertical-align:middle;
 	width:160px;
 	height:35px;
+	padding:0 5px;
+}
+
+.at3 .thumbnailCategory .description {
 	overflow: hidden;
-	padding:0 5px;
-	display: table-cell;
-	vertical-align:middle;
-}
+	display: inline-block;
+	width: 280px;
+	height: 150px;
+	margin: 0 5px 5px 5px;
+	padding:0;
+}
+
+.at3 .stuffs_block .thumbnailCategory .description { width:263px;}
+
+.at2 .thumbnailCategory .description {
+	overflow: hidden;
+	display: inline-block;
+	width: 250px;
+	height: 155px;
+	margin: 10px 10px 5px 0;
+	padding:0;
+}
+
+.at1 .thumbnailCategory .description {
+	overflow: hidden;
+	display: inline-block;
+	width: 680px;
+	height: 155px;
+	margin: 10px 0;
+	padding:0;
+}
+
+.at3 .stuffs_block .personal_block .thumbnailCategory .description { width:263px;}
+.at2 .stuffs_block .personal_block .thumbnailCategory .description { width:225px;}
+.at1 .stuffs_block .personal_block .thumbnailCategory .description { width:630px;}
 
 .thumbnailCategory .description h3 {
@@ -388,22 +456,40 @@
 	font-weight:normal;
 	font-variant:normal;
+}
+
+.ats .thumbnailCategory .description h3 {
 	font-size:107.692%;
 	line-height:16px;
 }
 
+.at2 .thumbnailCategory .description h3 { text-align:left;}
+.at1 .thumbnailCategory .description h3 { text-align:left;}
+
+.atd .thumbnailCategory .description h3 {
+	font-size:115.385%;
+	padding:5px 0;
+	display:block;
+	width:100%;
+	border-bottom:1px solid;
+}
+
 .thumbnailCategories h3 a {
 	color: inherit;
 }
 
-.thumbCatDescNfoDate, .thumbCatDescNbImg {
-	margin: 0;
+.thumbnailCategory .text .dates, .thumbnailCategory  .text .Nb_images {
 	font-size: 76.923%;
-}
-
-.thumbCatDesc {
+	padding-top: 0;
+}
+
+.thumbnailCategory .text p {
 	margin: 0;
 	padding-top: 4px;
 	word-wrap: break-word;
 }
+
+.at1 li.odd1 .thumbnailCategory .illustration {float:right;}
+.at1 li.odd0 .thumbnailCategory .description {margin-right:15px;}
+.at1 li.odd1 .thumbnailCategory .description {margin-left:15px;}
 
 /* Images Thumbnails --------------------------------------------------------------------------- */
@@ -429,5 +515,5 @@
 
 .subcontent .stuffs_block ul {
-	max-width:720px;
+	max-width:880px;
 	margin-top:5px;
 }
@@ -654,4 +740,14 @@
 }
 
+.hideTabsZone {
+	position: absolute;
+	top:25px;
+	left:0;
+	right:0;
+	bottom:0;
+}
+
+#theImageBox .hideTabsZone { top:0;}
+
 /* Image Nav Arrows ---------------------------------------------------------------------------- */
 
@@ -700,5 +796,5 @@
 	}
 
-	.cat_up:hover {
+.cat_up:hover {
 	background:transparent url(icon/cat_up.png) no-repeat center top;
 }
@@ -706,18 +802,10 @@
 /* Navigation Arrows --------------------------------------------------------------------------- */
 
-#imgprev {
+#imgprev { left: 4px;}
+#imgnext { right: 4px;}
+#imgnext, #imgprev {
 	position: absolute;
 	height:150px;
 	width:20px;
-	left: 4px;
-	top:50%;
-	margin-top:-75px;
-}
-
-#imgnext {
-	position: absolute;
-	height:150px;
-	width:20px;
-	right: 4px;
 	top:50%;
 	margin-top:-75px;
@@ -908,4 +996,10 @@
 }
 
+.stuffs_block  #comments > ul > li {
+	padding: 5px 0;
+	margin: 5px;
+	width:48.86%!important
+}
+
 #comments .thumbnailCategory {
 	height:auto;
@@ -1269,4 +1363,13 @@
 }
 
+/* GThumb+ Plugin ------------------------------------------------------------------------------ */
+
+#thumbnails li.gthumb,
+#thumbnails li.gthumb:hover {
+	border-radius:0;
+	-moz-border-radius:0;
+	-webkit-border-radius:0;
+}
+
 /* PWG Stuffs Plugin --------------------------------------------------------------------------- */
 
@@ -1283,6 +1386,6 @@
 .subcontent .stuffs_block .right_block,
 .subcontent .stuffs_block .middle_block {
-	max-width:870px;
-	padding:10px;
+	max-width:880px;
+	padding:10px 5px;
 }
 
@@ -1363,13 +1466,28 @@
 }
 
-.stuffs_block .logon_block  p a {
-	margin-right: 8px
-}
-
-.stuffs_block .personal_block  {
-	text-align: center;
-}
-
-.stuffs_block .personal_block  p {
-	text-align: left;
-}
+.stuffs_block .logon_block  p a { margin-right: 8px}
+.stuffs_block .personal_block  { text-align: center;}
+#content .stuffs_block .personal_block  p { text-align: justify;}
+.stuffs_block #thumbnails  {margin:0;}
+.stuffs_block #thumbnails li {margin:5px 3px;}
+.stuffs_block .titrePage { margin: 0;}
+
+#theCategoryPage  #the_page .stuffs {
+	margin:0!important;
+	padding:5px 0;
+}
+
+#thePicturePage .stuffs { margin:3px 0;}
+#thePicturePage .stuffs_block p { text-align:left;}
+
+#thePicturePage .stuffs_block {
+	max-width:1120px;
+	padding:0;
+	text-align:center;
+}
+
+.stuffs_block .personal_block ul.thumbnailCategories {
+	vertical-align:bottom;
+	margin-top:0;
+}
+
Index: /extensions/stripped/themeconf.inc.php
===================================================================
--- /extensions/stripped/themeconf.inc.php	(revision 12959)
+++ /extensions/stripped/themeconf.inc.php	(revision 12960)
@@ -2,5 +2,5 @@
 /*
 Theme Name: stripped
-Version: Auto
+Version: 1.5.0
 Description: stripped Theme
 Theme URI: http://piwigo.org/ext/extension_view.php?eid=471
@@ -19,4 +19,10 @@
 // Need upgrade from v1.x?
 if (!isset($stripped['themeStyle'])) {
+	include(PHPWG_THEMES_PATH.'stripped/admin/upgrade.inc.php');
+	$stripped = array_merge( unserialize( $conf['stripped'] ), (array)$stripped );
+}
+
+// Need upgrade from v2.x?
+if (!isset($stripped['paramVersion'])) {
 	include(PHPWG_THEMES_PATH.'stripped/admin/upgrade.inc.php');
 	$stripped = array_merge( unserialize( $conf['stripped'] ), (array)$stripped );
