Index: extensions/FacebookPlug/Plugin/tpl/admin.config.tpl
===================================================================
--- extensions/FacebookPlug/Plugin/tpl/admin.config.tpl	(revision 8283)
+++ extensions/FacebookPlug/Plugin/tpl/admin.config.tpl	(revision 8295)
@@ -20,12 +20,4 @@
       <li>
         <label>
-          <span class="property">{'URL type'|@translate}</span>
-          <select name="FBP_SOCIAL_PLUGIN_LIKE_BUTTON_URL_TYPE" size="1">
-            {html_options options=$social_plugin.like_button.URL_TYPE_OPTIONS selected=$social_plugin.like_button.URL_TYPE_OPTIONS_SELECTED}
-          </select>
-        </label>
-      </li>
-      <li>
-        <label>
           <span class="property">{'Layout style'|@translate}</span>
           <select name="FBP_SOCIAL_PLUGIN_LIKE_BUTTON_LAYOUT" size="1">
@@ -83,4 +75,49 @@
 <fieldset>
   <ul>
+    <h3><a href="{$social_plugin.comments.FB_PAGE}" onclick="window.open(this.href); return false;">{'Comments'|@translate}</a> {'on picture pages'|@translate}</h3>
+    <li>
+      <label>
+        <span class="property">{'Enabled'|@translate}</span>
+        <input type="checkbox" name="FBP_SOCIAL_PLUGIN_COMMENTS_ENABLED" {$social_plugin.comments.ENABLED} />
+      </label>
+    </li>
+
+    <div id='comments'>
+      <li>
+        <label>
+          <span class="property">{'Num posts'|@translate}</span>
+          <input type="text" size="3" maxlength="4" name="FBP_SOCIAL_PLUGIN_COMMENTS_NUMPOSTS" value="{$social_plugin.comments.NUMPOSTS}" />
+        </label>
+      </li>
+      <li>
+        <label>
+          <span class="property">{'Title'|@translate}</span>
+          <input type="text" size="39" name="FBP_SOCIAL_PLUGIN_COMMENTS_TITLE" value="{$social_plugin.comments.TITLE}" />
+        </label>
+      </li>
+      <li>
+        <label>
+          <span class="property">{'Simple'|@translate}</span>
+          <input type="checkbox" name="FBP_SOCIAL_PLUGIN_COMMENTS_SIMPLE" {$social_plugin.comments.SIMPLE} />
+        </label>
+      </li>
+      <li>
+        <label>
+          <span class="property">{'Reverse'|@translate}</span>
+          <input type="checkbox" name="FBP_SOCIAL_PLUGIN_COMMENTS_REVERSE" {$social_plugin.comments.REVERSE} />
+        </label>
+      </li>
+      <li>
+        <label>
+          <span class="property">{'Publish feed'|@translate}</span>
+          <input type="checkbox" name="FBP_SOCIAL_PLUGIN_COMMENTS_PUBLISH_FEED" {$social_plugin.comments.PUBLISH_FEED} />
+        </label>
+      </li>
+    </div>
+  </ul>
+</fieldset>
+
+<fieldset>
+  <ul>
     <h3><a href="{$social_plugin.like_box.FB_PAGE}" onclick="window.open(this.href); return false;">{'Like box'|@translate}</a> {'on main pages'|@translate}</h3>
     <li>
@@ -139,4 +176,12 @@
     </li>
 *}
+    <li>
+      <label>
+        <span class="property">{'Picture URL type'|@translate}</span>
+        <select name="FBP_PICTURE_URL_TYPE" size="1">
+          {html_options options=$advanced.FBP_PICTURE_URL_TYPE_OPTIONS selected=$advanced.FBP_PICTURE_URL_TYPE_OPTIONS_SELECTED}
+        </select>
+      </label>
+    </li>
     <li>
       <label>
@@ -188,4 +233,5 @@
       init_checkbox("FBP_SOCIAL_PLUGIN_LIKE_BUTTON_ENABLED", "like_button");
       init_checkbox("FBP_SOCIAL_PLUGIN_FACEPILE_ENABLED", "facepile");
+      init_checkbox("FBP_SOCIAL_PLUGIN_COMMENTS_ENABLED", "comments");
       init_checkbox("FBP_SOCIAL_PLUGIN_LIKE_BOX_ENABLED", "like_box");
     });
Index: extensions/FacebookPlug/Plugin/tpl/init.fb.tpl
===================================================================
--- extensions/FacebookPlug/Plugin/tpl/init.fb.tpl	(revision 8283)
+++ extensions/FacebookPlug/Plugin/tpl/init.fb.tpl	(revision 8295)
@@ -1,2 +1,3 @@
+<!-- By FacebookPlug a Piwigo Plugin -->
 {if $fbp.async_script}
 <div id="fb-root"></div>
@@ -12,5 +13,5 @@
   (function() {ldelim}
     var e = document.createElement(script);
-    e.src = document.location.protocol + //connect.facebook.net/{$LANGUAGE}/all.js;
+    e.src = document.location.protocol + //connect.facebook.net/{$LANGUAGE}/all.js#appId={$FACEBOOK_APP_ID}&amp;xfbml=1;
     e.async = true;
     document.getElementById(fb-root).appendChild(e);
@@ -19,5 +20,5 @@
 {else}
 <div id="fb-root"></div>
-<script src="http://connect.facebook.net/{$LANGUAGE}/all.js#xfbml=1"></script>
+<script src="http://connect.facebook.net/{$LANGUAGE}/all.js#appId={$FACEBOOK_APP_ID}&amp;xfbml=1"></script>
 <script>
   FB.init({ldelim}
Index: extensions/FacebookPlug/Plugin/tpl/social.plugin.comments.tpl
===================================================================
--- extensions/FacebookPlug/Plugin/tpl/social.plugin.comments.tpl	(revision 8295)
+++ extensions/FacebookPlug/Plugin/tpl/social.plugin.comments.tpl	(revision 8295)
@@ -0,0 +1,12 @@
+<div id="fb-xfbml-comments">
+<fb:comments
+  xid="{$fbp_urlencode_picture}" url="{$fbp_url_picture}"
+  width="{$fbp.social_plugin_comments.width}"
+  numposts="{$fbp.social_plugin_comments.numposts}"
+  css="{$fbp.social_plugin_comments.css}"
+  title="{$fbp.social_plugin_comments.title}"
+  simple="{$fbp.social_plugin_comments.simple|@boolean_to_string}"
+  reverse="{$fbp.social_plugin_comments.reverse|@boolean_to_string}"
+  publish_feed="{$fbp.social_plugin_comments.publish_feed|@boolean_to_string}"
+></fb:comments>
+</div>
