diff --git a/e107_plugins/alt_auth/plugin.xml b/e107_plugins/alt_auth/plugin.xml
index 6214c9e36..43322ef06 100644
--- a/e107_plugins/alt_auth/plugin.xml
+++ b/e107_plugins/alt_auth/plugin.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<!-- $Id: plugin.xml,v 1.4 2009-07-17 14:41:53 marj_nl_fr Exp $ -->
+<!-- $Id: plugin.xml,v 1.5 2009-09-21 22:14:43 e107coders Exp $ -->
 
 <e107Plugin name="LAN_ALT_65" version="0.4" compatibility="0.8" installRequired="true" >
 	<author name="e107 Inc." url="e107.org" email="mcfly@e107.org" />
 	<description>LAN_ALT_66</description>
-	<folder>alt_auth</folder>
 	<category>users</category>
 	<copyright>Copyright e107 Inc e107.org, Licensed under GPL (http://www.gnu.org/licenses/gpl.txt)</copyright>
 	<logLanguageFile filename="languages/--LAN--/--LAN--_log.php" />
@@ -17,8 +16,8 @@
 		<installDone>LAN_ALT_68</installDone>
 	</administration>
 	<mainPrefs>
-		<pref name="auth_noconn" value="0" />
-		<pref name="auth_nouser" value="0" />
-		<pref name="auth_extended" value="" />
+		<pref name="auth_noconn">0</pref>
+		<pref name="auth_nouser">0</pref>
+		<pref name="auth_extended"></pref>
 	</mainPrefs>
 </e107Plugin>
\ No newline at end of file
diff --git a/e107_plugins/calendar_menu/plugin.xml b/e107_plugins/calendar_menu/plugin.xml
index df710ad41..d1d48f401 100644
--- a/e107_plugins/calendar_menu/plugin.xml
+++ b/e107_plugins/calendar_menu/plugin.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<!-- $Id: plugin.xml,v 1.8 2009-07-17 14:41:53 marj_nl_fr Exp $ -->
+<!-- $Id: plugin.xml,v 1.9 2009-09-21 22:14:43 e107coders Exp $ -->
 
 <e107Plugin name="EC_ADLAN_1" version="3.70" compatibility="0.8" installRequired="true">
 	<author name="e107 Inc. + Barry" url="http://e107.org" />
 	<description>EC_ADLAN_A206</description>
 	<readMe>readme.pdf</readMe>
-	<folder>calendar_menu</folder>
 	<category>content</category>
 	<installLanguageFile filename="languages/--LAN--_install.php" />
 	<logLanguageFile filename="languages/--LAN--_log.php" />
@@ -19,43 +18,43 @@
 	</administration>
 	<menuLink name="Calendar" url="calendar_menu/calendar.php" />
 	<mainPrefs>
-		<pref name="eventpost_admin" value="254" />
-		<pref name="eventpost_super" value="254" />
-		<pref name="eventpost_adminlog" value="0" />
-		<pref name="eventpost_menulink" value="0" />
-		<pref name="eventpost_showmouseover" value="0" />
-		<pref name="eventpost_showeventcount" value="1" />
-		<pref name="eventpost_forum" value="1" />
-		<pref name="eventpost_recentshow" value="0" />
-		<pref name="eventpost_weekstart" value="sun" />
-		<pref name="eventpost_lenday" value="1" />
-		<pref name="eventpost_dateformat" value="1" />
-		<pref name="eventpost_datedisplay" value="1" />
-		<pref name="eventpost_fivemins" value="1" />
-		<pref name="eventpost_editmode" value="1" />
-		<pref name="eventpost_caltime" value="0" />
-		<pref name="eventpost_timedisplay" value="0" />
-		<pref name="eventpost_timecustom" value="%H%M" />
-		<pref name="eventpost_dateevent" value="1" />
-		<pref name="eventpost_eventdatecustom" value="%A %d %B %Y" />
-		<pref name="eventpost_datenext" value="1" />
-		<pref name="eventpost_nextdatecustom" value="%d %b" />
-		<pref name="eventpost_printlists" value="1" />
-		<pref name="eventpost_asubs" value="1" />
-		<pref name="eventpost_mailfrom" value="e107 Web Site" />
-		<pref name="eventpost_mailsubject" value="Calendar - \{EC_MAIL_TITLE\}" />
-		<pref name="eventpost_mailaddress" value="calendar@yoursite.com" />
-		<pref name="eventpost_emaillog" value="1" />
-		<pref name="eventpost_menuheading" value="Forthcoming Events" />
-		<pref name="eventpost_daysforward" value="30" />
-		<pref name="eventpost_numevents" value="3" />
-		<pref name="eventpost_checkrecur" value="1" />
-		<pref name="eventpost_linkheader" value="0" />
-		<pref name="eventpost_fe_set" value="" />
-		<pref name="eventpost_fe_hideifnone" value="0" />
-		<pref name="eventpost_fe_showrecent" value="0" />
-		<pref name="eventpost_showcaticon" value="0" />
-		<pref name="eventpost_namelink" value="1" />
+		<pref name="eventpost_admin">254</pref>
+		<pref name="eventpost_super">254</pref>
+		<pref name="eventpost_adminlog">0</pref>
+		<pref name="eventpost_menulink">0</pref>
+		<pref name="eventpost_showmouseover">0</pref>
+		<pref name="eventpost_showeventcount">1</pref>
+		<pref name="eventpost_forum">1</pref>
+		<pref name="eventpost_recentshow">0</pref>
+		<pref name="eventpost_weekstart">sun</pref>
+		<pref name="eventpost_lenday">1</pref>
+		<pref name="eventpost_dateformat">1</pref>
+		<pref name="eventpost_datedisplay">1</pref>
+		<pref name="eventpost_fivemins">1</pref>
+		<pref name="eventpost_editmode">1</pref>
+		<pref name="eventpost_caltime">0</pref>
+		<pref name="eventpost_timedisplay">0</pref>
+		<pref name="eventpost_timecustom">%H%M</pref>
+		<pref name="eventpost_dateevent">1</pref>
+		<pref name="eventpost_eventdatecustom">%A %d %B %Y</pref>
+		<pref name="eventpost_datenext">1</pref>
+		<pref name="eventpost_nextdatecustom">%d %b</pref>
+		<pref name="eventpost_printlists">1</pref>
+		<pref name="eventpost_asubs">1</pref>
+		<pref name="eventpost_mailfrom">e107 Web Site</pref>
+		<pref name="eventpost_mailsubject">Calendar - \{EC_MAIL_TITLE\}</pref>
+		<pref name="eventpost_mailaddress">calendar@yoursite.com</pref>
+		<pref name="eventpost_emaillog">1</pref>
+		<pref name="eventpost_menuheading">Forthcoming Events</pref>
+		<pref name="eventpost_daysforward">30</pref>
+		<pref name="eventpost_numevents">3</pref>
+		<pref name="eventpost_checkrecur">1</pref>
+		<pref name="eventpost_linkheader">0</pref>
+		<pref name="eventpost_fe_set"></pref>
+		<pref name="eventpost_fe_hideifnone">0</pref>
+		<pref name="eventpost_fe_showrecent">0</pref>
+		<pref name="eventpost_showcaticon">0</pref>
+		<pref name="eventpost_namelink">0</pref>
 	</mainPrefs>
 	<management>
 		<install when="post" type="classFunction" file="calendar_install.php" class="calendarInstall" function="postInstall" />
diff --git a/e107_plugins/chatbox_menu/plugin.xml b/e107_plugins/chatbox_menu/plugin.xml
index ad9e1459a..3b1890518 100644
--- a/e107_plugins/chatbox_menu/plugin.xml
+++ b/e107_plugins/chatbox_menu/plugin.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<!-- $Id: plugin.xml,v 1.5 2009-07-17 14:41:54 marj_nl_fr Exp $ -->
+<!-- $Id: plugin.xml,v 1.6 2009-09-21 22:14:43 e107coders Exp $ -->
 
 <e107Plugin name="CHBLAN_40" version="1.0" compatibility="0.8" installRequired="true">
 	<author name="e107 Inc." url="http://e107.org" email="jalist@e107.org" />
 	<description>CHBLAN_41</description>
-	<folder>chatbox_menu</folder>
 	<category>content</category>
 	<logLanguageFile filename="languages/--LAN--/--LAN--_config.php" />
 	<copyright>Copyright e107 Inc e107.org, Licensed under GPL (http://www.gnu.org/licenses/gpl.txt)</copyright>
@@ -16,11 +15,11 @@
 		<caption>LAN_CONFIGURE</caption>
 	</administration>
 	<mainPrefs>
-		<pref name="chatbox_posts" value="10" />
-		<pref name="cb_wordwrap" value="20" />
-		<pref name="cb_layer" value="0" />
-		<pref name="cb_layer_height" value="200" />
-		<pref name="cb_emote" value="0" />
-		<pref name="cb_mod" value="254" />
+		<pref name="chatbox_posts">10</pref>
+		<pref name="cb_wordwrap">20</pref>
+		<pref name="cb_layer">0</pref>
+		<pref name="cb_layer_height">200</pref>
+		<pref name="cb_emote">0</pref>
+		<pref name="cb_mod">254</pref>
 	</mainPrefs>
 </e107Plugin>
\ No newline at end of file
diff --git a/e107_plugins/download/plugin.xml b/e107_plugins/download/plugin.xml
index 3aa76e9fa..8e6a11f30 100755
--- a/e107_plugins/download/plugin.xml
+++ b/e107_plugins/download/plugin.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id: plugin.xml,v 1.11 2009-07-19 14:48:00 marj_nl_fr Exp $ -->
+<!-- $Id: plugin.xml,v 1.12 2009-09-21 22:14:43 e107coders Exp $ -->
 <e107Plugin name="Download" version="1.0" compatibility="0.8" installRequired="true">
 	<author name="e107 Inc." url="http://e107.org" />
 	<description>DOWLAN_DESCRIPTION</description>
-	<folder>download</folder>
 	<category>content</category>
 	<installLanguageFile filename="languages/--LAN--/admin_download.php" />
 	<administration>
@@ -22,18 +21,18 @@
 	</administration>
 	<menuLink name="DOWLAN_29" url="download/download.php" perm="everyone" />
 	<mainPrefs>
-		<pref name="download_php" value="" />
-		<pref name="download_subsub" value="1" />
-		<pref name="download_incinfo" value="" />
-		<pref name="download_view" value="" />
-		<pref name="download_order" value="" />
-		<pref name="download_sort" value="" />
-		<pref name="download_reportbroken" value="0" />
-		<pref name="mirror_order" value="" />
-		<pref name="download_email" value="" />
-		<pref name="agree_flag" value="" /> <!-- needs download prefix? -->
-		<pref name="agree_text" value="" />
-		<pref name="download_denied" value="" />
+		<pref name="download_php"></pref>
+		<pref name="download_subsub">1</pref>
+		<pref name="download_incinfo"></pref>
+		<pref name="download_view"></pref>
+		<pref name="download_order"></pref>
+		<pref name="download_sort"></pref>
+		<pref name="download_reportbroken">0</pref>
+		<pref name="mirror_order"></pref>
+		<pref name="download_email"></pref>
+		<pref name="agree_flag"></pref> <!-- needs download prefix? -->
+		<pref name="agree_text"></pref>
+		<pref name="download_denied"></pref>
 	</mainPrefs>
 	<management>
 		<install when="post" type="classFunction" file="download_management.php" class="download_management" function="download_install_post" />
diff --git a/e107_plugins/featurebox/plugin.xml b/e107_plugins/featurebox/plugin.xml
index 26d907a4f..ec6814aff 100644
--- a/e107_plugins/featurebox/plugin.xml
+++ b/e107_plugins/featurebox/plugin.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<!-- $Id: plugin.xml,v 1.5 2009-07-17 14:41:54 marj_nl_fr Exp $ -->
+<!-- $Id: plugin.xml,v 1.6 2009-09-21 22:14:44 e107coders Exp $ -->
 
 	<e107Plugin name="FBLAN_01" version="1.0" compatibility="0.8" installRequired="true">
 	<author name="e107 Inc." url="http://e107.org" email="jalist@e107.org" />
 	<description>FBLAN_02</description>
 	<logLanguageFile filename="languages/--LAN--_admin_featurebox.php" />
-	<folder>featurebox</folder>
 	<category>content</category>
 	<copyright>Copyright e107 Inc e107.org, Licensed under GPL (http://www.gnu.org/licenses/gpl.txt)</copyright>
 	<administration>
@@ -17,6 +16,6 @@
 		<installDone>FBLAN_04</installDone>
 	</administration>
 	<mainPrefs>
-		<pref name="fb_active" value="1" />
+		<pref name="fb_active">1</pref>
 	</mainPrefs>
 </e107Plugin>
\ No newline at end of file
diff --git a/e107_plugins/forum/plugin.xml b/e107_plugins/forum/plugin.xml
index b4939160d..71a5a8c32 100755
--- a/e107_plugins/forum/plugin.xml
+++ b/e107_plugins/forum/plugin.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id: plugin.xml,v 1.23 2009-07-22 14:45:14 e107coders Exp $ -->
+<!-- $Id: plugin.xml,v 1.24 2009-09-21 22:14:44 e107coders Exp $ -->
 <e107Plugin name="Forum" version="2.0" compatibility="0.8" installRequired="true" xhtmlcompliant="true" >
 	<author name="e107 Inc." url="http://e107.org" />
 	<description>This plugin is a fully featured Forum system</description>
-	<folder>forum</folder>
 	<category>content</category> 
 	<administration>
 		<configFile>forum_admin.php</configFile>
@@ -18,17 +17,17 @@
 	</administration>
 	<menuLink name="Forum" url="forum/forum.php" perm='everyone' />
 	<mainPrefs>
-		<pref name="forum_show_topics" value="1" />
-		<pref name="forum_postfix" value="[more...]" />
-		<pref name="forum_poll" value="255" />
-		<pref name="forum_popular" value="10" />
-		<pref name="forum_track" value="1" />
-		<pref name="forum_eprefix" value="[forum]" />
-		<pref name="forum_enclose" value="1" />
-		<pref name="forum_title" value="Forums" />
-		<pref name="forum_postspage" value="10" />
-		<pref name="forum_threadspage" value="25" />
-		<pref name="forum_hilightsticky" value="1" />
+		<pref name="forum_show_topics">1</pref>
+		<pref name="forum_postfix">[more...]</pref>
+		<pref name="forum_poll">255</pref>
+		<pref name="forum_popular">10</pref>
+		<pref name="forum_track">1</pref>
+		<pref name="forum_eprefix">[forum]</pref>
+		<pref name="forum_enclose">1</pref>
+		<pref name="forum_title">Forums</pref>
+		<pref name="forum_postspage">10</pref>
+		<pref name="forum_threadspage">25</pref>
+		<pref name="forum_hilightsticky">1</pref>
 	</mainPrefs>
 	<userclass name="forum_moderator" description="Moderator of all forums" />
 	<extendedField name="viewed" type='EUF_TEXTAREA' default='0' active="true" />
diff --git a/e107_plugins/gsitemap/plugin.xml b/e107_plugins/gsitemap/plugin.xml
index 8d4db2a8a..7c5ef3efc 100644
--- a/e107_plugins/gsitemap/plugin.xml
+++ b/e107_plugins/gsitemap/plugin.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Id: plugin.xml,v 1.3 2009-07-17 14:41:54 marj_nl_fr Exp $ -->
-
-<e107Plugin name="GSLAN_19" version="1.0" compatibility="0.8" installRequired="true">
+<!-- $Id: plugin.xml,v 1.4 2009-09-21 22:14:44 e107coders Exp $ -->
+<e107Plugin name="GSLAN_19" version="1.0" compatibility="0.8" installRequired="true" releaseUrl='http://www.e107.org/themeupdate.php'>
 	<author name="e107 Inc." url="http://e107coders.org" email="cameron@e107coders.org" />
 	<description>GSLAN_41</description>
 	<logLanguageFile filename="languages/--LAN--_admin_gsitemap.php" />
-	<folder>gsitemap</folder>
 	<copyright>Copyright e107 Inc e107.org, Licensed under GPL (http://www.gnu.org/licenses/gpl.txt)</copyright>
 	<administration>
 		<configFile>admin_config.php</configFile>
@@ -16,6 +13,6 @@
 		<installDone>GSLAN_42</installDone>
 	</administration>
 	<menuLink name="Sitemap" url="/gsitemap.php?show" />
-	<mainPrefs>
-	</mainPrefs>
+	<pluginPrefs>
+	</pluginPrefs>
 </e107Plugin>
\ No newline at end of file
diff --git a/e107_plugins/links_page/plugin.xml b/e107_plugins/links_page/plugin.xml
index 169a5ffa0..636a4119c 100644
--- a/e107_plugins/links_page/plugin.xml
+++ b/e107_plugins/links_page/plugin.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<!-- $Id: plugin.xml,v 1.5 2009-07-17 14:41:54 marj_nl_fr Exp $ -->
+<!-- $Id: plugin.xml,v 1.6 2009-09-21 22:14:44 e107coders Exp $ -->
 
 	<e107Plugin name="LCLAN_PLUGIN_LAN_1" version="1.12" compatibility="0.8" installRequired="true">
 	<author name="e107 Inc." url="http://e107.org" />
 	<description>Links Page For Displaying External Web Links</description>
-	<folder>links_page</folder>
 	<category>content</category>
 	<copyright>Copyright e107 Inc e107.org, Licensed under GPL (http://www.gnu.org/licenses/gpl.txt)</copyright>
 	<logLanguageFile filename="languages/--LAN--_admin_links_page.php" />
@@ -17,6 +16,6 @@
 		<installDone>Links page has successfully installed, please configure it from the Links Page link on the admin front page.</installDone>
 	</administration>
 	<menuLink name="Links" url="links_page/links.php" />
-	<mainPrefs>
-	</mainPrefs>
+	<pluginPrefs>
+	</pluginPrefs>
 </e107Plugin>
\ No newline at end of file
diff --git a/e107_plugins/linkwords/plugin.xml b/e107_plugins/linkwords/plugin.xml
index b88960d25..c76f108ed 100644
--- a/e107_plugins/linkwords/plugin.xml
+++ b/e107_plugins/linkwords/plugin.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id: plugin.xml,v 1.4 2009-07-17 14:41:54 marj_nl_fr Exp $ -->
+<!-- $Id: plugin.xml,v 1.5 2009-09-21 22:14:44 e107coders Exp $ -->
 <e107Plugin name="LWLANINS_1" version="1.1" compatibility="0.8" installRequired="true" >
 	<author name="e107 Inc." url="http://e107.org" />
 	<description>This plugin will link specified words with a defined link and/or tooltip</description>
-	<folder>linkwords</folder>
 	<logLanguageFile filename="languages/--LAN--_admin_linkwords.php" />
 	<administration>
 		<configFile>admin_config.php</configFile>
diff --git a/e107_plugins/list_new/plugin.xml b/e107_plugins/list_new/plugin.xml
index 81b04e1c0..b77a6e68e 100644
--- a/e107_plugins/list_new/plugin.xml
+++ b/e107_plugins/list_new/plugin.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<!-- $Id: plugin.xml,v 1.6 2009-07-19 14:48:01 marj_nl_fr Exp $ -->
+<!-- $Id: plugin.xml,v 1.7 2009-09-21 22:14:44 e107coders Exp $ -->
 
 <e107Plugin name="LIST_PLUGIN_1" version="1.0" compatibility="0.8" installRequired="true">
 	<author name="e107 Inc." url="http://e107.org" />
 	<description>LIST_PLUGIN_2</description>
-	<folder>list_new</folder>
 	<logLanguageFile filename="languages/--LAN--_admin_list_new.php" />
 	<copyright>Copyright e107 Inc e107.org, Licensed under GPL (http://www.gnu.org/licenses/gpl.txt)</copyright>
 	<administration>
@@ -16,6 +15,6 @@
 		<installDone>LIST_PLUGIN_4</installDone>
 	</administration>
 	<menuLink name="LIST_PLUGIN_5" url="list_new/list.php" />
-	<mainPrefs>
-	</mainPrefs>
+	<pluginPrefs>
+	</pluginPrefs>
 </e107Plugin>
\ No newline at end of file
diff --git a/e107_plugins/log/plugin.xml b/e107_plugins/log/plugin.xml
index f7d771d78..0d1c14dff 100644
--- a/e107_plugins/log/plugin.xml
+++ b/e107_plugins/log/plugin.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id: plugin.xml,v 1.5 2009-07-17 14:41:54 marj_nl_fr Exp $ -->
+<!-- $Id: plugin.xml,v 1.6 2009-09-21 22:14:44 e107coders Exp $ -->
 <e107Plugin name="ADSTAT_L3" version="2.1" compatibility="0.8" installRequired="true" >
 	<author name="e107 Inc." url="http://e107.org" />
 	<description>ADSTAT_L1</description>
-	<folder>log</folder>
 	<logLanguageFile filename="languages/--LAN--_admin_log.php" />
 	<administration>
 		<configFile>admin_config.php</configFile>
@@ -14,15 +13,15 @@
 	</administration>
 	<menuLink name="ADSTAT_L34" url="log/stats.php?1" />
 	<mainPrefs>
-		<pref name="statActivate" value="0" />
-		<pref name="statUserclass" value="" />
-		<pref name="statBrowser" value="1" />
-		<pref name="statOs" value="1" />
-		<pref name="statScreen" value="1" />
-		<pref name="statDomain" value="1" />
-		<pref name="statRefer" value="1" />
-		<pref name="statQuery" value="1" />
-		<pref name="statRecent" value="1" />
-		<pref name="statPrevMonth" value="0" />
+		<pref name="statActivate">0</pref>
+		<pref name="statUserclass"></pref>
+		<pref name="statBrowser">1</pref>
+		<pref name="statOs">1</pref>
+		<pref name="statScreen">1</pref>
+		<pref name="statDomain">1</pref>
+		<pref name="statRefer">1</pref>
+		<pref name="statQuery">1</pref>
+		<pref name="statRecent">1</pref>
+		<pref name="statPrevMonth">0</pref>
 	</mainPrefs>
 </e107Plugin>
\ No newline at end of file
diff --git a/e107_plugins/newsfeed/plugin.xml b/e107_plugins/newsfeed/plugin.xml
index b45f8e804..650c4d06f 100644
--- a/e107_plugins/newsfeed/plugin.xml
+++ b/e107_plugins/newsfeed/plugin.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!-- Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt) -->
-<!-- $Id: plugin.xml,v 1.4 2009-07-17 14:41:54 marj_nl_fr Exp $ -->
+<!-- $Id: plugin.xml,v 1.5 2009-09-21 22:14:44 e107coders Exp $ -->
 
 <e107Plugin name="NFLAN_01" version="2.0" compatibility="0.8" installRequired="true">
 	<author name="e107 Inc." url="http://e107.org" email="jalist@e107.org" />
@@ -18,6 +18,6 @@
 		<installDone>NFLAN_02</installDone>
 	</administration>
 	<menuLink name="Newsfeeds" url="newsfeed/newsfeed.php" />
-	<mainPrefs>
-	</mainPrefs>
+	<pluginPrefs>
+	</pluginPrefs>
 </e107Plugin>
\ No newline at end of file
diff --git a/e107_plugins/pdf/plugin.xml b/e107_plugins/pdf/plugin.xml
index ed63409b6..000d27e82 100644
--- a/e107_plugins/pdf/plugin.xml
+++ b/e107_plugins/pdf/plugin.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<!-- $Id: plugin.xml,v 1.2 2009-07-17 14:41:54 marj_nl_fr Exp $ -->
+<!-- $Id: plugin.xml,v 1.3 2009-09-21 22:14:44 e107coders Exp $ -->
 
 	<e107Plugin name="PDF_PLUGIN_LAN_1" version="1.0" compatibility="0.8" installRequired="true">
 	<author name="Eric Vanderfeesten (lisa)" url="http://eindhovenseschool.net" email="lisa@eindhovenseschool.net" />
 	<description>PDF_PLUGIN_LAN_2</description>
-	<folder>pdf</folder>
 	<copyright>Copyright e107 Inc e107.org, Licensed under GPL (http://www.gnu.org/licenses/gpl.txt)</copyright>
 	<logLanguageFile filename="languages/--LAN--_admin_pdf.php" />
 	<administration>
@@ -15,6 +14,6 @@
 		<caption>PDF</caption>
 		<installDone>PDF_PLUGIN_LAN_4</installDone>
 	</administration>
-	<mainPrefs>
-	</mainPrefs>
+	<pluginPrefs>
+	</pluginPrefs>
 </e107Plugin>
\ No newline at end of file
diff --git a/e107_plugins/poll/plugin.xml b/e107_plugins/poll/plugin.xml
index fae60a1fe..7462bc1df 100644
--- a/e107_plugins/poll/plugin.xml
+++ b/e107_plugins/poll/plugin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id: plugin.xml,v 1.8 2009-07-17 14:41:54 marj_nl_fr Exp $ -->
+<!-- $Id: plugin.xml,v 1.9 2009-09-21 22:14:45 e107coders Exp $ -->
 <e107Plugin name="POLL_ADLAN01" version="2.0" compatibility="0.8" installRequired="true" >
 	<author name="e107 Inc." url="http://e107.org" />
 	<description>POLL_ADLAN02</description>
@@ -14,6 +14,6 @@
 		<caption>POLL_ADLAN03</caption>
 		<installDone>POLL_ADLAN04</installDone>
 	</administration>
-	<mainPrefs>
-	</mainPrefs>
+	<pluginPrefs>
+	</pluginPrefs>
 </e107Plugin>
\ No newline at end of file
diff --git a/e107_plugins/rss_menu/plugin.xml b/e107_plugins/rss_menu/plugin.xml
index a4e33b218..987015a03 100644
--- a/e107_plugins/rss_menu/plugin.xml
+++ b/e107_plugins/rss_menu/plugin.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<!-- $Id: plugin.xml,v 1.5 2009-09-18 19:05:50 e107coders Exp $ -->
+<!-- $Id: plugin.xml,v 1.6 2009-09-21 22:14:45 e107coders Exp $ -->
 
 	<e107Plugin name="RSS_PLUGIN_LAN_1" version="1.3" compatibility="0.8" installRequired="true">
 	<author name="e107 Inc." url="http://e107.org" />
 	<description>RSS_PLUGIN_LAN_2</description>
 	<compatibility>0.8</compatibility>
-	<folder>rss_menu</folder>
 	<category>misc</category>
 	<logLanguageFile filename="languages/--LAN--_admin_rss_menu.php" />
 	<copyright>Copyright e107 Inc e107.org, Licensed under GPL (http://www.gnu.org/licenses/gpl.txt)</copyright>
@@ -16,6 +15,6 @@
 		<iconSmall>images/rss_16.png</iconSmall>
 		<caption>LAN_CONFIGURE</caption>
 	</administration>
-	<mainPrefs>
-	</mainPrefs>
+	<pluginPrefs>
+	</pluginPrefs>
 </e107Plugin>
\ No newline at end of file
diff --git a/e107_plugins/trackback/plugin.xml b/e107_plugins/trackback/plugin.xml
index b098db7b5..dccc773f1 100644
--- a/e107_plugins/trackback/plugin.xml
+++ b/e107_plugins/trackback/plugin.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<!-- $Id: plugin.xml,v 1.3 2009-07-17 14:41:55 marj_nl_fr Exp $ -->
+<!-- $Id: plugin.xml,v 1.4 2009-09-21 22:14:45 e107coders Exp $ -->
 
 <e107Plugin name="TRACKBACK_L16" version="1.1" compatibility="0.8" installRequired="true">
 	<author name="e107 Inc." url="http://e107.org" email="jalist@e107.org" />
 	<description>TRACKBACK_L2</description>
-	<folder>trackback</folder>
 	<copyright>Copyright e107 Inc e107.org, Licensed under GPL (http://www.gnu.org/licenses/gpl.txt)</copyright>
 	<logLanguageFile filename="languages/--LAN--_admin_trackback.php" />
 	<administration>
@@ -16,7 +15,7 @@
 		<installDone>TRACKBACK_L3</installDone>
 	</administration>
 	<mainPrefs>
-		<pref name="trackbackEnabled" value="0" />
-		<pref name="trackbackString" value="Trackback address for this post:" />
+		<pref name="trackbackEnabled">0</pref>
+		<pref name="trackbackString">Trackback address for this post:</pref>
 	</mainPrefs>
 </e107Plugin>
\ No newline at end of file