* added copyright header to each file

* added XSL stylesheet to each file
* added DTD to some files (TODO: Add DTD to the remaining files and validate them against the DTD)
* added a Document Type Definition which allows to validate package files

7 files changed, 157 insertions, 145 deletions

diff --git a/packages/squid-head/squid.xml b/packages/squid-head/squid.xml
index 04a06829..67f4c2aa 100644
--- a/packages/squid-head/squid.xml
+++ b/packages/squid-head/squid.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
 <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
         <copyright>
@@ -44,41 +45,11 @@
     <description>Describe your package here</description>
     <requirements>Describe your package requirements here</requirements>
     <faq>Currently there are no FAQ items provided.</faq>
+    <name>squid</name>
+    <version>none</version>
+	<title>Proxy server: General settings</title>
 	<include_file>squid.inc</include_file>
 
-	<!-- Installation -->
-	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/squid.inc</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/squid_cache.xml</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/squid_nac.xml</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/squid_traffic.xml</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/squid_upstream.xml</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/squid_auth.xml</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/squid_users.xml</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/All/squid_monitor.sh</item>
-		<prefix>/usr/local/bin/</prefix>
-		<chmod>0755</chmod>
-	</additional_files_needed>
-	<custom_php_install_command>
-		squid_install_command();
-	</custom_php_install_command>
-	<custom_php_deinstall_command>
-		squid_deinstall_command();
-	</custom_php_deinstall_command>
 	<menu>
 		<name>Web proxy cache</name>
 		<tooltiptext>Modify the web proxy cache's settings</tooltiptext>
@@ -87,14 +58,10 @@
 	</menu>
 	<service>
 		<name>Squid</name>
-		<description>Web proxy cache.</description>
 		<rcfile>squid.sh</rcfile>
 		<executable>squid</executable>
+		<description>Web proxy cache.</description>
 	</service>
-
-	<!-- Interface -->
-	<name>squid</name>
-	<title>Proxy server: General settings</title>
 	<tabs>
 		<tab>
 			<text>General settings</text>
@@ -126,81 +93,108 @@
 			<url>/pkg.php?xml=squid_users.xml</url>
 		</tab>
 	</tabs>
+	<!-- Installation -->
+	<additional_files_needed>
+		<item>http://www.pfsense.org/packages/config/squid.inc</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<item>http://www.pfsense.org/packages/config/squid_cache.xml</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<item>http://www.pfsense.org/packages/config/squid_nac.xml</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<item>http://www.pfsense.org/packages/config/squid_traffic.xml</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<item>http://www.pfsense.org/packages/config/squid_upstream.xml</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<item>http://www.pfsense.org/packages/config/squid_auth.xml</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<item>http://www.pfsense.org/packages/config/squid_users.xml</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/bin/</prefix>
+		<chmod>0755</chmod>
+		<item>http://www.pfsense.org/packages/All/squid_monitor.sh</item>
+	</additional_files_needed>
 	<fields>
 		<field>
-			<fieldname>active_interface</fieldname>
 			<fielddescr>Proxy interface</fielddescr>
+			<fieldname>active_interface</fieldname>
 			<description>The interface(s) the proxy server will bind to.</description>
-			<default_value>lan</default_value>
-			<required/>
 			<type>interfaces_selection</type>
+			<required/>
+			<default_value>lan</default_value>
 			<multiple/>
 		</field>
 		<field>
-			<fieldname>allow_interface</fieldname>
 			<fielddescr>Allow users on interface</fielddescr>
+			<fieldname>allow_interface</fieldname>
 			<description>If this field is checked, the users connected to the interface selected in the 'Proxy interface' field will be allowed to use the proxy, i.e., there will be no need to add the interface's subnet to the list of allowed subnets. This is just a shortcut.</description>
-			<default_value>on</default_value>
-			<required/>
 			<type>checkbox</type>
+			<required/>
+			<default_value>on</default_value>
 		</field>
 		<field>
-			<fieldname>transparent_proxy</fieldname>
 			<fielddescr>Transparent proxy</fielddescr>
+			<fieldname>transparent_proxy</fieldname>
 			<description>If transparent mode is enabled, all requests for destination port 80 will be forwarded to the proxy server without any additional configuration necessary.</description>
-			<required/>
 			<type>checkbox</type>
+			<required/>
 		</field>
 		<field>
-			<fieldname>log_enabled</fieldname>
 			<fielddescr>Enabled logging</fielddescr>
+			<fieldname>log_enabled</fieldname>
 			<description>This will enable the access log. Don't switch this on if you don't have much disk space left.</description>
-			<enablefields>log_query_terms,log_user_agents</enablefields>
 			<type>checkbox</type>
+			<enablefields>log_query_terms,log_user_agents</enablefields>
 		</field>
 		<field>
-			<fieldname>proxy_port</fieldname>
 			<fielddescr>Proxy port</fielddescr>
+			<fieldname>proxy_port</fieldname>
 			<description>This is the port the proxy server will listen on.</description>
-			<required/>
 			<type>input</type>
 			<size>5</size>
+			<required/>
 			<default_value>3128</default_value>
 		</field>
 		<field>
-			<fieldname>icp_port</fieldname>
 			<fielddescr>ICP port</fielddescr>
+			<fieldname>icp_port</fieldname>
 			<description>This is the port the proxy server will send and receive ICP queries to and from neighbor caches. Leave this blank if you don't want the proxy server to communicate with neighbor caches through ICP.</description>
 			<type>input</type>
 			<size>5</size>
 		</field>
 		<field>
-			<fieldname>visible_hostname</fieldname>
 			<fielddescr>Visible hostname</fielddescr>
+			<fieldname>visible_hostname</fieldname>
 			<description>This is the hostname to be displayed in proxy server error messages.</description>
-			<default_value>localhost</default_value>
 			<type>input</type>
+			<default_value>localhost</default_value>
 		</field>
 		<field>
-			<fieldname>admin_email</fieldname>
 			<fielddescr>Administrator email</fielddescr>
+			<fieldname>admin_email</fieldname>
 			<description>This is the email address displayed in error messages to the users.</description>
-			<default_value>admin@localhost</default_value>
 			<type>input</type>
+			<default_value>admin@localhost</default_value>
 		</field>
 		<field>
 			<fielddescr>Language</fielddescr>
 			<fieldname>error_language</fieldname>
 			<description>Select the language in which the proxy server will display error messages to users.</description>
-			<default_value>English</default_value>
 			<type>select</type>
+			<default_value>English</default_value>
 		</field>
 		<field>
 			<fielddescr>Redirect children</fielddescr>
 			<fieldname>redirect_children</fieldname>
 			<description>Specify the number of redirectors to spawn (if using redirectors at all) when launching Squid. If you leave this field blank, Squid will start 5 redirector processes. If your network load is high, feel free to increase this value (at the expense of a higher memory consumption).</description>
-			<default_value>5</default_value>
 			<type>input</type>
+			<default_value>5</default_value>
 		</field>
 	</fields>
 	<custom_php_command_before_form>
@@ -212,4 +206,10 @@
 <custom_php_resync_config_command>
 	squid_resync();
 	</custom_php_resync_config_command>
+	<custom_php_install_command>
+		squid_install_command();
+	</custom_php_install_command>
+	<custom_php_deinstall_command>
+		squid_deinstall_command();
+	</custom_php_deinstall_command>
 </packagegui>
diff --git a/packages/squid-head/squid_auth.xml b/packages/squid-head/squid_auth.xml
index 05875c59..15910f97 100644
--- a/packages/squid-head/squid_auth.xml
+++ b/packages/squid-head/squid_auth.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
 <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
         <copyright>
@@ -44,9 +45,10 @@
     <description>Describe your package here</description>
     <requirements>Describe your package requirements here</requirements>
     <faq>Currently there are no FAQ items provided.</faq>
-	<include_file>squid.inc</include_file>
 	<name>squidauth</name>
+	<version>none</version>
 	<title>Proxy server: Authentication</title>
+	<include_file>squid.inc</include_file>
 	<tabs>
 		<tab>
 			<text>General settings</text>
@@ -83,8 +85,8 @@
 			<fielddescr>Authentication method</fielddescr>
 			<fieldname>auth_method</fieldname>
 			<description>Select an authentication method. This will allow users to be authenticated by local or external services.</description>
-			<default_value>none</default_value>
 			<type>select</type>
+			<default_value>none</default_value>
 			<options>
 				<option><name>None</name><value>none</value></option>
 				<option><name>Local</name><value>local</value></option>
@@ -95,99 +97,96 @@
 			<onchange>on_auth_method_changed()</onchange>
 		</field>
 		<field>
-			<fieldname>auth_server</fieldname>
 			<fielddescr>Authentication server</fielddescr>
+			<fieldname>auth_server</fieldname>
 			<description>Enter here the IP or hostname of the server that will perform the authentication. For NT domain authentication, this is the Primary Domain Controller (PDC).</description>
 			<type>input</type>
 		</field>
 		<field>
-			<fieldname>auth_server_port</fieldname>
 			<fielddescr>Authentication server port</fielddescr>
+			<fieldname>auth_server_port</fieldname>
 			<description>Enter here the port to use to connect to the authentication server. Leave this field blank to use the authentication method's default port.</description>
 			<type>input</type>
 		</field>
 		<field>
-			<fieldname>ldap_user</fieldname>
 			<fielddescr>LDAP server user DN</fielddescr>
+			<fieldname>ldap_user</fieldname>
 			<description>Enter here the user distinguished name (DN) to bind to connect to the LDAP server (e.g., "cn=Administrator,cn=Users,dc=foobar,dc=com"). You can leave this field blank if you don't want to use authentication.</description>
 			<type>input</type>
 		</field>
 		<field>
-			<fieldname>ldap_password</fieldname>
 			<fielddescr>LDAP password</fielddescr>
+			<fieldname>ldap_password</fieldname>
 			<description>Enter here the password to use to connect to the LDAP server. You may leave this field unfilled.</description>
 			<type>password</type>
 		</field>
 		<field>
-			<fieldname>ldap_basedn</fieldname>
 			<fielddescr>LDAP base DN</fielddescr>
+			<fieldname>ldap_basedn</fieldname>
 			<description>For LDAP authentication, enter here the base DN for the search (e.g., "cn=Users,dc=foobar,dc=com").</description>
 			<type>input</type>
 		</field>
 		<field>
-			<fieldname>ldap_filter</fieldname>
 			<fielddescr>LDAP filter</fielddescr>
+			<fieldname>ldap_filter</fieldname>
 			<description>Enter the string to be used to filter the results of the search, or leave this blank to get the results unfiltered. This must be in compliance with RFC 2254, and ocurrences of the string "%s" will be set to the username given to the proxy. You generally want something like '(sAMAccountName=%s)' here.</description>
 			<type>input</type>
 			<default_value>(sAMAccountName=%s)</default_value>
 		</field>
 		<field>
-			<fieldname>radius_secret</fieldname>
 			<fielddescr>RADIUS secret</fielddescr>
+			<fieldname>radius_secret</fieldname>
 			<description>The RADIUS secret for RADIUS authentication.</description>
 			<type>password</type>
 		</field>
 		<field>
-			<fieldname>msnt_bdc</fieldname>
 			<fielddescr>Backup Domain Controller</fielddescr>
+			<fieldname>msnt_bdc</fieldname>
 			<description>Enter the address of the Backup Domain Controller (BDC) or leave this field blank if you don't want to use a backup controller.</description>
 			<type>input</type>
 		</field>
 		<field>
-			<fieldname>msnt_domain</fieldname>
 			<fielddescr>NT domain</fielddescr>
+			<fieldname>msnt_domain</fieldname>
 			<description>Enter the NT domain to be used.</description>
 			<type>input</type>
 		</field>
 		<field>
-			<fieldname>auth_prompt</fieldname>
 			<fielddescr>Authentication prompt</fielddescr>
+			<fieldname>auth_prompt</fieldname>
 			<description>This string will be displayed at the top of the authentication request window.</description>
-			<default_value>Please enter your credentials to access the proxy</default_value>
 			<type>input</type>
+			<default_value>Please enter your credentials to access the proxy</default_value>
 		</field>
 		<field>
-			<fieldname>auth_processes</fieldname>
 			<fielddescr>Authentication processes</fielddescr>
+			<fieldname>auth_processes</fieldname>
 			<description>The number of authenticator processes to spawn. If many authentications are expected within a short timeframe, increase this number accordingly.</description>
-			<default_value>5</default_value>
 			<type>input</type>
+			<default_value>5</default_value>
 		</field>
 		<field>
-			<fieldname>auth_ttl</fieldname>
 			<fielddescr>Authentication TTL</fielddescr>
+			<fieldname>auth_ttl</fieldname>
 			<description>This specifies for how long (in minutes) the proxy server assumes an externally validated username and password combination is valid (Time To Live).  When the TTL expires, the user will be prompted for credentials again.</description>
-			<default_value>60</default_value>
 			<type>input</type>
+			<default_value>60</default_value>
 		</field>
 		<field>
-			<fieldname>unrestricted_auth</fieldname>
 			<fielddescr>Requiere authentication for unrestricted hosts</fielddescr>
+			<fieldname>unrestricted_auth</fieldname>
 			<description>If this option is enabled, even users tagged as unrestricted through access control are required to authenticate to use the proxy.</description>
 			<type>checkbox</type>
 		</field>
 		<field>
-			<fieldname>no_auth_hosts</fieldname>
 			<fielddescr>Subnets that don't need authentication</fielddescr>
+			<fieldname>no_auth_hosts</fieldname>
 			<description>A comma-separated list of subnets (in CIDR range, e.g.: 10.5.0.0/16, 192.168.1.50/32) whose hosts won't be asked for authentication to access the proxy.</description>
 			<type>textarea</type>
-			<rows>5</rows>
 			<cols>50</cols>
+			<rows>5</rows>
 		</field>
 	</fields>
-	<custom_php_after_head_command>
-		squid_print_javascript_auth();
-	</custom_php_after_head_command>
 	<custom_php_validation_command>
 		squid_validate_auth($_POST, &amp;$input_errors);
 	</custom_php_validation_command>
@@ -197,4 +196,7 @@
 	<custom_php_resync_config_command>
 		squid_resync();
 	</custom_php_resync_config_command>
+	<custom_php_after_head_command>
+		squid_print_javascript_auth();
+	</custom_php_after_head_command>
 </packagegui>
diff --git a/packages/squid-head/squid_cache.xml b/packages/squid-head/squid_cache.xml
index c50cef2e..3fe0475f 100644
--- a/packages/squid-head/squid_cache.xml
+++ b/packages/squid-head/squid_cache.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
 <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
         <copyright>
@@ -44,9 +45,10 @@
     <description>Describe your package here</description>
     <requirements>Describe your package requirements here</requirements>
     <faq>Currently there are no FAQ items provided.</faq>
-	<include_file>squid.inc</include_file>
 	<name>squidcache</name>
+	<version>none</version>
 	<title>Proxy server: Cache management</title>		
+	<include_file>squid.inc</include_file>
 	<tabs>
 		<tab>
 			<text>General settings</text>
@@ -83,40 +85,40 @@
 			<fielddescr>Hard disk cache size</fielddescr>
 			<fieldname>harddisk_cache_size</fieldname>
 			<description>This is the amount of disk space (in megabytes) to use for cached objects.</description>
+			<type>input</type>
 			<required/>
 			<default_value>100</default_value>
-			<type>input</type>
 		</field>
 		<field>
 			<fielddescr>Memory cache size</fielddescr>
 			<fieldname>memory_cache_size</fieldname>
 			<description>This is the amount of physical RAM (in megabytes) to be used for negative cache and in-transit objects.  This value should not exceed more than 50% of the installed RAM. The minimum value is 1MB.</description>
+			<type>input</type>
 			<required/>
 			<default_value>8</default_value>
-			<type>input</type>
 		</field>
 		<field>
 			<fielddescr>Minimum object size</fielddescr>
 			<fieldname>minimum_object_size</fieldname>
 			<description>Objects smaller than the size specified (in kilobytes) will not be saved on disk. The default value is 0, meaning there is no minimum.</description>
+			<type>input</type>
 			<required/>
 			<default_value>0</default_value>
-			<type>input</type>
 		</field>
 		<field>
 			<fielddescr>Maximum object size</fielddescr>
 			<fieldname>maximum_object_size</fieldname>
 			<description>Objects larger than the size specified (in kilobytes) will not be saved on disk. If you wish to increase speed more than you want to save bandwidth, this should be set to a low value.</description>
+			<type>input</type>
 			<required/>
 			<default_value>4</default_value>
-			<type>input</type>
 		</field>
 		<field>
 			<fielddescr>Level 1 subdirectories</fielddescr>
 			<fieldname>level1_subdirs</fieldname>
 			<description>Each level 1 (L1) directory contains 256 subdirectories, so a value of 256 L1 directories will use a total of 65536 directories for the hard disk cache.  This will significantly slow down the startup process of the proxy service, but can speed up the caching under certain conditions.</description>
-			<default_value>16</default_value>
 			<type>select</type>
+			<default_value>16</default_value>
 			<options>
 				<option><name>4</name><value>4</value></option>
 				<option><name>8</name><value>8</value></option>
@@ -131,8 +133,8 @@
 			<fielddescr>Memory replacement policy</fielddescr>
 			<fieldname>memory_replacement</fieldname>
 			<description>The memory replacement policy determines which objects are purged from memory when space is needed.  The default policy for memory replacement is GDSF.</description>
-			<default_value>heap GDSF</default_value>
 			<type>select</type>
+			<default_value>heap GDSF</default_value>
 			<options>
 				<option><name>LRU</name><value>LRU</value></option>
 				<option><name>Heap LRU</name><value>heap LRU</value></option>
@@ -144,8 +146,8 @@
 			<fielddescr>Cache replacement policy</fielddescr>
 			<fieldname>cache_replacement</fieldname>
 			<description>The cache replacement policy decides which objects will remain in cache and which objects are replaced to create space for the new objects.  The default policy for cache replacement is LFUDA.</description>
-			<default_value>heap LFUDA</default_value>
 			<type>select</type>
+			<default_value>heap LFUDA</default_value>
 			<options>
 				<option><name>LRU</name><value>lru</value></option>
 				<option><name>Heap LRU</name><value>heap LRU</value></option>
@@ -158,15 +160,15 @@
 			<fieldname>donotcache</fieldname>
 			<description>The specified domains or IP addresses (separated by commas) will never be cached.</description>
 			<type>textarea</type>
-			<rows>5</rows>
 			<cols>50</cols>
+			<rows>5</rows>
 		</field>
 		<field>
 			<fielddescr>Enable offline mode</fielddescr>
 			<fieldname>enable_offline</fieldname>
 			<description>Enable this option and the proxy server will never try to validate cached objects. The offline mode also gives access to more cached information than the proposed feature would allow (stale cached versions, where the origin server should have been contacted).</description>
-			<required/>
 			<type>checkbox</type>
+			<required/>
 		</field>
 	</fields>
 	<custom_php_validation_command>
diff --git a/packages/squid-head/squid_nac.xml b/packages/squid-head/squid_nac.xml
index bbeaa149..db49a1ba 100644
--- a/packages/squid-head/squid_nac.xml
+++ b/packages/squid-head/squid_nac.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
 <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
         <copyright>
@@ -44,9 +45,10 @@
     <description>Describe your package here</description>
     <requirements>Describe your package requirements here</requirements>
     <faq>Currently there are no FAQ items provided.</faq>
-	<include_file>squid.inc</include_file>
 	<name>squidnac</name>
+	<version>none</version>
 	<title>Proxy server: Access control</title>
+	<include_file>squid.inc</include_file>
 	<tabs>
 		<tab>
 			<text>General settings</text>
@@ -80,60 +82,60 @@
 	</tabs>
 	<fields>
 		<field>
-			<fieldname>allowed_subnets</fieldname>
 			<fielddescr>Allowed subnets</fielddescr>
+			<fieldname>allowed_subnets</fieldname>
 			<description>Those are the subnets (separated by commas) that are allowed to use the proxy. The subnets must be expressed as CIDR ranges (e.g.: 192.168.1.0/24). Note that the proxy interface subnet is already an allowed subnet. All the other subnets won't be able to use the proxy.</description>
 			<type>textarea</type>
-			<rows>5</rows>
 			<cols>50</cols>
+			<rows>5</rows>
 		</field>
 		<field>
-			<fieldname>unrestricted_hosts</fieldname>
 			<fielddescr>Unrestricted IPs</fielddescr>
+			<fieldname>unrestricted_hosts</fieldname>
 			<description>The IP addresses specified here (separated by commas) won't be filtered out by the other access control directives set in this page.</description>
 			<type>textarea</type>
-			<rows>5</rows>
 			<cols>50</cols>
+			<rows>5</rows>
 		</field>
 		<field>
-			<fieldname>unrestricted_macs</fieldname>
 			<fielddescr>Unrestricted MAC Addresses</fielddescr>
+			<fieldname>unrestricted_macs</fieldname>
 			<description>The MAC addresses specified here (separated by commas) won't be filtered out by the other access control directives set in this page.</description>
 			<type>textarea</type>
-			<rows>5</rows>
 			<cols>50</cols>
+			<rows>5</rows>
 		</field>
 		<field>
-			<fieldname>banned_hosts</fieldname>
 			<fielddescr>Banned host addresses</fielddescr>
+			<fieldname>banned_hosts</fieldname>
 			<description>The IP addresses specified here (separated by commas) won't be allowed to use the proxy.</description>
 			<type>textarea</type>
-			<rows>5</rows>
 			<cols>50</cols>
+			<rows>5</rows>
 		</field>	
 		<field>
-			<fieldname>banned_macs</fieldname>
 			<fielddescr>Banned MAC addresses</fielddescr>
+			<fieldname>banned_macs</fieldname>
 			<description>The MAC addresses specified here (separated by commas) won't be allowed to use the proxy.</description>
 			<type>textarea</type>
-			<rows>5</rows>
 			<cols>50</cols>
+			<rows>5</rows>
 		</field>
 		<field>
-			<fieldname>whitelist</fieldname>
 			<fielddescr>Whitelist</fielddescr>
+			<fieldname>whitelist</fieldname>
 			<description>Those are the sites (separated by commas) that will be accessable to the users that are allowed to use the proxy.</description>
 			<type>textarea</type>
-			<rows>5</rows>
 			<cols>50</cols>
+			<rows>5</rows>
 		</field>
 		<field>
-			<fieldname>blacklist</fieldname>
 			<fielddescr>Blacklist</fielddescr>
+			<fieldname>blacklist</fieldname>
 			<description>Those are the sites (separated by commas) that will be blocked to the users that are allowed to use the proxy.</description>
 			<type>textarea</type>
-			<rows>5</rows>
 			<cols>50</cols>
+			<rows>5</rows>
 		</field>
 	</fields>
 	<custom_php_validation_command>
diff --git a/packages/squid-head/squid_traffic.xml b/packages/squid-head/squid_traffic.xml
index f9bf3c6a..d69f2510 100644
--- a/packages/squid-head/squid_traffic.xml
+++ b/packages/squid-head/squid_traffic.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
 <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
         <copyright>
@@ -44,9 +45,10 @@
     <description>Describe your package here</description>
     <requirements>Describe your package requirements here</requirements>
     <faq>Currently there are no FAQ items provided.</faq>
-	<include_file>squid.inc</include_file>
 	<name>squidtraffic</name>
+	<version>none</version>
 	<title>Proxy server: Traffic management</title>		
+	<include_file>squid.inc</include_file>
 	<tabs>
 		<tab>
 			<text>General settings</text>
@@ -80,90 +82,90 @@
 	</tabs>
 	<fields>
 		<field>
-			<fieldname>max_download_size</fieldname>
 			<fielddescr>Maximum download size</fielddescr>
+			<fieldname>max_download_size</fieldname>
 			<description>Limit the maximum total download size to the size specified here (in kilobytes). Downloads bigger than the specified size will be denied. Set to 0 to disable.</description>
-			<default_value>0</default_value>
-			<required/>
 			<type>input</type>
+			<required/>
+			<default_value>0</default_value>
 		</field>
 		<field>
-			<fieldname>max_upload_size</fieldname>
 			<fielddescr>Maximum upload size</fielddescr>
+			<fieldname>max_upload_size</fieldname>
 			<description>Limit the maximum total upload size to the size specified here (in kilobytes). Uploads bigger than the specified size will be denied. Set to 0 to disable.</description>
-			<default_value>0</default_value>
-			<required/>
 			<type>input</type>
+			<required/>
+			<default_value>0</default_value>
 		</field>
 		<field>
-			<fieldname>overall_capping</fieldname>
 			<fielddescr>Overall capping</fielddescr>
+			<fieldname>overall_capping</fieldname>
 			<description>Caps the download speeds of the network that connects to the proxy as a whole at the specified size (in kilobytes per second). Set to 0 to disable.</description>
-			<default_value>0</default_value>
-			<required/>
 			<type>input</type>
+			<required/>
+			<default_value>0</default_value>
 		</field>
 		<field>
-			<fieldname>perhost_capping</fieldname>
 			<fielddescr>Per-host capping</fielddescr>
+			<fieldname>perhost_capping</fieldname>
 			<description>Caps the download speeds of each user that connects to the proxy at the specified size (in kilobytes per second). Set to 0 to disable.</description>
-			<default_value>0</default_value>
-			<required/>
 			<type>input</type>
+			<required/>
+			<default_value>0</default_value>
 		</field>
 		<field>
-			<fieldname>overall_throttling</fieldname>
 			<fielddescr>Overall bandwidth throttling</fielddescr>
+			<fieldname>overall_throttling</fieldname>
 			<description>This value specifies (in kilobytes per second) the bandwidth throttle for downloads. Users will gradually have their download speed increased according to this value. Set to 0 to disable bandwidth throttling.</description>
-			<default_value>0</default_value>
-			<required/>
 			<type>input</type>
+			<required/>
+			<default_value>0</default_value>
 		</field>
 		<field>
-			<fieldname>perhost_throttling</fieldname>
 			<fielddescr>Per-host throttling</fielddescr>
+			<fieldname>perhost_throttling</fieldname>
 			<description>This value specifies the download throttling per host. Set to 0 to disable this.</description>
-			<default_value>0</default_value>
-			<required/>
 			<type>input</type>
+			<required/>
+			<default_value>0</default_value>
 		</field>
 		<field>
-			<fieldname>initial_bucket_level</fieldname>
 			<fielddescr>Initial bucket level</fielddescr>
+			<fieldname>initial_bucket_level</fieldname>
 			<description>The initial bucket level is used to determine how much is put in each bucket when a connection is established. Set to 0 to set the initial bucket level to 100%.</description>
-			<default_value>0</default_value>
-			<required/>
 			<type>input</type>
+			<required/>
+			<default_value>0</default_value>
 		</field>
 		<field>
-			<fieldname>throttle_specific</fieldname>
 			<fielddescr>Throttle only specific extensions</fielddescr>
+			<fieldname>throttle_specific</fieldname>
 			<description>Leave this checked to be able to choose the extensions that throttling will be applied to. Otherwise, all files will be throttled.</description>
-			<default_value>on</default_value>
 			<type>checkbox</type>
 			<enablefields>throttle_binaries,throttle_cdimages,throttle_multimedia,throttle_others</enablefields>
+			<default_value>on</default_value>
 		</field>
 		<field>
-			<fieldname>throttle_binaries</fieldname>
 			<fielddescr>Throttle binary files</fielddescr>
+			<fieldname>throttle_binaries</fieldname>
 			<description>Check this to apply bandwidth throttle to binary files. This includes compressed archives and executables.</description>
 			<type>checkbox</type>
 		</field>
 		<field>
-			<fieldname>throttle_cdimages</fieldname>
 			<fielddescr>Throttle CD images</fielddescr>
+			<fieldname>throttle_cdimages</fieldname>
 			<description>Check this to apply bandwidth throttle to CD image files.</description>
 			<type>checkbox</type>
 		</field>
 		<field>
-			<fieldname>throttle_multimedia</fieldname>
 			<fielddescr>Throttle multimedia files</fielddescr>
+			<fieldname>throttle_multimedia</fieldname>
 			<description>Check this to apply bandwidth throttle to multimedia files, such as movies or songs.</description>
 			<type>checkbox</type>
 		</field>
 		<field>
-			<fieldname>throttle_others</fieldname>
 			<fielddescr>Throttle other extensions</fielddescr>
+			<fieldname>throttle_others</fieldname>
 			<description>Comma-separated list of extensions to apply bandwidth throttle to.</description>
 			<type>input</type>
 		</field>
diff --git a/packages/squid-head/squid_upstream.xml b/packages/squid-head/squid_upstream.xml
index 700163ec..b02a21b4 100644
--- a/packages/squid-head/squid_upstream.xml
+++ b/packages/squid-head/squid_upstream.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
 <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
         <copyright>
@@ -44,9 +45,10 @@
     <description>Describe your package here</description>
     <requirements>Describe your package requirements here</requirements>
     <faq>Currently there are no FAQ items provided.</faq>
-	<include_file>squid.inc</include_file>
 	<name>squidupstream</name>
+	<version>none</version>
 	<title>Proxy server: Upstream proxy settings</title>		
+	<include_file>squid.inc</include_file>
 	<tabs>
 		<tab>
 			<text>General settings</text>
@@ -83,9 +85,9 @@
 			<fielddescr>Enable forwarding</fielddescr>
 			<fieldname>proxy_forwarding</fieldname>
 			<description>This option enables the proxy server to forward requests to an upstream server.</description>
-			<required/>
 			<type>checkbox</type>
 			<enablefields>proxy_addr,proxy_port,icp_port,username,password</enablefields>
+			<required/>
 		</field>
 		<field>
 			<fielddescr>Hostname</fielddescr>
@@ -97,17 +99,17 @@
 			<fielddescr>TCP port</fielddescr>
 			<fieldname>proxy_port</fieldname>
 			<description>Enter the port to use to connect to the upstream proxy.</description>
-			<default_value>3128</default_value>
 			<type>input</type>
 			<size>5</size>
+			<default_value>3128</default_value>
 		</field>
 		<field>
 			<fielddescr>ICP port</fielddescr>
 			<fieldname>icp_port</fieldname>
 			<description>Enter the port to connect to the upstream proxy for the ICP protocol. Use port number 7 to disable ICP communication between the proxies.</description>
-			<default_value>7</default_value>
 			<type>input</type>
 			<size>5</size>
+			<default_value>7</default_value>
 		</field>
 		<field>
 			<fielddescr>Username</fielddescr>
diff --git a/packages/squid-head/squid_users.xml b/packages/squid-head/squid_users.xml
index 0854007c..34260817 100644
--- a/packages/squid-head/squid_users.xml
+++ b/packages/squid-head/squid_users.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
 <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
         <copyright>
@@ -44,9 +45,10 @@
     <description>Describe your package here</description>
     <requirements>Describe your package requirements here</requirements>
     <faq>Currently there are no FAQ items provided.</faq>
-	<include_file>squid.inc</include_file>
 	<name>squidusers</name>
+	<version>none</version>
 	<title>Proxy server: Local users</title>
+	<include_file>squid.inc</include_file>
 	<delete_string>A proxy server user has been deleted.</delete_string>
 	<addedit_string>A proxy server user has been created/modified.</addedit_string>
 	<tabs>
@@ -82,32 +84,32 @@
 	</tabs>
 	<adddeleteeditpagefields>
 		<columnitem>
-			<fieldname>username</fieldname>
 			<fielddescr>Username</fielddescr>
+			<fieldname>username</fieldname>
 		</columnitem>
 		<columnitem>
-			<fieldname>description</fieldname>
 			<fielddescr>Description</fielddescr>
+			<fieldname>description</fieldname>
 		</columnitem>
 	</adddeleteeditpagefields>
 	<fields>
 		<field>
-			<fieldname>username</fieldname>
 			<fielddescr>Username</fielddescr>
+			<fieldname>username</fieldname>
 			<description>Enter the username here.</description>
-			<required/>
 			<type>input</type>
+			<required/>
 		</field>
 		<field>
-			<fieldname>password</fieldname>
 			<fielddescr>Password</fielddescr>
+			<fieldname>password</fieldname>
 			<description>Enter the password here.</description>
-			<required/>
 			<type>password</type>
+			<required/>
 		</field>
 		<field>
-			<fieldname>description</fieldname>
 			<fielddescr>Description</fielddescr>
+			<fieldname>description</fieldname>
 			<description>You may enter a description here for your reference (not parsed).</description>
 			<type>input</type>
 		</field>