Index: /media/work/XWiki-Work/Eclipse_Workspace_Tests/xwiki-enterprise-1.1/wiki/src/main/resources/XWiki/WebPreferences
===================================================================
--- /media/work/XWiki-Work/Eclipse_Workspace_Tests/xwiki-enterprise-1.1/wiki/src/main/resources/XWiki/WebPreferences	(revision 5761)
+++ /media/work/XWiki-Work/Eclipse_Workspace_Tests/xwiki-enterprise-1.1/wiki/src/main/resources/XWiki/WebPreferences	(working copy)
@@ -12,9 +12,9 @@
 <customClass></customClass>
 <contentAuthor>XWiki.Admin</contentAuthor>
 <creationDate>1107117220000</creationDate>
-<date>1177089472000</date>
-<contentUpdateDate>1177089472000</contentUpdateDate>
-<version>1.14</version>
+<date>1194628527000</date>
+<contentUpdateDate>1194628527000</contentUpdateDate>
+<version>1.2</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -19,6 +19,118 @@
 <template></template>
 <defaultTemplate></defaultTemplate>
 <validationScript></validationScript>
+<comment></comment>
+<object>
+<class>
+<name>XWiki.TagClass</name>
+<customClass></customClass>
+<customMapping></customMapping>
+<defaultViewSheet></defaultViewSheet>
+<defaultEditSheet></defaultEditSheet>
+<defaultWeb></defaultWeb>
+<nameField></nameField>
+<validationScript></validationScript>
+<tags>
+<cache>0</cache>
+<displayType>input</displayType>
+<multiSelect>1</multiSelect>
+<name>tags</name>
+<number>1</number>
+<prettyName>Tags</prettyName>
+<relationalStorage>1</relationalStorage>
+<separator> </separator>
+<separators> ,|</separators>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
+<values></values>
+<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
+</tags>
+</class>
+<name>XWiki.WebPreferences</name>
+<number>0</number>
+<className>XWiki.TagClass</className>
+<property>
+<tags/>
+</property>
+</object>
+<object>
+<class>
+<name>XWiki.XWikiGlobalRights</name>
+<customClass></customClass>
+<customMapping></customMapping>
+<defaultViewSheet></defaultViewSheet>
+<defaultEditSheet></defaultEditSheet>
+<defaultWeb></defaultWeb>
+<nameField></nameField>
+<validationScript></validationScript>
+<allow>
+<defaultValue>1</defaultValue>
+<displayFormType>select</displayFormType>
+<displayType>allow</displayType>
+<name>allow</name>
+<number>4</number>
+<prettyName>Allow/Deny</prettyName>
+<unmodifiable>0</unmodifiable>
+<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
+</allow>
+<groups>
+<cache>0</cache>
+<displayType>select</displayType>
+<multiSelect>1</multiSelect>
+<name>groups</name>
+<number>4</number>
+<prettyName>Groups</prettyName>
+<relationalStorage>0</relationalStorage>
+<separator> </separator>
+<size>5</size>
+<unmodifiable>0</unmodifiable>
+<usesList>1</usesList>
+<classType>com.xpn.xwiki.objects.classes.GroupsClass</classType>
+</groups>
+<levels>
+<cache>0</cache>
+<displayType>select</displayType>
+<multiSelect>1</multiSelect>
+<name>levels</name>
+<number>4</number>
+<prettyName>Levels</prettyName>
+<relationalStorage>0</relationalStorage>
+<separator> </separator>
+<size>3</size>
+<unmodifiable>0</unmodifiable>
+<classType>com.xpn.xwiki.objects.classes.LevelsClass</classType>
+</levels>
+<users>
+<cache>0</cache>
+<displayType>select</displayType>
+<multiSelect>1</multiSelect>
+<name>users</name>
+<number>4</number>
+<prettyName>Users</prettyName>
+<relationalStorage>0</relationalStorage>
+<separator> </separator>
+<size>5</size>
+<unmodifiable>0</unmodifiable>
+<usesList>1</usesList>
+<classType>com.xpn.xwiki.objects.classes.UsersClass</classType>
+</users>
+</class>
+<name>XWiki.WebPreferences</name>
+<number>0</number>
+<className>XWiki.XWikiGlobalRights</className>
+<property>
+<allow>1</allow>
+</property>
+<property>
+<groups>XWiki.XWikiAdminGroup,</groups>
+</property>
+<property>
+<levels>edit</levels>
+</property>
+<property>
+<users></users>
+</property>
+</object>
 <object>
 <class>
 <name>XWiki.XWikiPreferences</name>
@@ -29,736 +141,740 @@
 <defaultWeb></defaultWeb>
 <nameField></nameField>
 <validationScript></validationScript>
+<ad_clientid>
+<customDisplay></customDisplay>
+<name>ad_clientid</name>
+<number>25</number>
+<prettyName>Advertisement Client ID</prettyName>
+<size>60</size>
+<tooltip></tooltip>
+<unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
+<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+</ad_clientid>
 <admin_email>
+<customDisplay></customDisplay>
 <name>admin_email</name>
+<number>14</number>
 <prettyName>Admin eMail</prettyName>
-<unmodifiable>0</unmodifiable>
 <size>30</size>
-<customDisplay></customDisplay>
-<validationRegExp></validationRegExp>
 <tooltip></tooltip>
-<number>14</number>
+<unmodifiable>0</unmodifiable>
 <validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </admin_email>
-<macros_wiki>
-<name>macros_wiki</name>
-<prettyName>Macros for the Wiki Parser</prettyName>
-<unmodifiable>0</unmodifiable>
-<size>60</size>
+<auth_active_check>
 <customDisplay></customDisplay>
+<defaultValue></defaultValue>
+<displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
+<name>auth_active_check</name>
+<number>31</number>
+<prettyName>Authentication Active Check</prettyName>
+<tooltip></tooltip>
+<unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
 <validationRegExp></validationRegExp>
+<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
+</auth_active_check>
+<authenticate_edit>
+<customDisplay></customDisplay>
+<defaultValue></defaultValue>
+<displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
+<name>authenticate_edit</name>
+<number>7</number>
+<prettyName>Authenticate On Edit</prettyName>
 <tooltip></tooltip>
-<number>32</number>
+<unmodifiable>0</unmodifiable>
 <validationMessage></validationMessage>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</macros_wiki>
+<validationRegExp></validationRegExp>
+<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
+</authenticate_edit>
 <authenticate_view>
-<name>authenticate_view</name>
-<prettyName>Authenticated View</prettyName>
-<unmodifiable>0</unmodifiable>
-<displayFormType>select</displayFormType>
 <customDisplay></customDisplay>
-<validationRegExp></validationRegExp>
 <defaultValue></defaultValue>
-<tooltip></tooltip>
+<displayFormType>select</displayFormType>
 <displayType>yesno</displayType>
+<name>authenticate_view</name>
 <number>5</number>
+<prettyName>Authenticated View</prettyName>
+<tooltip></tooltip>
+<unmodifiable>0</unmodifiable>
 <validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
 </authenticate_view>
-<auth_active_check>
-<name>auth_active_check</name>
-<prettyName>Authentication Active Check</prettyName>
-<unmodifiable>0</unmodifiable>
-<displayFormType>select</displayFormType>
+<backlinks>
 <customDisplay></customDisplay>
-<validationRegExp></validationRegExp>
 <defaultValue></defaultValue>
-<tooltip></tooltip>
+<displayFormType>select</displayFormType>
 <displayType>yesno</displayType>
-<number>31</number>
+<name>backlinks</name>
+<number>25</number>
+<prettyName>Backlinks</prettyName>
+<tooltip></tooltip>
+<unmodifiable>0</unmodifiable>
 <validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-</auth_active_check>
-<meta>
-<name>meta</name>
-<prettyName>HTTP Meta Info</prettyName>
-<unmodifiable>0</unmodifiable>
-<size>40</size>
-<rows>5</rows>
+</backlinks>
+<comment_anonymous>
+<cache>0</cache>
 <customDisplay></customDisplay>
-<contenttype>FullyRenderedText</contenttype>
+<displayType>select</displayType>
+<multiSelect>0</multiSelect>
+<name>comment_anonymous</name>
+<number>39</number>
+<picker></picker>
+<prettyName>Anonymous</prettyName>
+<relationalStorage>0</relationalStorage>
+<separator> </separator>
+<separators> ,|</separators>
+<size>1</size>
+<sort>none</sort>
+<tooltip></tooltip>
+<unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
 <validationRegExp></validationRegExp>
+<values>---|Image|Text</values>
+<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
+</comment_anonymous>
+<comment_registered>
+<cache>0</cache>
+<customDisplay></customDisplay>
+<displayType>select</displayType>
+<multiSelect>0</multiSelect>
+<name>comment_registered</name>
+<number>40</number>
+<picker></picker>
+<prettyName>Registered</prettyName>
+<relationalStorage>0</relationalStorage>
+<separator> </separator>
+<separators> ,|</separators>
+<size>1</size>
+<sort>none</sort>
 <tooltip></tooltip>
-<number>9</number>
+<unmodifiable>0</unmodifiable>
 <validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
+<values>---|Image|Text</values>
+<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
+</comment_registered>
+<confirmation_email_content>
+<contenttype>FullyRenderedText</contenttype>
+<customDisplay></customDisplay>
 <editor>---</editor>
-<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
-</meta>
-<macros_velocity>
-<name>macros_velocity</name>
-<prettyName>Macros for Velocity</prettyName>
+<name>confirmation_email_content</name>
+<number>16</number>
+<prettyName>Confirmation eMail Content</prettyName>
+<rows>10</rows>
+<size>72</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
-<size>60</size>
-<customDisplay></customDisplay>
+<validationMessage></validationMessage>
 <validationRegExp></validationRegExp>
+<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
+</confirmation_email_content>
+<convertmail>
+<customDisplay></customDisplay>
+<name>convertmail</name>
+<number>50</number>
+<prettyName>convert email type</prettyName>
+<size>1</size>
 <tooltip></tooltip>
-<number>27</number>
+<unmodifiable>0</unmodifiable>
 <validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</macros_velocity>
-<webcopyright>
-<name>webcopyright</name>
-<prettyName>Web Copyright</prettyName>
-<unmodifiable>0</unmodifiable>
-<size>60</size>
+</convertmail>
+<default_language>
 <customDisplay></customDisplay>
-<validationRegExp></validationRegExp>
+<name>default_language</name>
+<number>20</number>
+<prettyName>Default Language</prettyName>
+<size>5</size>
 <tooltip></tooltip>
-<number>5</number>
+<unmodifiable>0</unmodifiable>
 <validationMessage></validationMessage>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</webcopyright>
-<webbgcolor>
-<name>webbgcolor</name>
-<prettyName>Web Background Color</prettyName>
-<unmodifiable>0</unmodifiable>
-<size>10</size>
-<customDisplay></customDisplay>
 <validationRegExp></validationRegExp>
-<tooltip></tooltip>
-<number>2</number>
-<validationMessage></validationMessage>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</webbgcolor>
-<showLeftPanels>
-<name>showLeftPanels</name>
-<prettyName>Display the left panel column</prettyName>
-<unmodifiable>0</unmodifiable>
-<displayFormType>select</displayFormType>
+</default_language>
+<documentBundles>
 <customDisplay></customDisplay>
-<validationRegExp></validationRegExp>
-<defaultValue></defaultValue>
+<name>documentBundles</name>
+<number>52</number>
+<prettyName>Internationalization Document Bundles</prettyName>
+<size>60</size>
 <tooltip></tooltip>
-<displayType>yesno</displayType>
-<number>46</number>
-<validationMessage></validationMessage>
-<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-</showLeftPanels>
-<tags>
-<name>tags</name>
-<prettyName>Activate the tagging</prettyName>
 <unmodifiable>0</unmodifiable>
-<displayFormType>select</displayFormType>
-<customDisplay></customDisplay>
-<validationRegExp></validationRegExp>
-<defaultValue></defaultValue>
-<tooltip></tooltip>
-<displayType>yesno</displayType>
-<number>51</number>
 <validationMessage></validationMessage>
-<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-</tags>
-<plugins>
-<name>plugins</name>
-<prettyName>Plugins</prettyName>
-<unmodifiable>0</unmodifiable>
-<size>40</size>
-<customDisplay></customDisplay>
 <validationRegExp></validationRegExp>
-<tooltip></tooltip>
-<number>6</number>
-<validationMessage></validationMessage>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</plugins>
-<menu>
-<name>menu</name>
-<prettyName>Menu</prettyName>
-<unmodifiable>0</unmodifiable>
-<size>60</size>
-<rows>8</rows>
+</documentBundles>
+<edit_anonymous>
+<cache>0</cache>
 <customDisplay></customDisplay>
-<contenttype>FullyRenderedText</contenttype>
-<validationRegExp></validationRegExp>
-<tooltip></tooltip>
-<number>8</number>
-<validationMessage></validationMessage>
-<editor>---</editor>
-<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
-</menu>
-<registration_anonymous>
-<name>registration_anonymous</name>
+<displayType>select</displayType>
+<multiSelect>0</multiSelect>
+<name>edit_anonymous</name>
+<number>37</number>
+<picker></picker>
 <prettyName>Anonymous</prettyName>
-<unmodifiable>0</unmodifiable>
 <relationalStorage>0</relationalStorage>
-<displayType>select</displayType>
-<multiSelect>0</multiSelect>
-<size>1</size>
 <separator> </separator>
 <separators> ,|</separators>
+<size>1</size>
 <sort>none</sort>
-<values>---|Image|Text</values>
 <tooltip></tooltip>
-<customDisplay></customDisplay>
+<unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
 <validationRegExp></validationRegExp>
-<number>35</number>
-<validationMessage></validationMessage>
+<values>---|Image|Text</values>
+<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
+</edit_anonymous>
+<edit_registered>
+<cache>0</cache>
+<customDisplay></customDisplay>
+<displayType>select</displayType>
+<multiSelect>0</multiSelect>
+<name>edit_registered</name>
+<number>38</number>
 <picker></picker>
-<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
-</registration_anonymous>
-<registration_registered>
-<name>registration_registered</name>
 <prettyName>Registered</prettyName>
-<unmodifiable>0</unmodifiable>
 <relationalStorage>0</relationalStorage>
-<displayType>select</displayType>
-<multiSelect>0</multiSelect>
-<size>1</size>
 <separator> </separator>
 <separators> ,|</separators>
+<size>1</size>
 <sort>none</sort>
-<values>---|Image|Text</values>
 <tooltip></tooltip>
-<customDisplay></customDisplay>
+<unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
 <validationRegExp></validationRegExp>
-<number>36</number>
-<validationMessage></validationMessage>
-<picker></picker>
+<values>---|Image|Text</values>
 <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
-</registration_registered>
-<skin>
-<name>skin</name>
-<prettyName>Skin</prettyName>
-<unmodifiable>0</unmodifiable>
-<size>20</size>
+</edit_registered>
+<editbox_height>
 <customDisplay></customDisplay>
-<validationRegExp></validationRegExp>
+<name>editbox_height</name>
+<number>24</number>
+<prettyName>Editbox Height</prettyName>
+<size>5</size>
 <tooltip></tooltip>
-<number>2</number>
+<unmodifiable>0</unmodifiable>
 <validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</skin>
-<renderXWikiGroovyRenderer>
-<name>renderXWikiGroovyRenderer</name>
-<prettyName>Render Groovy code</prettyName>
-<unmodifiable>0</unmodifiable>
-<displayFormType>select</displayFormType>
+</editbox_height>
+<editbox_width>
 <customDisplay></customDisplay>
-<validationRegExp></validationRegExp>
-<defaultValue></defaultValue>
+<name>editbox_width</name>
+<number>23</number>
+<prettyName>Editbox Width</prettyName>
+<size>5</size>
 <tooltip></tooltip>
-<displayType>yesno</displayType>
-<number>42</number>
+<unmodifiable>0</unmodifiable>
 <validationMessage></validationMessage>
-<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-</renderXWikiGroovyRenderer>
-<renderXWikiVelocityRenderer>
-<name>renderXWikiVelocityRenderer</name>
-<prettyName>Render velocity code</prettyName>
-<unmodifiable>0</unmodifiable>
-<displayFormType>select</displayFormType>
+<validationRegExp></validationRegExp>
+<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+</editbox_width>
+<editor>
+<cache>0</cache>
 <customDisplay></customDisplay>
-<validationRegExp></validationRegExp>
-<defaultValue></defaultValue>
+<displayType>select</displayType>
+<multiSelect>0</multiSelect>
+<name>editor</name>
+<number>23</number>
+<picker></picker>
+<prettyName>Default Editor</prettyName>
+<relationalStorage>0</relationalStorage>
+<separator> </separator>
+<separators> ,|</separators>
+<size>1</size>
+<sort>none</sort>
 <tooltip></tooltip>
-<displayType>yesno</displayType>
-<number>41</number>
+<unmodifiable>0</unmodifiable>
 <validationMessage></validationMessage>
-<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-</renderXWikiVelocityRenderer>
-<rightPanels>
-<name>rightPanels</name>
-<prettyName>Panels displayed on the right</prettyName>
-<unmodifiable>0</unmodifiable>
-<size>60</size>
+<validationRegExp></validationRegExp>
+<values>Text|Wysiwyg</values>
+<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
+</editor>
+<invitation_email_content>
+<contenttype>FullyRenderedText</contenttype>
 <customDisplay></customDisplay>
-<validationRegExp></validationRegExp>
+<editor>---</editor>
+<name>invitation_email_content</name>
+<number>34</number>
+<prettyName>Invitation eMail Content</prettyName>
+<rows>10</rows>
+<size>72</size>
 <tooltip></tooltip>
-<number>45</number>
+<unmodifiable>0</unmodifiable>
 <validationMessage></validationMessage>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</rightPanels>
-<showRightPanels>
-<name>showRightPanels</name>
-<prettyName>Display the right panel column</prettyName>
-<unmodifiable>0</unmodifiable>
-<displayFormType>select</displayFormType>
+<validationRegExp></validationRegExp>
+<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
+</invitation_email_content>
+<languages>
 <customDisplay></customDisplay>
-<validationRegExp></validationRegExp>
-<defaultValue></defaultValue>
+<name>languages</name>
+<number>49</number>
+<prettyName>Supported languages</prettyName>
+<size>30</size>
 <tooltip></tooltip>
-<displayType>yesno</displayType>
-<number>47</number>
+<unmodifiable>0</unmodifiable>
 <validationMessage></validationMessage>
-<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-</showRightPanels>
-<language>
-<name>language</name>
-<prettyName>Language</prettyName>
-<unmodifiable>0</unmodifiable>
-<size>30</size>
-<customDisplay></customDisplay>
 <validationRegExp></validationRegExp>
-<tooltip></tooltip>
-<number>1</number>
-<validationMessage></validationMessage>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</language>
-<version>
-<name>version</name>
-<prettyName>Version</prettyName>
-<unmodifiable>0</unmodifiable>
-<size>30</size>
+</languages>
+<leftPanels>
 <customDisplay></customDisplay>
-<validationRegExp></validationRegExp>
+<name>leftPanels</name>
+<number>44</number>
+<prettyName>Panels displayed on the left</prettyName>
+<size>60</size>
 <tooltip></tooltip>
-<number>12</number>
+<unmodifiable>0</unmodifiable>
 <validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</version>
-<smtp_server>
-<name>smtp_server</name>
-<prettyName>SMTP Server</prettyName>
-<unmodifiable>0</unmodifiable>
-<size>30</size>
+</leftPanels>
+<macros_groovy>
 <customDisplay></customDisplay>
-<validationRegExp></validationRegExp>
+<name>macros_groovy</name>
+<number>28</number>
+<prettyName>Macros for Groovy</prettyName>
+<size>60</size>
 <tooltip></tooltip>
-<number>13</number>
+<unmodifiable>0</unmodifiable>
 <validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</smtp_server>
-<editbox_height>
-<name>editbox_height</name>
-<prettyName>Editbox Height</prettyName>
+</macros_groovy>
+<macros_languages>
+<customDisplay></customDisplay>
+<name>macros_languages</name>
+<number>26</number>
+<prettyName>Macros Languages</prettyName>
+<size>60</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
-<size>5</size>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
+<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+</macros_languages>
+<macros_mapping>
+<contenttype>FullyRenderedText</contenttype>
 <customDisplay></customDisplay>
+<editor>---</editor>
+<name>macros_mapping</name>
+<number>30</number>
+<prettyName>Macros Mapping</prettyName>
+<rows>15</rows>
+<size>60</size>
+<tooltip></tooltip>
+<unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
 <validationRegExp></validationRegExp>
+<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
+</macros_mapping>
+<macros_velocity>
+<customDisplay></customDisplay>
+<name>macros_velocity</name>
+<number>27</number>
+<prettyName>Macros for Velocity</prettyName>
+<size>60</size>
 <tooltip></tooltip>
-<number>24</number>
+<unmodifiable>0</unmodifiable>
 <validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</editbox_height>
-<default_language>
-<name>default_language</name>
-<prettyName>Default Language</prettyName>
-<unmodifiable>0</unmodifiable>
-<size>5</size>
+</macros_velocity>
+<macros_wiki>
 <customDisplay></customDisplay>
+<name>macros_wiki</name>
+<number>32</number>
+<prettyName>Macros for the Wiki Parser</prettyName>
+<size>60</size>
+<tooltip></tooltip>
+<unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
 <validationRegExp></validationRegExp>
+<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+</macros_wiki>
+<macros_wiki2>
+<customDisplay></customDisplay>
+<name>macros_wiki2</name>
+<number>29</number>
+<prettyName>Macros for new Wiki Parser</prettyName>
+<size>60</size>
 <tooltip></tooltip>
-<number>20</number>
+<unmodifiable>0</unmodifiable>
 <validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</default_language>
-<multilingual>
-<name>multilingual</name>
-<prettyName>Multi-Lingual</prettyName>
+</macros_wiki2>
+<menu>
+<contenttype>FullyRenderedText</contenttype>
+<customDisplay></customDisplay>
+<editor>---</editor>
+<name>menu</name>
+<number>8</number>
+<prettyName>Menu</prettyName>
+<rows>8</rows>
+<size>60</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
-<displayFormType>select</displayFormType>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
+<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
+</menu>
+<meta>
+<contenttype>FullyRenderedText</contenttype>
 <customDisplay></customDisplay>
+<editor>---</editor>
+<name>meta</name>
+<number>9</number>
+<prettyName>HTTP Meta Info</prettyName>
+<rows>5</rows>
+<size>40</size>
+<tooltip></tooltip>
+<unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
 <validationRegExp></validationRegExp>
+<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
+</meta>
+<multilingual>
+<customDisplay></customDisplay>
 <defaultValue></defaultValue>
-<tooltip></tooltip>
+<displayFormType>select</displayFormType>
 <displayType>yesno</displayType>
+<name>multilingual</name>
 <number>19</number>
+<prettyName>Multi-Lingual</prettyName>
+<tooltip></tooltip>
+<unmodifiable>0</unmodifiable>
 <validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
 </multilingual>
-<macros_groovy>
-<name>macros_groovy</name>
-<prettyName>Macros for Groovy</prettyName>
-<unmodifiable>0</unmodifiable>
-<size>60</size>
+<notification_pages>
 <customDisplay></customDisplay>
-<validationRegExp></validationRegExp>
+<name>notification_pages</name>
+<number>33</number>
+<prettyName>Notification Pages</prettyName>
+<size>60</size>
 <tooltip></tooltip>
-<number>28</number>
+<unmodifiable>0</unmodifiable>
 <validationMessage></validationMessage>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</macros_groovy>
-<title>
-<name>title</name>
-<prettyName>Title</prettyName>
-<unmodifiable>0</unmodifiable>
-<size>30</size>
-<customDisplay></customDisplay>
 <validationRegExp></validationRegExp>
-<tooltip></tooltip>
-<number>10</number>
-<validationMessage></validationMessage>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</title>
-<macros_mapping>
-<name>macros_mapping</name>
-<prettyName>Macros Mapping</prettyName>
-<unmodifiable>0</unmodifiable>
-<size>60</size>
-<rows>15</rows>
+</notification_pages>
+<pageWidth>
+<cache>0</cache>
 <customDisplay></customDisplay>
-<contenttype>FullyRenderedText</contenttype>
-<validationRegExp></validationRegExp>
-<tooltip></tooltip>
-<number>30</number>
-<validationMessage></validationMessage>
-<editor>---</editor>
-<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
-</macros_mapping>
-<comment_anonymous>
-<name>comment_anonymous</name>
-<prettyName>Anonymous</prettyName>
-<unmodifiable>0</unmodifiable>
-<relationalStorage>0</relationalStorage>
 <displayType>select</displayType>
 <multiSelect>0</multiSelect>
-<size>1</size>
+<name>pageWidth</name>
+<number>48</number>
+<picker></picker>
+<prettyName>Preferred page width</prettyName>
+<relationalStorage>0</relationalStorage>
 <separator> </separator>
 <separators> ,|</separators>
+<size>1</size>
 <sort>none</sort>
-<values>---|Image|Text</values>
 <tooltip></tooltip>
-<customDisplay></customDisplay>
+<unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
 <validationRegExp></validationRegExp>
-<number>39</number>
-<validationMessage></validationMessage>
-<picker></picker>
+<values>default|640|800|1024|1280|1600</values>
 <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
-</comment_anonymous>
-<comment_registered>
-<name>comment_registered</name>
-<prettyName>Registered</prettyName>
+</pageWidth>
+<parent>
+<name>parent</name>
+<number>52</number>
+<prettyName>Parent Space</prettyName>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
+<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+</parent>
+<plugins>
+<customDisplay></customDisplay>
+<name>plugins</name>
+<number>6</number>
+<prettyName>Plugins</prettyName>
+<size>40</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
-<relationalStorage>0</relationalStorage>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
+<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+</plugins>
+<registration_anonymous>
+<cache>0</cache>
+<customDisplay></customDisplay>
 <displayType>select</displayType>
 <multiSelect>0</multiSelect>
-<size>1</size>
+<name>registration_anonymous</name>
+<number>35</number>
+<picker></picker>
+<prettyName>Anonymous</prettyName>
+<relationalStorage>0</relationalStorage>
 <separator> </separator>
 <separators> ,|</separators>
+<size>1</size>
 <sort>none</sort>
-<values>---|Image|Text</values>
 <tooltip></tooltip>
-<customDisplay></customDisplay>
-<validationRegExp></validationRegExp>
-<number>40</number>
+<unmodifiable>0</unmodifiable>
 <validationMessage></validationMessage>
-<picker></picker>
+<validationRegExp></validationRegExp>
+<values>---|Image|Text</values>
 <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
-</comment_registered>
-<pageWidth>
-<name>pageWidth</name>
-<prettyName>Preferred page width</prettyName>
-<unmodifiable>0</unmodifiable>
-<relationalStorage>0</relationalStorage>
+</registration_anonymous>
+<registration_registered>
+<cache>0</cache>
+<customDisplay></customDisplay>
 <displayType>select</displayType>
 <multiSelect>0</multiSelect>
-<size>1</size>
+<name>registration_registered</name>
+<number>36</number>
+<picker></picker>
+<prettyName>Registered</prettyName>
+<relationalStorage>0</relationalStorage>
 <separator> </separator>
 <separators> ,|</separators>
+<size>1</size>
 <sort>none</sort>
-<values>default|640|800|1024|1280|1600</values>
 <tooltip></tooltip>
-<customDisplay></customDisplay>
+<unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
 <validationRegExp></validationRegExp>
-<number>48</number>
-<validationMessage></validationMessage>
-<picker></picker>
+<values>---|Image|Text</values>
 <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
-</pageWidth>
-<languages>
-<name>languages</name>
-<prettyName>Supported languages</prettyName>
-<unmodifiable>0</unmodifiable>
-<size>30</size>
+</registration_registered>
+<renderXWikiGroovyRenderer>
 <customDisplay></customDisplay>
-<validationRegExp></validationRegExp>
-<tooltip></tooltip>
-<number>49</number>
+<defaultValue></defaultValue>
+<displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
+<name>renderXWikiGroovyRenderer</name>
+<number>42</number>
+<prettyName>Render Groovy code</prettyName>
+<tooltip></tooltip>
+<unmodifiable>0</unmodifiable>
 <validationMessage></validationMessage>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</languages>
-<stylesheet>
-<name>stylesheet</name>
-<prettyName>Stylesheet</prettyName>
-<unmodifiable>0</unmodifiable>
-<size>30</size>
+<validationRegExp></validationRegExp>
+<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
+</renderXWikiGroovyRenderer>
+<renderXWikiRadeoxRenderer>
 <customDisplay></customDisplay>
-<validationRegExp></validationRegExp>
+<defaultValue></defaultValue>
+<displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
+<name>renderXWikiRadeoxRenderer</name>
+<number>43</number>
+<prettyName>Render Wiki syntax</prettyName>
 <tooltip></tooltip>
-<number>17</number>
+<unmodifiable>0</unmodifiable>
 <validationMessage></validationMessage>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</stylesheet>
-<use_email_verification>
-<name>use_email_verification</name>
-<prettyName>Use eMail Verification</prettyName>
-<unmodifiable>0</unmodifiable>
-<displayFormType>select</displayFormType>
-<customDisplay></customDisplay>
 <validationRegExp></validationRegExp>
+<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
+</renderXWikiRadeoxRenderer>
+<renderXWikiVelocityRenderer>
+<customDisplay></customDisplay>
 <defaultValue></defaultValue>
-<tooltip></tooltip>
+<displayFormType>select</displayFormType>
 <displayType>yesno</displayType>
-<number>24</number>
+<name>renderXWikiVelocityRenderer</name>
+<number>41</number>
+<prettyName>Render velocity code</prettyName>
+<tooltip></tooltip>
+<unmodifiable>0</unmodifiable>
 <validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-</use_email_verification>
-<edit_registered>
-<name>edit_registered</name>
-<prettyName>Registered</prettyName>
-<unmodifiable>0</unmodifiable>
-<relationalStorage>0</relationalStorage>
-<displayType>select</displayType>
-<multiSelect>0</multiSelect>
-<size>1</size>
-<separator> </separator>
-<separators> ,|</separators>
-<sort>none</sort>
-<values>---|Image|Text</values>
-<tooltip></tooltip>
+</renderXWikiVelocityRenderer>
+<rightPanels>
 <customDisplay></customDisplay>
-<validationRegExp></validationRegExp>
-<number>38</number>
-<validationMessage></validationMessage>
-<picker></picker>
-<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
-</edit_registered>
-<invitation_email_content>
-<name>invitation_email_content</name>
-<prettyName>Invitation eMail Content</prettyName>
+<name>rightPanels</name>
+<number>45</number>
+<prettyName>Panels displayed on the right</prettyName>
+<size>60</size>
+<tooltip></tooltip>
 <unmodifiable>0</unmodifiable>
-<size>72</size>
-<rows>10</rows>
+<validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
+<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+</rightPanels>
+<showLeftPanels>
 <customDisplay></customDisplay>
-<contenttype>FullyRenderedText</contenttype>
+<defaultValue></defaultValue>
+<displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
+<name>showLeftPanels</name>
+<number>46</number>
+<prettyName>Display the left panel column</prettyName>
+<tooltip></tooltip>
+<unmodifiable>0</unmodifiable>
+<validationMessage></validationMessage>
 <validationRegExp></validationRegExp>
+<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
+</showLeftPanels>
+<showRightPanels>
+<customDisplay></customDisplay>
+<defaultValue></defaultValue>
+<displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
+<name>showRightPanels</name>
+<number>47</number>
+<prettyName>Display the right panel column</prettyName>
 <tooltip></tooltip>
-<number>34</number>
+<unmodifiable>0</unmodifiable>
 <validationMessage></validationMessage>
-<editor>---</editor>
-<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
-</invitation_email_content>
-<notification_pages>
-<name>notification_pages</name>
-<prettyName>Notification Pages</prettyName>
-<unmodifiable>0</unmodifiable>
-<size>60</size>
+<validationRegExp></validationRegExp>
+<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
+</showRightPanels>
+<skin>
 <customDisplay></customDisplay>
-<validationRegExp></validationRegExp>
+<name>skin</name>
+<number>2</number>
+<prettyName>Skin</prettyName>
+<size>20</size>
 <tooltip></tooltip>
-<number>33</number>
+<unmodifiable>0</unmodifiable>
 <validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</notification_pages>
-<documentBundles>
-<name>documentBundles</name>
-<prettyName>Internationalization Document Bundles</prettyName>
-<unmodifiable>0</unmodifiable>
-<size>60</size>
+</skin>
+<smtp_server>
 <customDisplay></customDisplay>
-<validationRegExp></validationRegExp>
+<name>smtp_server</name>
+<number>13</number>
+<prettyName>SMTP Server</prettyName>
+<size>30</size>
 <tooltip></tooltip>
+<unmodifiable>0</unmodifiable>
 <validationMessage></validationMessage>
-<number>52</number>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</documentBundles>
-<renderXWikiRadeoxRenderer>
-<name>renderXWikiRadeoxRenderer</name>
-<prettyName>Render Wiki syntax</prettyName>
-<unmodifiable>0</unmodifiable>
-<displayFormType>select</displayFormType>
+</smtp_server>
+<stylesheet>
 <customDisplay></customDisplay>
-<validationRegExp></validationRegExp>
-<defaultValue></defaultValue>
+<name>stylesheet</name>
+<number>17</number>
+<prettyName>Stylesheet</prettyName>
+<size>30</size>
 <tooltip></tooltip>
-<displayType>yesno</displayType>
-<number>43</number>
-<validationMessage></validationMessage>
-<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-</renderXWikiRadeoxRenderer>
-<confirmation_email_content>
-<name>confirmation_email_content</name>
-<prettyName>Confirmation eMail Content</prettyName>
 <unmodifiable>0</unmodifiable>
-<size>72</size>
-<rows>10</rows>
-<customDisplay></customDisplay>
-<contenttype>FullyRenderedText</contenttype>
+<validationMessage></validationMessage>
 <validationRegExp></validationRegExp>
-<tooltip></tooltip>
-<number>16</number>
-<validationMessage></validationMessage>
-<editor>---</editor>
-<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
-</confirmation_email_content>
+<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+</stylesheet>
 <stylesheets>
+<customDisplay></customDisplay>
 <name>stylesheets</name>
+<number>18</number>
 <prettyName>Stylesheets</prettyName>
-<unmodifiable>0</unmodifiable>
 <size>30</size>
-<customDisplay></customDisplay>
-<validationRegExp></validationRegExp>
 <tooltip></tooltip>
-<number>18</number>
+<unmodifiable>0</unmodifiable>
 <validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
 </stylesheets>
-<edit_anonymous>
-<name>edit_anonymous</name>
-<prettyName>Anonymous</prettyName>
-<unmodifiable>0</unmodifiable>
-<relationalStorage>0</relationalStorage>
-<displayType>select</displayType>
-<multiSelect>0</multiSelect>
-<size>1</size>
-<separator> </separator>
-<separators> ,|</separators>
-<sort>none</sort>
-<values>---|Image|Text</values>
+<tags>
+<customDisplay></customDisplay>
+<defaultValue></defaultValue>
+<displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
+<name>tags</name>
+<number>51</number>
+<prettyName>Activate the tagging</prettyName>
 <tooltip></tooltip>
-<customDisplay></customDisplay>
-<validationRegExp></validationRegExp>
-<number>37</number>
-<validationMessage></validationMessage>
-<picker></picker>
-<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
-</edit_anonymous>
-<ad_clientid>
-<name>ad_clientid</name>
-<prettyName>Advertisement Client ID</prettyName>
 <unmodifiable>0</unmodifiable>
-<size>60</size>
-<customDisplay></customDisplay>
-<validationRegExp></validationRegExp>
-<tooltip></tooltip>
-<number>25</number>
 <validationMessage></validationMessage>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</ad_clientid>
-<editor>
-<name>editor</name>
-<prettyName>Default Editor</prettyName>
-<unmodifiable>0</unmodifiable>
-<relationalStorage>0</relationalStorage>
-<displayType>select</displayType>
-<multiSelect>0</multiSelect>
-<size>1</size>
-<separator> </separator>
-<separators> ,|</separators>
-<sort>none</sort>
-<values>Text|Wysiwyg</values>
-<tooltip></tooltip>
-<customDisplay></customDisplay>
 <validationRegExp></validationRegExp>
-<number>23</number>
-<validationMessage></validationMessage>
-<picker></picker>
-<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
-</editor>
-<editbox_width>
-<name>editbox_width</name>
-<prettyName>Editbox Width</prettyName>
-<unmodifiable>0</unmodifiable>
-<size>5</size>
+<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
+</tags>
+<title>
 <customDisplay></customDisplay>
-<validationRegExp></validationRegExp>
+<name>title</name>
+<number>10</number>
+<prettyName>Title</prettyName>
+<size>30</size>
 <tooltip></tooltip>
-<number>23</number>
-<validationMessage></validationMessage>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</editbox_width>
-<convertmail>
-<name>convertmail</name>
-<prettyName>convert email type</prettyName>
 <unmodifiable>0</unmodifiable>
-<size>1</size>
-<customDisplay></customDisplay>
+<validationMessage></validationMessage>
 <validationRegExp></validationRegExp>
-<tooltip></tooltip>
-<number>50</number>
-<validationMessage></validationMessage>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</convertmail>
-<backlinks>
-<name>backlinks</name>
-<prettyName>Backlinks</prettyName>
-<unmodifiable>0</unmodifiable>
-<displayFormType>select</displayFormType>
+</title>
+<use_email_verification>
 <customDisplay></customDisplay>
-<validationRegExp></validationRegExp>
 <defaultValue></defaultValue>
-<tooltip></tooltip>
-<displayType>yesno</displayType>
-<number>25</number>
-<validationMessage></validationMessage>
-<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-</backlinks>
-<leftPanels>
-<name>leftPanels</name>
-<prettyName>Panels displayed on the left</prettyName>
-<unmodifiable>0</unmodifiable>
-<size>60</size>
-<customDisplay></customDisplay>
-<validationRegExp></validationRegExp>
+<displayFormType>select</displayFormType>
+<displayType>yesno</displayType>
+<name>use_email_verification</name>
+<number>24</number>
+<prettyName>Use eMail Verification</prettyName>
 <tooltip></tooltip>
-<number>44</number>
+<unmodifiable>0</unmodifiable>
 <validationMessage></validationMessage>
-<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</leftPanels>
+<validationRegExp></validationRegExp>
+<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
+</use_email_verification>
 <validation_email_content>
+<contenttype>FullyRenderedText</contenttype>
+<customDisplay></customDisplay>
+<editor>---</editor>
 <name>validation_email_content</name>
+<number>15</number>
 <prettyName>Validation eMail Content</prettyName>
-<unmodifiable>0</unmodifiable>
+<rows>10</rows>
 <size>72</size>
-<rows>10</rows>
-<customDisplay></customDisplay>
-<contenttype>FullyRenderedText</contenttype>
-<validationRegExp></validationRegExp>
 <tooltip></tooltip>
-<number>15</number>
+<unmodifiable>0</unmodifiable>
 <validationMessage></validationMessage>
-<editor>---</editor>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
 </validation_email_content>
-<authenticate_edit>
-<name>authenticate_edit</name>
-<prettyName>Authenticate On Edit</prettyName>
-<unmodifiable>0</unmodifiable>
-<displayFormType>select</displayFormType>
+<version>
 <customDisplay></customDisplay>
-<validationRegExp></validationRegExp>
-<defaultValue></defaultValue>
+<name>version</name>
+<number>12</number>
+<prettyName>Version</prettyName>
+<size>30</size>
 <tooltip></tooltip>
-<displayType>yesno</displayType>
-<number>7</number>
+<unmodifiable>0</unmodifiable>
 <validationMessage></validationMessage>
-<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-</authenticate_edit>
-<macros_languages>
-<name>macros_languages</name>
-<prettyName>Macros Languages</prettyName>
-<unmodifiable>0</unmodifiable>
-<size>60</size>
+<validationRegExp></validationRegExp>
+<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+</version>
+<webbgcolor>
 <customDisplay></customDisplay>
-<validationRegExp></validationRegExp>
+<name>webbgcolor</name>
+<number>2</number>
+<prettyName>Web Background Color</prettyName>
+<size>10</size>
 <tooltip></tooltip>
-<number>26</number>
+<unmodifiable>0</unmodifiable>
 <validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</macros_languages>
-<macros_wiki2>
-<name>macros_wiki2</name>
-<prettyName>Macros for new Wiki Parser</prettyName>
-<unmodifiable>0</unmodifiable>
-<size>60</size>
+</webbgcolor>
+<webcopyright>
 <customDisplay></customDisplay>
-<validationRegExp></validationRegExp>
+<name>webcopyright</name>
+<number>5</number>
+<prettyName>Web Copyright</prettyName>
+<size>60</size>
 <tooltip></tooltip>
-<number>29</number>
+<unmodifiable>0</unmodifiable>
 <validationMessage></validationMessage>
+<validationRegExp></validationRegExp>
 <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
-</macros_wiki2>
+</webcopyright>
 </class>
 <name>XWiki.WebPreferences</name>
 <number>0</number>
@@ -764,16 +880,22 @@
 <number>0</number>
 <className>XWiki.XWikiPreferences</className>
 <property>
+<ad_clientid></ad_clientid>
+</property>
+<property>
 <admin_email></admin_email>
 </property>
 <property>
-<macros_wiki></macros_wiki>
+<auth_active_check></auth_active_check>
+</property>
+<property>
+<authenticate_edit></authenticate_edit>
 </property>
 <property>
-<title></title>
+<authenticate_view></authenticate_view>
 </property>
 <property>
-<macros_mapping></macros_mapping>
+<backlinks></backlinks>
 </property>
 <property>
 <comment_anonymous></comment_anonymous>
@@ -782,19 +904,19 @@
 <comment_registered></comment_registered>
 </property>
 <property>
-<pageWidth></pageWidth>
+<confirmation_email_content></confirmation_email_content>
 </property>
 <property>
-<languages></languages>
+<convertmail></convertmail>
 </property>
 <property>
-<meta></meta>
+<default_language></default_language>
 </property>
 <property>
-<stylesheet></stylesheet>
+<documentBundles></documentBundles>
 </property>
 <property>
-<macros_velocity></macros_velocity>
+<edit_anonymous></edit_anonymous>
 </property>
 <property>
 <edit_registered></edit_registered>
@@ -800,201 +922,118 @@
 <edit_registered></edit_registered>
 </property>
 <property>
+<editbox_height></editbox_height>
+</property>
+<property>
+<editbox_width></editbox_width>
+</property>
+<property>
+<editor></editor>
+</property>
+<property>
 <invitation_email_content></invitation_email_content>
 </property>
 <property>
-<webbgcolor></webbgcolor>
+<languages></languages>
 </property>
 <property>
-<webcopyright></webcopyright>
+<leftPanels></leftPanels>
 </property>
 <property>
-<plugins></plugins>
+<macros_groovy></macros_groovy>
 </property>
 <property>
-<menu></menu>
+<macros_languages></macros_languages>
 </property>
 <property>
-<notification_pages></notification_pages>
+<macros_mapping></macros_mapping>
 </property>
 <property>
-<renderXWikiRadeoxRenderer></renderXWikiRadeoxRenderer>
+<macros_velocity></macros_velocity>
 </property>
 <property>
-<registration_anonymous></registration_anonymous>
+<macros_wiki></macros_wiki>
 </property>
 <property>
-<confirmation_email_content></confirmation_email_content>
+<macros_wiki2></macros_wiki2>
 </property>
 <property>
-<skin></skin>
+<menu></menu>
 </property>
 <property>
-<registration_registered></registration_registered>
+<meta></meta>
 </property>
 <property>
-<renderXWikiVelocityRenderer></renderXWikiVelocityRenderer>
+<multilingual></multilingual>
 </property>
 <property>
-<renderXWikiGroovyRenderer></renderXWikiGroovyRenderer>
+<notification_pages></notification_pages>
 </property>
 <property>
-<rightPanels></rightPanels>
+<pageWidth></pageWidth>
 </property>
 <property>
-<stylesheets></stylesheets>
+<parent></parent>
 </property>
 <property>
-<language></language>
+<plugins></plugins>
 </property>
 <property>
-<edit_anonymous></edit_anonymous>
+<registration_anonymous></registration_anonymous>
 </property>
 <property>
-<ad_clientid></ad_clientid>
+<registration_registered></registration_registered>
 </property>
 <property>
-<editor></editor>
+<renderXWikiGroovyRenderer></renderXWikiGroovyRenderer>
 </property>
 <property>
-<version></version>
+<renderXWikiRadeoxRenderer></renderXWikiRadeoxRenderer>
 </property>
 <property>
-<editbox_width></editbox_width>
+<renderXWikiVelocityRenderer></renderXWikiVelocityRenderer>
 </property>
 <property>
-<smtp_server></smtp_server>
+<rightPanels></rightPanels>
 </property>
 <property>
-<editbox_height></editbox_height>
+<showLeftPanels></showLeftPanels>
 </property>
 <property>
-<convertmail></convertmail>
+<showRightPanels></showRightPanels>
 </property>
 <property>
-<leftPanels></leftPanels>
+<skin></skin>
 </property>
 <property>
-<default_language></default_language>
+<smtp_server></smtp_server>
 </property>
 <property>
-<validation_email_content></validation_email_content>
+<stylesheet></stylesheet>
 </property>
 <property>
-<macros_wiki2></macros_wiki2>
+<stylesheets></stylesheets>
 </property>
 <property>
-<macros_languages></macros_languages>
+<tags></tags>
 </property>
 <property>
-<macros_groovy></macros_groovy>
+<title></title>
 </property>
-</object>
-<object>
-<class>
-<name>XWiki.TagClass</name>
-<customClass></customClass>
-<customMapping></customMapping>
-<defaultViewSheet></defaultViewSheet>
-<defaultEditSheet></defaultEditSheet>
-<defaultWeb></defaultWeb>
-<nameField></nameField>
-<validationScript></validationScript>
-<tags>
-<name>tags</name>
-<prettyName>Tags</prettyName>
-<unmodifiable>0</unmodifiable>
-<relationalStorage>1</relationalStorage>
-<displayType>input</displayType>
-<multiSelect>1</multiSelect>
-<size>30</size>
-<separator> </separator>
-<separators> ,|</separators>
-<values></values>
-<number>1</number>
-<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
-</tags>
-</class>
-<name>XWiki.WebPreferences</name>
-<number>0</number>
-<className>XWiki.TagClass</className>
 <property>
-<tags/>
+<use_email_verification></use_email_verification>
 </property>
-</object>
-<object>
-<class>
-<name>XWiki.XWikiGlobalRights</name>
-<customClass></customClass>
-<customMapping></customMapping>
-<defaultViewSheet></defaultViewSheet>
-<defaultEditSheet></defaultEditSheet>
-<defaultWeb></defaultWeb>
-<nameField></nameField>
-<validationScript></validationScript>
-<groups>
-<name>groups</name>
-<prettyName>Groups</prettyName>
-<unmodifiable>0</unmodifiable>
-<relationalStorage>0</relationalStorage>
-<displayType>select</displayType>
-<multiSelect>1</multiSelect>
-<size>5</size>
-<separator> </separator>
-<usesList>1</usesList>
-<number>4</number>
-<classType>com.xpn.xwiki.objects.classes.GroupsClass</classType>
-</groups>
-<users>
-<name>users</name>
-<prettyName>Users</prettyName>
-<unmodifiable>0</unmodifiable>
-<relationalStorage>0</relationalStorage>
-<displayType>select</displayType>
-<multiSelect>1</multiSelect>
-<size>5</size>
-<separator> </separator>
-<usesList>1</usesList>
-<number>4</number>
-<classType>com.xpn.xwiki.objects.classes.UsersClass</classType>
-</users>
-<levels>
-<name>levels</name>
-<prettyName>Levels</prettyName>
-<unmodifiable>0</unmodifiable>
-<relationalStorage>0</relationalStorage>
-<displayType>select</displayType>
-<multiSelect>1</multiSelect>
-<size>3</size>
-<separator> </separator>
-<number>4</number>
-<classType>com.xpn.xwiki.objects.classes.LevelsClass</classType>
-</levels>
-<allow>
-<name>allow</name>
-<prettyName>Allow/Deny</prettyName>
-<unmodifiable>0</unmodifiable>
-<displayFormType>select</displayFormType>
-<defaultValue>1</defaultValue>
-<displayType>allow</displayType>
-<number>4</number>
-<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
-</allow>
-</class>
-<name>XWiki.WebPreferences</name>
-<number>0</number>
-<className>XWiki.XWikiGlobalRights</className>
 <property>
-<groups>XWiki.AdminGroup,</groups>
+<validation_email_content></validation_email_content>
 </property>
 <property>
-<users></users>
+<version></version>
 </property>
 <property>
-<levels>edit,</levels>
+<webbgcolor></webbgcolor>
 </property>
 <property>
-<allow>1</allow>
+<webcopyright></webcopyright>
 </property>
 </object>
 <content>