diff --git a/admin/themes/default/template/cat_list.tpl b/admin/themes/default/template/cat_list.tpl
index 4a4449c81..a1702a0d7 100644
--- a/admin/themes/default/template/cat_list.tpl
+++ b/admin/themes/default/template/cat_list.tpl
@@ -26,8 +26,8 @@
 <h3>{$CATEGORIES_NAV}</h3>
 
 <form id="addVirtual" action="{$F_ACTION}" method="post">
-  <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}" />
   <p>
+    <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
     {'Add a virtual category'|@translate} : <input type="text" name="virtual_name">
     <input class="submit" type="submit" value="{'Submit'|@translate}" name="submitAdd" {$TAG_INPUT_ENABLED}>
     {if count($categories)>9 }
@@ -39,8 +39,8 @@
 
 {if count($categories) }
 <form id="categoryOrdering" action="{$F_ACTION}" method="post">
-  <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}" />
   <p>
+    <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
     <input class="submit" name="submitOrder" type="submit" value="{'Save order'|@translate}" {$TAG_INPUT_ENABLED}>
     <input class="submit" name="submitOrderAlphaNum" type="submit" value="{'Order alphanumerically'|@translate}" {$TAG_INPUT_ENABLED}>
 	<input class="submit" name="submitOrderAlphaNumReverse" type="submit" value="{'Order alphanumerically reverse'|@translate}" {$TAG_INPUT_ENABLED}>
diff --git a/admin/themes/default/template/comments.tpl b/admin/themes/default/template/comments.tpl
index ae6e1b569..cb870ab20 100644
--- a/admin/themes/default/template/comments.tpl
+++ b/admin/themes/default/template/comments.tpl
@@ -1,5 +1,5 @@
 {literal}
-<script>
+<script type="text/javascript">
 $(document).ready(function(){
   $(".checkComment").click(function(event) {
     if (event.target.type !== 'checkbox') {
diff --git a/admin/themes/default/template/element_set_unit.tpl b/admin/themes/default/template/element_set_unit.tpl
index e06c031c5..27473ebd1 100644
--- a/admin/themes/default/template/element_set_unit.tpl
+++ b/admin/themes/default/template/element_set_unit.tpl
@@ -3,6 +3,7 @@
 {include file='include/datepicker.inc.tpl'}
 
 {known_script id="jquery.fcbkcomplete" src=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.fcbkcomplete.js"}
+{html_head}
 <script type="text/javascript">
   var tag_boxes_selector = "";
 {foreach from=$elements item=element name=element}
@@ -28,7 +29,7 @@
   });
 </script>
 {/literal}
-
+{/html_head}
 
 <h2>{'Batch management'|@translate}</h2>
 
diff --git a/admin/themes/default/template/group_list.tpl b/admin/themes/default/template/group_list.tpl
index ab74985a4..ec222acf7 100644
--- a/admin/themes/default/template/group_list.tpl
+++ b/admin/themes/default/template/group_list.tpl
@@ -3,10 +3,8 @@
 </div>
 
 <form method="post" name="add_user" action="{$F_ADD_ACTION}" class="properties">
-  <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}" />
   <fieldset>
     <legend>{'Add group'|@translate}</legend>
-
     <span class="property">
       <label for="groupname">{'Group name'|@translate}</label>
     </span>
@@ -14,6 +12,7 @@
 
     <p>
       <input class="submit" type="submit" name="submit_add" value="{'Add'|@translate}" {$TAG_INPUT_ENABLED}>
+      <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}"> 
     </p>
   </fieldset>
 </form>
diff --git a/admin/themes/default/template/include/tag_selection.inc.tpl b/admin/themes/default/template/include/tag_selection.inc.tpl
index 6098dc2a0..deedb031c 100644
--- a/admin/themes/default/template/include/tag_selection.inc.tpl
+++ b/admin/themes/default/template/include/tag_selection.inc.tpl
@@ -1,5 +1,5 @@
 {literal}
-<script>
+<script type="text/javascript">
 $(document).ready(function(){
   $(".tagSelection label").click(function () {
     var parent = $(this).parent('li');
diff --git a/admin/themes/default/template/photos_add_direct.tpl b/admin/themes/default/template/photos_add_direct.tpl
index 652bada78..f5a8c7f53 100644
--- a/admin/themes/default/template/photos_add_direct.tpl
+++ b/admin/themes/default/template/photos_add_direct.tpl
@@ -5,8 +5,9 @@
 <script type="text/javascript" src="{$uploadify_path}/swfobject.js"></script>
 <script type="text/javascript" src="{$uploadify_path}/jquery.uploadify.v2.1.0.min.js"></script>
 {/if}
-
+{html_head}
 <link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/themes/default/uploadify.jGrowl.css">
+{/html_head}
 
 {literal}
 <script type="text/javascript">
@@ -62,7 +63,7 @@ jQuery(document).ready(function(){
 {if $upload_mode eq 'html'}
 {literal}
   function addUploadBox() {
-    var uploadBox = '<p class="file"><input type="file" size="60" name="image_upload[]" /></p>';
+    var uploadBox = '<p class="file"><input type="file" size="60" name="image_upload[]"></p>';
     $(uploadBox).appendTo("#uploadBoxes");
   }
 
@@ -233,13 +234,12 @@ var buttonText = 'Browse';
 </div>
 
 <form id="uploadForm" enctype="multipart/form-data" method="post" action="{$F_ACTION}" class="properties">
-{if $upload_mode eq 'multiple'}
-<input name="upload_id" value="{$upload_id}" type="hidden">
-{/if}
-
     <fieldset>
       <legend>{'Drop into category'|@translate}</legend>
-      
+      {if $upload_mode eq 'multiple'}
+      <input name="upload_id" value="{$upload_id}" type="hidden">
+      {/if}
+
       <label><input type="radio" name="category_type" value="existing"> {'existing category'|@translate}</label>
       <label><input type="radio" name="category_type" value="new" checked="checked"> {'create a new category'|@translate}</label>
 
@@ -294,13 +294,11 @@ var buttonText = 'Browse';
     </fieldset>
 
     <p>
-      <input class="submit" type="submit" name="submit_upload" value="{'Upload'|@translate}" {$TAG_INPUT_ENABLED}/>
+      <input class="submit" type="submit" name="submit_upload" value="{'Upload'|@translate}" {$TAG_INPUT_ENABLED}>
     </p>
 {elseif $upload_mode eq 'multiple'}
-    </table>
-
     <p>
-      <input type="file" name="uploadify" id="uploadify" />
+      <input type="file" name="uploadify" id="uploadify">
     </p>
 
     <p><a href="{$switch_url}">{'... or switch to the old style form'|@translate}</a></p>
@@ -309,12 +307,12 @@ var buttonText = 'Browse';
 
     </fieldset>
     <p>
-      <input class="submit" type="button" value="{'Upload'|@translate}"/>
-      <input type="submit" name="submit_upload" style="display:none"/>
+      <input class="submit" type="button" value="{'Upload'|@translate}">
+      <input type="submit" name="submit_upload" style="display:none">
     </p>
 {/if}
 </form>
 {/if} {* empty($thumbnails) *}
 {/if} {* $setup_errors *}
 
-</div> <!-- photosAddContent -->
\ No newline at end of file
+</div> <!-- photosAddContent -->
diff --git a/admin/themes/default/template/photos_add_ploader.tpl b/admin/themes/default/template/photos_add_ploader.tpl
index 266285dc7..9412aa21d 100644
--- a/admin/themes/default/template/photos_add_ploader.tpl
+++ b/admin/themes/default/template/photos_add_ploader.tpl
@@ -1,3 +1,4 @@
+{html_head}
 {literal}
 <script type="text/javascript">
 $().ready(function(){
@@ -14,7 +15,7 @@ $().ready(function(){
 });
 </script>
 
-<style>
+<style type="text/css">
 #pLoaderPage {
   width:600px;
   margin:0 auto;
@@ -46,6 +47,7 @@ $().ready(function(){
 }
 </style>
 {/literal}
+{/html_head}
 
 <div class="titrePage">
   <h2>{'Piwigo Uploader'|@translate}</h2>
@@ -62,19 +64,19 @@ $().ready(function(){
   <tr>
     <td>
       <a href="{$URL_DOWNLOAD_WINDOWS}">
-        <img src="http://piwigo.org/screenshots/windows.png"/>
+        <img src="http://piwigo.org/screenshots/windows.png" alt="windows">
         <br>Windows
       </a>
     <td>
     <td>
       <a href="{$URL_DOWNLOAD_MAC}">
-        <img src="http://piwigo.org/screenshots/mac.png" />
+        <img src="http://piwigo.org/screenshots/mac.png" alt="mac">
         <br>Mac
       </a>
     <td>
     <td>
       <a href="{$URL_DOWNLOAD_LINUX}">
-        <img src="http://piwigo.org/screenshots/linux.png" />
+        <img src="http://piwigo.org/screenshots/linux.png" alt="linux">
         <br>Linux
       </a>
     <td>
@@ -85,4 +87,4 @@ $().ready(function(){
   <li>{'Install on your computer,'|@translate}</li>
   <li>{'Start pLoader and add your photos.'|@translate}</li>
 </ol>
-</div>
\ No newline at end of file
+</div>
diff --git a/admin/themes/default/template/photos_add_settings.tpl b/admin/themes/default/template/photos_add_settings.tpl
index d3bf2ecc6..d4fb74400 100644
--- a/admin/themes/default/template/photos_add_settings.tpl
+++ b/admin/themes/default/template/photos_add_settings.tpl
@@ -1,5 +1,5 @@
 {literal}
-<script>
+<script type="text/javascript">
 $(document).ready(function(){
   function toggleResizeFields() {
     var checkbox = $("#websize_resize");
@@ -75,4 +75,4 @@ $(document).ready(function(){
 
 </form>
 
-</div> <!-- photosAddContent -->
\ No newline at end of file
+</div> <!-- photosAddContent -->
diff --git a/admin/themes/default/template/profile_content.tpl b/admin/themes/default/template/profile_content.tpl
index 995fa734a..22be71cca 100644
--- a/admin/themes/default/template/profile_content.tpl
+++ b/admin/themes/default/template/profile_content.tpl
@@ -63,13 +63,13 @@
       </li>
       <li>
         <span class="property">
-          <label for="Language">{'Language'|@translate}</label>
+          <label for="language">{'Language'|@translate}</label>
         </span>
         {html_options id=language name=language options=$language_options selected=$language_selection}
       </li>
       <li>
         <span class="property">
-          <label for="Recent period">{'Recent period'|@translate}</label>
+          <label for="recent_period">{'Recent period'|@translate}</label>
         </span>
         <input type="text" size="3" maxlength="2" name="recent_period" id="recent_period" value="{$RECENT_PERIOD}">
       </li>
@@ -87,13 +87,13 @@
       </li>
       <li>
         <span class="property">
-          <label for="Maximum width of the pictures">{'Maximum width of the pictures'|@translate}</label>
+          <label for="maxwidth">{'Maximum width of the pictures'|@translate}</label>
         </span>
         <input type="text" size="4" maxlength="4" name="maxwidth" id="maxwidth" value="{$MAXWIDTH}">
       </li>
       <li>
         <span class="property">
-          <label for="Maximum height of the pictures">{'Maximum height of the pictures'|@translate}</label>
+          <label for="maxheight">{'Maximum height of the pictures'|@translate}</label>
         </span>
         <input type="text" size="4" maxlength="4" name="maxheight" id="maxheight" value="{$MAXHEIGHT}">
       </li>
diff --git a/admin/themes/default/template/site_manager.tpl b/admin/themes/default/template/site_manager.tpl
index 0156e60fb..4b02184fc 100644
--- a/admin/themes/default/template/site_manager.tpl
+++ b/admin/themes/default/template/site_manager.tpl
@@ -16,8 +16,8 @@
 {'A local listing.xml file has been found for'|@translate} {$local_listing.URL}
 {if isset($local_listing.CREATE)}
 <form action="{$F_ACTION}" method="post">
-  <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}" />
   <p>
+    <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
     {'Create this site'|@translate}:
     <input type="hidden" name="no_check" value="1">
     <input type="hidden" name="galleries_url" value="{$local_listing.URL}">
@@ -64,8 +64,8 @@
 {/if}
 
 <form action="{$F_ACTION}" method="post">
-  <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}" />
   <p>
+    <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
     <label for="galleries_url" >{'Create a new site : (give its URL to create_listing_file.php)'|@translate}</label>
     <input type="text" name="galleries_url" id="galleries_url">
   </p>
diff --git a/admin/themes/default/template/tags.tpl b/admin/themes/default/template/tags.tpl
index bfc8bd2de..6713ebdd3 100644
--- a/admin/themes/default/template/tags.tpl
+++ b/admin/themes/default/template/tags.tpl
@@ -5,8 +5,6 @@
 </div>
 
 <form action="{$F_ACTION}" method="post">
-  <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}" />
-
   {if isset($EDIT_TAGS_LIST)}
   <fieldset>
     <legend>{'Edit tags'|@translate}</legend>
@@ -25,6 +23,7 @@
     </table>
 
     <p>
+      <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
       <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}>
       <input class="submit" type="reset" value="{'Reset'|@translate}">
     </p>
diff --git a/admin/themes/default/template/themes_installed.tpl b/admin/themes/default/template/themes_installed.tpl
index 9f972486f..d2a37d5e9 100644
--- a/admin/themes/default/template/themes_installed.tpl
+++ b/admin/themes/default/template/themes_installed.tpl
@@ -11,7 +11,7 @@
 {foreach from=$active_themes item=theme}
   <div class="themeBox{if $theme.is_default} themeDefault{/if}">
     <div class="themeName">{$theme.name}{if $theme.is_default} <em>({'default'|@translate})</em>{/if}</div>
-    <div class="themeShot"><img src="{$theme.screenshot}"></div>
+    <div class="themeShot"><img src="{$theme.screenshot}" alt=""></div>
     <div class="themeActions">
       <div>
 {if $theme.deactivable}
@@ -41,7 +41,7 @@
 {foreach from=$inactive_themes item=theme}
   <div class="themeBox">
     <div class="themeName">{$theme.name}</div>
-    <div class="themeShot"><img src="{$theme.screenshot}"></div>
+    <div class="themeShot"><img src="{$theme.screenshot}" alt=""></div>
     <div class="themeActions">
       <div>
   {if $theme.activable}
@@ -66,4 +66,4 @@
 </fieldset>
 {/if}
 
-</div> <!-- themesContent -->
\ No newline at end of file
+</div> <!-- themesContent -->
diff --git a/admin/themes_installed.php b/admin/themes_installed.php
index f98493737..33ebf03e5 100644
--- a/admin/themes_installed.php
+++ b/admin/themes_installed.php
@@ -140,10 +140,10 @@ foreach ($themes->fs_themes as $theme_id => $fs_theme)
 
 $template->assign(
     array(
-      'activate_baseurl' => $base_url.'&action=activate&theme=',
-      'deactivate_baseurl' => $base_url.'&action=deactivate&theme=',
-      'set_default_baseurl' => $base_url.'&action=set_default&theme=',
-      'delete_baseurl' => $base_url.'&action=delete&theme=',
+      'activate_baseurl' => $base_url.'&amp;action=activate&amp;theme=',
+      'deactivate_baseurl' => $base_url.'&amp;action=deactivate&amp;theme=',
+      'set_default_baseurl' => $base_url.'&amp;action=set_default&amp;theme=',
+      'delete_baseurl' => $base_url.'&amp;action=delete&amp;theme=',
 
       'active_themes' => $active_themes,
       'inactive_themes' => $inactive_themes,
diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl
index 57353ef6f..73bd52840 100644
--- a/themes/default/template/picture.tpl
+++ b/themes/default/template/picture.tpl
@@ -252,11 +252,11 @@ y.callService(
 {if isset($metadata)}
 <table id="Metadata" class="infoTable2" summary="{'Some more (technical) info about this picture'|@translate}">
 {foreach from=$metadata item=meta}
-  <tr id="{$meta.TITLE}">
+  <tr>
     <th colspan="2">{$meta.TITLE}</th>
   </tr>
   {foreach from=$meta.lines item=value key=label}
-  <tr id="{$label}" >
+  <tr>
     <td class="label">{$label}</td>
     <td class="value">{$value}</td>
   </tr>