changed image path

13 files changed, 13 insertions, 4785 deletions

diff --git a/client_wizard/client.wiz b/client_wizard/client.wiz
index a31ad7f7..0bb0317d 100644
--- a/client_wizard/client.wiz
+++ b/client_wizard/client.wiz
@@ -6,32 +6,19 @@
 	libScript="__WIZ_HOME__/common/scripts/functions.sh"
 	wizardTitle="Client wizard"
 	imagePosition="top"
-	defaultImage="__WIZ_HOME__/images/DNS.jpg"
-	height="400"
-	width="525"
-	hasDb="true"
-	dbPositions="2"
-	dbFilename="/var/log/wizards/client.wiz"
-	referenceLength="425"
-	referenceHeight="13"
+	defaultImage="__WIZ_HOME__/client_wizard/images/DNS"
 	perlModule="__WIZ_HOME__/client_wizard/scripts/Clientconf.pm"
 >
 
 	<Variable
 		name="wiz_client_ip"
 		shellVariable="wiz_client_ip"
-		persistent="true"
-		dbPosition="0"
-		key="false"
 	>
 	</Variable>
 
 	<Variable
 		name="wiz_client_name"
 		shellVariable="wiz_client_name"
-		persistent="true"
-		dbPosition="1"
-		key="false"
 	>
 	</Variable>
 
@@ -64,77 +51,29 @@
 		</Target>
 
 		<Info
-			name="welcomeTitle"
-			alignement="Center"
 			helpText="DNS Client Wizard"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info13"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info10"
-			alignement="Center"
 			helpText="A client of your local network is a machine connected to the network having its own name and IP number."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info30"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info14"
-			alignement="Center"
 			helpText="This wizard will help you in adding a new client in your local DNS."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info28"
-			alignement="Center"
 			helpText="The server will use the informations you enter here to make the name of the client available to other machines into your network."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info"
-			alignement="Center"
 			helpText="Press next to begin, or Cancel to leave this wizard."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -168,108 +107,41 @@
 		</Target>
 
 		<Info
-			name="clientTitle"
-			alignement="Center"
 			helpText="Client identification:"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info2"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info3"
-			alignement="East"
 			helpText="Your client on the network will be identified by  name, as in clientname.company.net. Every machine on the network must have a (unique) IP address, in the usual dotted syntax."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info12"
-			alignement="East"
 			helpText="(you don't need to type the domain after the name)"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info15"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Freetext
 			name="wiz_client_name"
 			variableName="wiz_client_name"
-			alignement="Fill"
 			helpText="Name of the machine:"
-			guiType="textfield"
 			editable="true"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
 		<Freetext
 			name="wiz_client_ip"
 			variableName="wiz_client_ip"
-			alignement="Fill"
 			helpText="IP number of the machine:"
-			guiType="textfield"
 			editable="true"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
-		<Info
-			name="info16"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info5"
-			alignement="East"
 			helpText="Note that the given IP number and client name should be unique in the network."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -285,45 +157,18 @@
 	>
 
 		<Info
-			name="info21"
-			alignement="Center"
 			helpText="Warning:"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info20"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info202"
-			alignement="Center"
 			helpText="You have entered a machine name or an IP number already used."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info203"
-			alignement="Center"
 			helpText="Press next if you want to change the already existing value, or back to correct your choice."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -338,24 +183,9 @@
 		canCancel="true"
 	>
 
-		<Info
-			name="info7"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
-		>
-		</Info>
 
 		<Info
-			name="info8"
-			alignement="Center"
 			helpText="This is not a valid address... press next to continue"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 	</Page>
@@ -371,66 +201,24 @@
 	>
 
 		<Info
-			name="errorLabel"
-			alignement="Center"
 			helpText="Network not configured yet"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info23"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
-		>
-		</Info>
 
 		<Info
-			name="info22"
-			alignement="Center"
 			helpText="You have to configure the basic network parameters before launch this wizard."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info25"
-			alignement="Center"
 			helpText="Press next to configure these parameters now, or Cancel to exit this wizard."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info26"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info24"
-			alignement="Center"
 			helpText="If you choose to configure now, you will automatically continue with the Client configuration"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -470,98 +258,37 @@
 		</Target>
 
 		<Info
-			name="ClientTitle"
-			alignement="Center"
 			helpText="Adding a new client to your network"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info2"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info3"
-			alignement="East"
 			helpText="The wizard collected the following parameters
 needed to add a client to your network:"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info15"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Freetext
 			name="wiz_client_name"
 			variableName="wiz_client_name"
-			alignement="Fill"
 			helpText="Client name"
-			guiType="textfield"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
 		<Freetext
 			name="wiz_client_ip"
 			variableName="wiz_client_ip"
-			alignement="Fill"
 			helpText="Client IP:"
-			guiType="textfield"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
-		<Info
-			name="info16"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info5"
-			alignement="East"
 			helpText="To accept these values, and add your client, click on \qConfigure\q or use the Back button to correct them."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -577,46 +304,16 @@ needed to add a client to your network:"
 	>
 
 		<Info
-			name="congratulationTitle"
-			alignement="Center"
 			helpText="Congratulations"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info11"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info18"
-			alignement="Center"
 			helpText="The wizard successfully added the client."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info19"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 	</Page>
 
 	<Page
@@ -630,13 +327,7 @@ needed to add a client to your network:"
 	>
 
 		<Info
-			name="errorLabel"
-			alignement="Center"
 			helpText="You need to be root to run this wizard"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 	</Page>
@@ -652,13 +343,7 @@ needed to add a client to your network:"
 	>
 
 		<Info
-			name="errorLabel"
-			alignement="Center"
 			helpText="System error, no configuration done"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 	</Page>
diff --git a/db_wizard/db.wiz b/db_wizard/db.wiz
index 094161c0..8fff8105 100644
--- a/db_wizard/db.wiz
+++ b/db_wizard/db.wiz
@@ -6,13 +6,7 @@
 	libScript="__WIZ_HOME__/common/scripts/functions.sh"
 	wizardTitle="MySQL Database wizard"
 	imagePosition="top"
-	defaultImage="__WIZ_HOME__/images/SQL.jpg"
-	height="400"
-	width="525"
-	hasDb="false"
-	dbPositions="0"
-	referenceLength="425"
-	referenceHeight="13"
+	defaultImage="__WIZ_HOME__/db_wizard/images/SQL"
 	rpm="MySQL"
 >
 
@@ -20,7 +14,6 @@
 		name="root_passwd"
 		shellVariable="root_passwd"
 		valueIsTranslated="false"
-		persistent="false"
 	>
 	</Variable>
 	
@@ -28,7 +21,6 @@
 		name="username"
 		shellVariable="username"
 		valueIsTranslated="false"
-		persistent="false"
 	>
 	</Variable>
 
@@ -36,7 +28,6 @@
 		name="password"
 		shellVariable="password"
 		valueIsTranslated="false"
-		persistent="false"
 	>
 	</Variable>
 
@@ -69,44 +60,17 @@
 		</Target>
 
 		<Info
-			name="info1"
-			alignement="Center"
 			helpText="MySQL Database Server"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 		<Info
-			name="info30"
-			alignement="Center"
 			helpText="Configuration Wizard"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info2"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info3"
-			alignement="Center"
 			helpText="This wizard will help you configuring the MySQL Database Server for your network."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -121,13 +85,7 @@
 	>
 
 		<Info
-			name="info"
-			alignement="Center"
 			helpText="Sorry, you must be root to do this..."
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 	</Page>
@@ -142,66 +100,24 @@
 	>
 
 		<Info
-			name="errorLabel"
-			alignement="Center"
 			helpText="Network not configured yet"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info23"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
-		>
-		</Info>
 
 		<Info
-			name="info22"
-			alignement="Center"
 			helpText="You have to configure the basic network parameters before launch this wizard."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info25"
-			alignement="Center"
 			helpText="Press next to configure these parameters now, or Cancel to exit this wizard."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info26"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info24"
-			alignement="Center"
 			helpText="If you choose to configure now, you will automatically continue with the MySQL Database configuration"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -225,92 +141,30 @@
 	>
 
 		<Info
-			name="DBTitle"
-			alignement="Center"
 			helpText="Database Server"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info6"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info7"
-			alignement="East"
 			helpText="To run your server, you first need to specify a root password"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info10"
-			alignement="East"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info5"
-			alignement="East"
 			helpText="Please type a password for the root user:"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info21"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
                 <Freetext
                         name="root_passwd"
                         variableName="root_passwd"
-                        alignement="East"
-                        guiType="textfield"
-                        inputType="any"
                         editable="true"
-                        fontStyle="plain"
-                        fontSize="11"
-                        proportional="2"
-                        ratio="30"
-                        length="40"
                 >
                 </Freetext>
 
-		<Info
-			name="info8"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 	</Page>
 
 	<Page
@@ -325,83 +179,29 @@
 	>
 
 		<Info
-			name="confirmationTitle"
-			alignement="Center"
 			helpText="Configuring the MySQL Database Server"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info13"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info14"
-			alignement="East"
 			helpText="The wizard collected the following parameters
 needed to configure your MySQL Database Server"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info16"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Freetext
 			name="freetext1"
-			alignement="Fill"
 			variableName="root_passwd"
 			helpText="Root Password:"
-			guiType="textfield"
-			inputType="any"
 			editable="false"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
-		<Info
-			name="info17"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info18"
-			alignement="East"
 			helpText="To accept this value, and configure your server, click on \qConfirm\q or use the Back button to correct them."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -418,71 +218,27 @@ needed to configure your MySQL Database Server"
 	>
 
 		<Info
-			name="info26"
-			alignement="Center"
 			helpText="User addition"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info28"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info29"
-			alignement="Center"
 			helpText="Please enter a username and password to add a user"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info39"
-			alignement="Center"
-			guiType="label"
 			helpText="Note: This user will have all permissions"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info40"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
                 <Freetext
                         name="username"
 			variableName="username"
-			alignement="East"
 			helpText="Username:"
-                        guiType="textfield"
-                        inputType="any"
 			editable="true"
-		        fontStyle="plain"
-                        fontSize="11"
-                        proportional="2"
-                        ratio="30"
-                        length="40"
                 >
 	 	</Freetext>
 
@@ -490,16 +246,7 @@ needed to configure your MySQL Database Server"
 			name="password"
 			variableName="password"
 			helpText="Password:"
-			alignement="East"
-			guiType="textfield"
-			inputType="any"
 			editable="true"
-			fontStyle="plain"
-			fontSize="11"
-			fontName="Default"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
         </Page>
@@ -514,34 +261,13 @@ needed to configure your MySQL Database Server"
 	>
 
 		<Info
-			name="info23"
-			alignement="Center"
 			helpText="Congratulations"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info20"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info24"
-			alignement="Center"
 			helpText="The wizard successfully configured your MySQL Database Server"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
diff --git a/dhcp_wizard/dhcp.wiz b/dhcp_wizard/dhcp.wiz
index bfd4a593..f253fc86 100644
--- a/dhcp_wizard/dhcp.wiz
+++ b/dhcp_wizard/dhcp.wiz
@@ -6,14 +6,7 @@
 	libScript="__WIZ_HOME__/common/scripts/functions.sh"
 	wizardTitle="DHCP Wizard"
 	imagePosition="top"
-	defaultImage="__WIZ_HOME__/images/DHCP.jpg"
-	height="400"
-	width="525"
-	hasDb="true"
-	dbPositions="2"
-	dbFilename="/var/log/wizards/dhcp.wdb"
-	referenceLength="425"
-	referenceHeight="13"
+	defaultImage="__WIZ_HOME__/dhcp_wizard/images/DHCP"
 	perlModule="__WIZ_HOME__/dhcp_wizard/scripts/Dhcpconf.pm"
 	rpm="dhcp-server"
 >
@@ -23,9 +16,6 @@
 		comment="Low end of the DHCP server IP range"
 		shellVariable="wiz_ip_range1"
 		defaultValue="192.168.0.100"
-		persistent="true"
-		dbPosition="0"
-		key="false"
 	>
 	</Variable>
 
@@ -34,9 +24,6 @@
 		comment="High end of the DHCP server IP range"
 		shellVariable="wiz_ip_range2"
 		defaultValue="192.168.0.254"
-		persistent="true"
-		dbPosition="1"
-		key="false"
 	>
 	</Variable>
 
@@ -69,45 +56,18 @@
 		</Target>
 
 		<Info
-			name="welcomeTitle"
-			alignement="Center"
 			helpText="DHCP Configuration Wizard"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info4"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info5"
-			alignement="Center"
 			helpText="DHCP is a service that automatically assigns networking addresses to your workstations."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info"
-			alignement="Center"
 			helpText="This wizard will help you configuring the DHCP services of your server."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -136,99 +96,38 @@
 		</Target>
 
 		<Info
-			name="dhcpRangeTtitle"
-			alignement="Center"
 			helpText="Range of addresses used by dhcp"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info12"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info3"
-			alignement="East"
 			helpText="Select the range of addresses assigned to the workstations by the DHCP service; unless you have special needs, you can safely accept the proposed values."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info8"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Freetext
 			name="dhcpIpLow"
 			variableName="dhcp_range_low"
-			alignement="Fill"
 			fillScript="__WIZ_HOME__/dhcp_wizard/compute_range1.sh"
 			helpText="Lowest IP Address:"
-			guiType="textfield"
 			editable="true"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
 		<Freetext
 			name="dhcpIpHigh"
 			variableName="dhcp_range_high"
-			alignement="Fill"
 			fillScript="__WIZ_HOME__/dhcp_wizard/compute_range2.sh"
 			helpText="Highest IP Address:"
-			guiType="textfield"
 			editable="true"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
-		<Info
-			name="info10"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info11"
-			alignement="East"
 			helpText="IP addresses are a dotted list of four numbers smaller than 256."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -245,13 +144,7 @@
 	>
 
 		<Info
-			name="dhcpRangeErrorLabel"
-			alignement="Center"
 			helpText="The IP range specified is not correct"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 	</Page>
@@ -280,98 +173,37 @@
 		</Target>
 
 		<Info
-			name="doitTitle"
-			alignement="Center"
 			helpText="Configuring the DHCP Server"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info2"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info13"
-			alignement="East"
 			helpText="The wizard collected the following parameters
 needed to configure your DHCP service:"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info15"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Freetext
 			name="freetext"
 			variableName="dhcp_range_low"
-			alignement="Fill"
 			helpText="Lowest IP Address:"
-			guiType="textfield"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
 		<Freetext
 			name="freetext1"
 			variableName="dhcp_range_high"
-			alignement="Fill"
 			helpText="Highest IP Address:"
-			guiType="textfield"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
-		<Info
-			name="info16"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info17"
-			alignement="East"
 			helpText="To accept these values, and configure your server, click on \qConfigure\q or use the Back button to correct them."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -387,34 +219,13 @@ needed to configure your DHCP service:"
 	>
 
 		<Info
-			name="dhcpTitle"
-			alignement="Center"
 			helpText="Congratulations"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info20"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info21"
-			alignement="Center"
 			helpText="The wizard successfully configured the DHCP services of your server."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -430,13 +241,7 @@ needed to configure your DHCP service:"
 	>
 
 		<Info
-			name="errorLabel"
-			alignement="Center"
 			helpText="You need to be root to run this wizard"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 	</Page>
@@ -452,66 +257,24 @@ needed to configure your DHCP service:"
 	>
 
 		<Info
-			name="errorLabel"
-			alignement="Center"
 			helpText="Network not configured yet"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info23"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
-		>
-		</Info>
 
 		<Info
-			name="info22"
-			alignement="Center"
 			helpText="You have to configure the basic network parameters before launch this wizard."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info25"
-			alignement="Center"
 			helpText="Press next to configure these parameters now, or Cancel to exit this wizard."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info26"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info24"
-			alignement="Center"
 			helpText="If you choose to configure now, you will automatically continue with the DHCP configuration"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -538,13 +301,7 @@ needed to configure your DHCP service:"
 	>
 
 		<Info
-			name="errorLabel"
-			alignement="Center"
 			helpText="System error, no configuration done"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
diff --git a/dns_wizard/dns.wiz b/dns_wizard/dns.wiz
index 44578939..f7b9f68c 100644
--- a/dns_wizard/dns.wiz
+++ b/dns_wizard/dns.wiz
@@ -6,14 +6,7 @@
 	libScript="__WIZ_HOME__/common/scripts/functions.sh"
 	wizardTitle="DNS Wizard"
 	imagePosition="top"
-	defaultImage="__WIZ_HOME__/images/DNS.jpg"
-	height="400"
-	width="525"
-	hasDb="true"
-	dbPositions="2"
-	dbFilename="/var/log/wizards/dns.wiz"
-	referenceLength="425"
-	referenceHeight="13"
+	defaultImage="__WIZ_HOME__/dns_wizard/images/DNS"
 	perlModule="__WIZ_HOME__/dns_wizard/scripts/Dnsconf.pm"
 >
 
@@ -21,9 +14,6 @@
 		name="wiz_ext_dns1"
 		shellVariable="wiz_ext_dns1"
 		valueIsTranslated="false"
-		persistent="true"
-		dbPosition="0"
-		key="false"
 	>
 	</Variable>
 
@@ -31,9 +21,6 @@
 		name="wiz_ext_dns2"
 		shellVariable="wiz_ext_dns2"
 		valueIsTranslated="false"
-		persistent="true"
-		dbPosition="1"
-		key="false"
 	>
 	</Variable>
 
@@ -66,55 +53,19 @@
 		</Target>
 
 		<Info
-			name="welcomeTitle"
-			alignement="Center"
 			helpText="DNS Configuration Wizard"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info13"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info10"
-			alignement="Center"
 			helpText="DNS (Domain Name Server) is the service that put in correspondance a machine with an internet host name."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info30"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info14"
-			alignement="Center"
 			helpText="This wizard will help you configuring the DNS services of your server. This configuration will provide a local DNS service for local computers names, with non-local requests forwarded to an outside DNS."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -148,141 +99,55 @@
 		</Target>
 
 		<Info
-			name="dnsTitle"
-			alignement="Center"
 			helpText="DNS Server Addresses"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info2"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info3"
-			alignement="East"
 			helpText="DNS will allow your network to communicate with the Internet using standard internet host names.  In order to configure DNS, you must provide the IP address of primary and secondary DNS server; usually this address are given by your Internet provider."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info15"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Grid
 			name="grid"
 			rows="2"
 			columns="3"
-			alignement="Center"
 		>
 
 			<Info
-				name="info31"
-				alignement="Center"
 				helpText="Primary DNS Address:"
-				guiType="label"
-				fontStyle="bold"
-				fontSize="11"
 			>
 			</Info>
 
 			<Freetext
 				name="wiz_ext_dns1"
 				variableName="wiz_ext_dns1"
-				alignement="Fill"
 				fillScript="get_var wiz_ext_dns1"
-				guiType="textfield"
-				inputType="any"
 				editable="true"
-				fontName="Default"
-				fontStyle="bold"
-				fontSize="11"
-				proportional="2"
-				ratio="30"
-				length="40"
 			>
 			</Freetext>
 
-			<Info
-					name="empty1"
-					alignement="Center"
-					guiType="label"
-			>
-			</Info>
 
 			<Info
-				name="info32"
-				alignement="Center"
 				helpText="Secondary DNS Address:"
-				guiType="label"
-				fontStyle="plain"
-				fontSize="11"
 			>
 			</Info>
 
 			<Freetext
 				name="wiz_ext_dns2"
 				variableName="wiz_ext_dns2"
-				alignement="Fill"
 				fillScript="get_var wiz_ext_dns2"
-				guiType="textfield"
-				inputType="any"
 				editable="true"
-				fontName="Default"
-				fontStyle="bold"
-				fontSize="11"
-				proportional="2"
-				ratio="30"
-				length="40"
 			>
 			</Freetext>
-			<Info
-					name="empty2"
-					alignement="Center"
-					guiType="label"
-			>
-			</Info>
 
 		</Grid>
 
-		<Info
-			name="info16"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info5"
-			alignement="East"
 			helpText="IP addresses are a dotted list of four numbers smaller than 256."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -298,66 +163,24 @@
 	>
 
 		<Info
-			name="info21"
-			alignement="Center"
 			helpText="Warning:"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info20"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
-		<Info
-			name="info201"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info202"
-			alignement="Center"
 			helpText="You have entered an empty address for the DNS server."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info203"
-			alignement="Center"
 			helpText="Your setting could be accepted, but you will not be able to identify machine names outside your local network."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info23"
-			alignement="Center"
 			helpText="Press next to leave these values empty, or back to enter a value."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -372,36 +195,12 @@
 		canCancel="true"
 	>
 
-		<Info
-			name="info7"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
-		>
-		</Info>
 
 		<Info
-			name="info8"
-			alignement="Center"
 			helpText="This is not a valid address... press next to continue"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info9"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 	</Page>
 
 	<Page
@@ -415,66 +214,24 @@
 	>
 
 		<Info
-			name="errorLabel"
-			alignement="Center"
 			helpText="Network not configured yet"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info23"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
-		>
-		</Info>
 
 		<Info
-			name="info22"
-			alignement="Center"
 			helpText="You have to configure the basic network parameters before launch this wizard."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info25"
-			alignement="Center"
 			helpText="Press next to configure these parameters now, or Cancel to exit this wizard."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info26"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info24"
-			alignement="Center"
 			helpText="If you choose to configure now, you will automatically continue with the DNS configuration"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -514,136 +271,53 @@
 		</Target>
 
 		<Info
-			name="dnsTitle"
-			alignement="Center"
 			helpText="Configuring the DNS Server"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info2"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info3"
-			alignement="East"
 			helpText="The wizard collected the following parameters
 needed to configure your DNS service:"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info15"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Grid
 				name="grid"
 				rows="2"
 				columns="3"
-				alignement="Center"
 		>
 
             <Info
-                name="info31"
-                alignement="Center"
                 helpText="Primary DNS Address:"
-                guiType="label"
-                fontStyle="plain"
-                fontSize="11"
             >
 			</Info>
 
 		<Freetext
 			name="wiz_ext_dns1"
 			variableName="wiz_ext_dns1"
-			alignement="Fill"
-			guiType="textfield"
-			inputType="any"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 		<Info
-				name="empty1"
-				alignement="Center"
-				guiType="label"
 				>
 		</Info>
 		<Info
-				name="info32"
-				alignement="Center"
 				helpText="Secondary DNS Address:"
-				guiType="label"
-				fontStyle="plain"
-				fontSize="11"
 				>
 		</Info>
 		<Freetext
 			name="wiz_ext_dns2"
 			variableName="wiz_ext_dns2"
-			alignement="Fill"
-			guiType="textfield"
-			inputType="any"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
-		<Info
-				name="empty2"
-				alignement="Center"
-				guiType="label"
-				>
-		</Info>
 
 		</Grid>
-		<Info
-			name="info16"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info5"
-			alignement="East"
 			helpText="To accept these values, and configure your server, click on \qConfigure\q or use the Back button to correct them."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -659,34 +333,13 @@ needed to configure your DNS service:"
 	>
 
 		<Info
-			name="congratulationTitle"
-			alignement="Center"
 			helpText="Congratulations"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info11"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info18"
-			alignement="Center"
 			helpText="The wizard successfully configured the DNS services of your server."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -702,13 +355,7 @@ needed to configure your DNS service:"
 	>
 
 		<Info
-			name="errorLabel"
-			alignement="Center"
 			helpText="You need to be root to run this wizard"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 	</Page>
@@ -724,13 +371,7 @@ needed to configure your DNS service:"
 	>
 
 		<Info
-			name="errorLabel"
-			alignement="Center"
 			helpText="System error, no configuration done"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 	</Page>
diff --git a/firewall_wizard/firewall.wiz b/firewall_wizard/firewall.wiz
index 077fe54b..ba689abd 100644
--- a/firewall_wizard/firewall.wiz
+++ b/firewall_wizard/firewall.wiz
@@ -6,14 +6,7 @@
 	libScript="__WIZ_HOME__/common/scripts/functions.sh"
 	wizardTitle="Firewall wizard"
 	imagePosition="top"
-	defaultImage="images/firewall.jpg"
-	height="400"
-	width="525"
-	hasDb="true"
-	dbPositions="2"
-	dbFilename="/var/log/wizards/firewall.wdb"
-	referenceLength="425"
-	referenceHeight="13"
+	defaultImage="__WIZ_HOME__/firewall_wizard/images/firewall"
 	perlModule="__WIZ_HOME__/firewall_wizard/scripts/FWconf.pm"
 >
 
@@ -22,9 +15,6 @@
 		comment="The firewall protection  level"
 		shellVariable="wiz_firewall_level"
 		defaultValue="1"
-		persistent="true"
-		dbPosition="0"
-		key="false"
 	>
 	</Variable>
 
@@ -33,9 +23,6 @@
 		comment="The device for the firewall connection"
 		shellVariable="wiz_ext_device"
 		defaultValue="eth0"
-		persistent="true"
-		dbPosition="1"
-		key="false"
 	>
 	</Variable>
 
@@ -68,45 +55,18 @@
 		</Target>
 
 		<Info
-			name="welcomeTitle"
-			alignement="Center"
 			helpText="Firewall Configuration Wizard"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info7"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info1"
-			alignement="Center"
 			helpText="The firewall protects your internal network from unauthorized accesses from the Internet."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info3"
-			alignement="Center"
 			helpText="This wizard will help you configuring your server firewall."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -123,16 +83,8 @@
 		<Freetext
 			name="freetext2"
 			variableName="protectionLevel"
-			alignement="Center"
 			fillScript="get_var wiz_firewall_level"
-			guiType="textfield"
 			editable="true"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 	</Page>
@@ -147,62 +99,25 @@
 	>
 
 		<Info
-			name="hostnameTitile"
-			alignement="Center"
 			helpText="Protection Level"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info8"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info9"
-			alignement="East"
 			helpText="The firewall can be configured to offer different levels of protection; choose the level that corresponds to your needs.  If you don't know, the Medium level is usually the most appropriate."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info4"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Chooser
 			name="chooser1"
 			variableName="protectionLevel"
-			alignement="Center"
 			defaultOptionScript="echo $wiz_firewall_level"
 			helpFontName="Default"
 			helpFontStyle="plain"
 			helpFontSize="12"
 			editable="false"
-			guiType="checkbox"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
 		>
 
 			<Option
@@ -254,51 +169,20 @@
 		</Target>
 
 		<Info
-			name="deviceLabel"
-			alignement="Center"
 			helpText="Firewall Network Device"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info11"
-			alignement="East"
 			helpText="The firewall need to know how your server is connected to Internet; choose the device you are using for the external connection."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info12"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Chooser
 			name="deviceChooser"
 			variableName="firewallDevice"
-			alignement="Fill"
 			defaultOptionScript="__WIZ_HOME__/firewall_wizard/compute_ext_device.sh"
 			fillScript="__WIZ_HOME__/firewall_wizard/liste_ext_device.sh"
 			helpText="Device"
@@ -306,12 +190,6 @@
 			helpFontStyle="plain"
 			helpFontSize="12"
 			editable="true"
-			guiType="list"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
 		>
 		</Chooser>
 	</Page>
@@ -328,13 +206,7 @@
 	>
 
 		<Info
-			name="deviceErrorMessage"
-			alignement="Center"
 			helpText="The device name is not correct"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 	</Page>
@@ -363,98 +235,37 @@
 		</Target>
 
 		<Info
-			name="doitTitle"
-			alignement="Center"
 			helpText="Configuring the Firewall"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info14"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="doneLabel"
-			alignement="East"
 			helpText="The wizard collected the following parameters
 needed to configure your firewall:"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="cancelLabel"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Freetext
 			name="freetext"
-			alignement="Fill"
 			fillScript="__WIZ_HOME__/firewall_wizard/compute_level_name.sh"
 			helpText="Protection Level:"
-			guiType="textfield"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
 		<Freetext
 			name="freetext1"
 			variableName="firewallDevice"
-			alignement="Fill"
 			helpText="Internet Network Device:"
-			guiType="textfield"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
-		<Info
-			name="info17"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info18"
-			alignement="East"
 			helpText="To accept these values, and configure your server, click on \qConfigure\q or use the Back button to correct them."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -470,34 +281,13 @@ needed to configure your firewall:"
 	>
 
 		<Info
-			name="doneTitile"
-			alignement="Center"
 			helpText="Congratulations"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info16"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="successLabel"
-			alignement="Center"
 			helpText="The wizard successfully configured your server firewall."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -514,13 +304,7 @@ needed to configure your firewall:"
 	>
 
 		<Info
-			name="catastrophe_text"
-			alignement="Center"
 			helpText="Something terrible happened"
-			guiType="label"
-			fontName="Default"
-			fontStyle="italic"
-			fontSize="14"
 		>
 		</Info>
 	</Page>
@@ -537,13 +321,7 @@ needed to configure your firewall:"
 	>
 
 		<Info
-			name="root_error_message"
-			alignement="Center"
 			helpText="This Wizard need to run as root"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 	</Page>
@@ -559,66 +337,24 @@ needed to configure your firewall:"
 	>
 
 		<Info
-			name="errorLabel"
-			alignement="Center"
 			helpText="Network not configured yet"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info23"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
-		>
-		</Info>
 
 		<Info
-			name="info22"
-			alignement="Center"
 			helpText="You have to configure the basic network parameters before launch this wizard."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info25"
-			alignement="Center"
 			helpText="Press next to configure these parameters now, or Cancel to exit this wizard."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info26"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info24"
-			alignement="Center"
 			helpText="If you choose to configure now, you will automatically continue with the DNS configuration"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
diff --git a/ftp_wizard/ftp.wiz b/ftp_wizard/ftp.wiz
index 5dfde6dd..113c2518 100644
--- a/ftp_wizard/ftp.wiz
+++ b/ftp_wizard/ftp.wiz
@@ -6,13 +6,7 @@
 	libScript="__WIZ_HOME__/common/scripts/functions.sh"
 	wizardTitle="FTP wizard"
 	imagePosition="top"
-	defaultImage="__WIZ_HOME__/images/FTP.jpg"
-	height="400"
-	width="525"
-	hasDb="false"
-	dbPositions="0"
-	referenceLength="425"
-	referenceHeight="13"
+	defaultImage="__WIZ_HOME__/ftp_wizard/images/FTP"
 	perlModule="__WIZ_HOME__/ftp_wizard/scripts/ProFtpconf.pm"
 	rpm="proftpd"
 >
@@ -20,14 +14,12 @@
 	<Variable
 		name="wiz_ftp_internal"
 		shellVariable="wiz_ftp_internal"
-		persistent="false"
 	>
 	</Variable>
 
 	<Variable
 		name="wiz_ftp_external"
 		shellVariable="wiz_ftp_external"
-		persistent="false"
 	>
 	</Variable>
 
@@ -60,34 +52,13 @@
 		</Target>
 
 		<Info
-			name="info1"
-			alignement="Center"
 			helpText="FTP Server Configuration Wizard"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info2"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info3"
-			alignement="Center"
 			helpText="This wizard will help you configuring the FTP Server for your network."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -103,13 +74,7 @@
 	>
 
 		<Info
-			name="info"
-			alignement="Center"
 			helpText="Sorry, you must be root to do this..."
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 	</Page>
@@ -125,13 +90,7 @@
 	>
 
 		<Info
-			name="errorLabel"
-			alignement="Center"
 			helpText="Warning\nYou are in dhcp, server may doesn't work with your configuration."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -146,67 +105,22 @@
 	>
 
 		<Info
-			name="ftpTitle"
-			alignement="Center"
 			helpText="FTP Server"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info6"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info7"
-			alignement="East"
 			helpText="Your server can act as a FTP Server toward your internal network (intranet) and as a FTP Server for the Internet."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info10"
-			alignement="East"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info5"
-			alignement="East"
 			helpText="Select the kind of FTP service you want to activate:"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info21"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Boolean
 			name="wiz_ftp_internal"
@@ -214,24 +128,9 @@
 			forceEnabled="1"
 			forceDisabled="0"
 			helpText="Enable the FTP Server for the Intranet"
-			guiType="chechbox"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
 		>
 		</Boolean>
 
-		<Info
-			name="info8"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Boolean
 			name="wiz_ftp_external"
@@ -239,33 +138,12 @@
 			forceEnabled="1"
 			forceDisabled="0"
 			helpText="Enable the FTP Server for the Intranet and for the Internet"
-			guiType="chechbox"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
 		>
 		</Boolean>
 
-		<Info
-			name="info9"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info12"
-			alignement="East"
 			helpText="Don't check any box if you don't want to activate your FTP Server."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -283,98 +161,37 @@
 	>
 
 		<Info
-			name="confirmationTitle"
-			alignement="Center"
 			helpText="Configuring the FTP Server"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info13"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info14"
-			alignement="East"
 			helpText="The wizard collected the following parameters
 needed to configure your FTP Server"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info16"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Freetext
 			name="freetext1"
-			alignement="Fill"
 			variableName="wiz_ftp_internal"
 			helpText="Intranet FTP Server:"
-			guiType="textfield"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
 		<Freetext
 			name="freetext2"
-			alignement="Fill"
 			variableName="wiz_ftp_external"
 			helpText="Internet FTP Server:"
-			guiType="textfield"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
-		<Info
-			name="info17"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info18"
-			alignement="East"
 			helpText="To accept these values, and configure your server, click on \qConfigure\q or use the Back button to correct them."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -390,34 +207,13 @@ needed to configure your FTP Server"
 	>
 
 		<Info
-			name="info23"
-			alignement="Center"
 			helpText="Congratulations"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info20"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info24"
-			alignement="Center"
 			helpText="The wizard successfully configured your Intranet/Internet FTP Server"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
diff --git a/news_wizard/news.wiz b/news_wizard/news.wiz
index 5303f71d..497b0ce4 100644
--- a/news_wizard/news.wiz
+++ b/news_wizard/news.wiz
@@ -6,14 +6,7 @@
 	libScript="__WIZ_HOME__/common/scripts/functions.sh"
 	wizardTitle="News Wizard"
 	imagePosition="top"
-	defaultImage="__WIZ_HOME__/images/news.jpg"
-	height="400"
-	width="525"
-	hasDb="true"
-	dbPositions="5"
-	dbFilename="/var/log/wizards/server.wdb"
-	referenceLength="425"
-	referenceHeight="13"
+	defaultImage="__WIZ_HOME__/news_wizard/images/news"
 	perlModule="__WIZ_HOME__/news_wizard/scripts/Newsconf.pm"
 >
 
@@ -23,9 +16,6 @@
 		shellVariable="wiz_news_server"
 		defaultValue="news.provider.com"
 		valueIsTranslated="false"
-		persistent="true"
-		dbPosition="0"
-		key="false"
 	>
 	</Variable>
 
@@ -35,9 +25,6 @@
 		shellVariable="wiz_news_freq"
 		defaultValue="12"
 		valueIsTranslated="false"
-		persistent="true"
-		dbPosition="1"
-		key="false"
 	>
 	</Variable>
 
@@ -70,34 +57,13 @@
 		</Target>
 
 		<Info
-			name="welcome1"
-			alignement="Center"
 			helpText="Welcome to the News Wizard"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info7"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info1"
-			alignement="Center"
 			helpText="This wizard will help you configuring the Internet News services for your network."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -125,83 +91,29 @@
 		</Target>
 
 		<Info
-			name="newsServerTitle"
-			alignement="Center"
 			helpText="News Server"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info9"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info4"
-			alignement="East"
 			helpText="The news server name is the name of the host providing the Internet news to your network; the name is usually provided by your provider."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info8"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Freetext
 			name="freetext1"
 			comment="Host name input field"
 			variableName="newsServer"
-			alignement="Fill"
 			helpText="News Server  Name:"
-			guiType="textfield"
-			inputType="any"
 			editable="true"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
-		<Info
-			name="info15"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info13"
-			alignement="East"
 			helpText="Internet host names must be in the form \qhost.domain.domaintype\q; for example, if your provider is \qprovider.com\q, the internet new server is usually \qnews.provider.com\q."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -219,13 +131,7 @@
 	>
 
 		<Info
-			name="info3"
-			alignement="Center"
 			helpText="The news server name is not correct"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 	</Page>
@@ -253,81 +159,27 @@
 		</Target>
 
 		<Info
-			name="newsFreqTitle"
-			alignement="Center"
 			helpText="Polling Period"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info17"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info18"
-			alignement="East"
 			helpText="Your server will regularly poll the News Server for obtaning the latest Internet News; the polling period set the intervall between two consecutive polling."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info10"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 		<Freetext
 			name="freetext2"
 			variableName="newsFreq"
-			alignement="Fill"
 			helpText="Polling Period (Hours):"
-			guiType="textfield"
-			inputType="any"
 			editable="true"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
-		<Info
-			name="info21"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info22"
-			alignement="East"
 			helpText="Depending on the kind of internet connection you have, an appropriate polling period can change between 6 and 24 hours."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -344,13 +196,7 @@
 	>
 
 		<Info
-			name="info5"
-			alignement="Center"
 			helpText="The polling period is not correct"
-			guiType="label"
-			fontName="Default"
-			fontStyle="italic"
-			fontSize="14"
 		>
 		</Info>
 	</Page>
@@ -379,100 +225,37 @@
 		</Target>
 
 		<Info
-			name="doitTitle"
-			alignement="Center"
 			helpText="Configuring the Internet News"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info14"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info25"
-			alignement="East"
 			helpText="The wizard collected the following parameters
 needed to configure your Internet News Service:"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info24"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Freetext
 			name="freetext"
 			variableName="newsServer"
-			alignement="Fill"
 			helpText="News Server:"
-			guiType="textfield"
-			inputType="any"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
 		<Freetext
 			name="freetext2"
 			variableName="newsFreq"
-			alignement="Fill"
 			helpText="Polling Interval:"
-			guiType="textfield"
-			inputType="any"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
-		<Info
-			name="info27"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="doneLabel"
-			alignement="East"
 			helpText="To accept these values, and configure your server, click on \qConfigure\q or use the Back button to correct them."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -488,34 +271,13 @@ needed to configure your Internet News Service:"
 	>
 
 		<Info
-			name="doneTitle"
-			alignement="Center"
 			helpText="Congratulations"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info16"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="successLabel"
-			alignement="Center"
 			helpText="The wizard successfully configured your Internet News service of your server."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -532,13 +294,7 @@ needed to configure your Internet News Service:"
 	>
 
 		<Info
-			name="catastrophe_text"
-			alignement="Center"
 			helpText="Something terrible happened"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 	</Page>
@@ -555,13 +311,7 @@ needed to configure your Internet News Service:"
 	>
 
 		<Info
-			name="root_error_message"
-			alignement="Center"
 			helpText="This Wizard need to run as root"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 	</Page>
@@ -577,66 +327,24 @@ needed to configure your Internet News Service:"
 	>
 
 		<Info
-			name="errorLabel"
-			alignement="Center"
 			helpText="Network not configured yet"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info23"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
-		>
-		</Info>
 
 		<Info
-			name="info22"
-			alignement="Center"
 			helpText="You have to configure the basic network parameters before launch this wizard."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info25"
-			alignement="Center"
 			helpText="Press next to configure these parameters now, or Cancel to exit this wizard."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info26"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info24"
-			alignement="Center"
 			helpText="If you choose to configure now, you will automatically continue with the NEWS configuration"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
diff --git a/postfix_wizard/postfix.wiz b/postfix_wizard/postfix.wiz
index ea9520f9..c0930fa1 100644
--- a/postfix_wizard/postfix.wiz
+++ b/postfix_wizard/postfix.wiz
@@ -6,14 +6,7 @@
 	libScript="__WIZ_HOME__/common/scripts/functions.sh"
 	wizardTitle="Postfix wizard"
 	imagePosition="top"
-	defaultImage="__WIZ_HOME__/images/courrier.jpg"
-	height="400"
-	width="525"
-	hasDb="true"
-	dbPositions="2"
-	dbFilename="/var/log/wizards/postfix.wdb"
-	referenceLength="425"
-	referenceHeight="13"
+	defaultImage="__WIZ_HOME__/postfix_wizard/images/courrier"
 	perlModule="__WIZ_HOME__/postfix_wizard/scripts/Postfixconf.pm"
 	rpm="postfix"
 >
@@ -21,18 +14,12 @@
 	<Variable
 		name="wiz_mail_masquerade"
 		shellVariable="wiz_mail_masquerade"
-		persistent="true"
-		dbPosition="0"
-		key="false"
 	>
 	</Variable>
 
 	<Variable
 		name="wiz_ext_mail_relay"
 		shellVariable="wiz_ext_mail_relay"
-		persistent="true"
-		dbPosition="1"
-		key="false"
 	>
 	</Variable>
 
@@ -65,34 +52,13 @@
 		</Target>
 
 		<Info
-			name="welcomeTitle"
-			alignement="Center"
 			helpText="Internet Mail Configuration Wizard"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info27"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info2"
-			alignement="Center"
 			helpText="This wizard will help you configuring the Internet Mail services for your network."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -107,35 +73,14 @@
 		canCancel="true"
 	>
 
-		<Info
-			name="info4"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info5"
-			alignement="Center"
 			helpText="Sorry, you have to be root to run this wizard..."
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
 		<Info
-			name="info6"
-			alignement="Center"
 			helpText="See you soon!"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -152,17 +97,8 @@
 		<Freetext
 			name="freetext"
 			variableName="wiz_mail_masquerade"
-			alignement="Center"
 			fillScript="get_var wiz_mail_masquerade"
-			guiType="textfield"
-			inputType="domain"
 			editable="true"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 	</Page>
@@ -190,82 +126,29 @@
 		</Target>
 
 		<Info
-			name="addressTitle"
-			alignement="Center"
 			helpText="Outgoing Mail Address"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info8"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info9"
-			alignement="East"
 			helpText="You can select the kind of address that outgoing mail will show in the \qFrom:\q and \qReply-to\q field."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info11"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Freetext
 			name="wiz_mail_masquerade"
 			variableName="wiz_mail_masquerade"
-			alignement="Fill"
 			fillScript="get_var wiz_domain_name $wiz_mail_masquerade"
 			helpText="Mail Address:"
-			guiType="textfield"
 			editable="true"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
-		<Info
-			name="info34"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info35"
-			alignement="East"
 			helpText="This should be chosen consistently with the address you use for incoming mail."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -281,13 +164,7 @@
 	>
 
 		<Info
-			name="info12"
-			alignement="Center"
 			helpText="Masquerade not good!"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 	</Page>
@@ -315,81 +192,28 @@
 		</Target>
 
 		<Info
-			name="ispTitle"
-			alignement="Center"
 			helpText="Internet Mail Gateway"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info14"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info15"
-			alignement="East"
 			helpText="Your server will send the outgoing through a mail gateway, that will take care of the final delivery."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info32"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Freetext
 			name="wiz_ext_mail_relay"
 			variableName="wiz_ext_mail_relay"
-			alignement="Fill"
 			helpText="Mail Server Name:"
-			guiType="textfield"
 			editable="true"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="30"
 		>
 		</Freetext>
 
-		<Info
-			name="info"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info1"
-			alignement="East"
 			helpText="Internet host names must be in the form \qhost.domain.domaintype\q; for example, if your provider is \qprovider.com\q, the internet mail server is usually \qsmtp.provider.com\q."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -404,45 +228,18 @@
 	>
 
 		<Info
-			name="info37"
-			alignement="Center"
 			helpText="Warning:"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info371"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info372"
-			alignement="Center"
 			helpText="You entered an empty address for the mail gateway."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info373"
-			alignement="Center"
 			helpText="Your choice can be accepted, but this will not allow you to send mail outside your local network. Press next to continue, or back to enter a value."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -471,98 +268,37 @@
 		</Target>
 
 		<Info
-			name="info17"
-			alignement="Center"
 			helpText="Configuring the Internet Mail"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info18"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info19"
-			alignement="East"
 			helpText="The wizard collected the following parameters
 needed to configure your Internet Mail Service:"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info29"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Freetext
 			name="freetext1"
-			alignement="Fill"
 			fillScript="(export wiz_ext_mail_relay=`__WIZ_HOME__/postfix_wizard/scripts/compute_mail_relay.sh`; echo $wiz_ext_mail_relay)"
 			helpText="Internet Mail Gateway"
-			guiType="textfield"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
 		<Freetext
 			name="freetext2"
-			alignement="Fill"
 			fillScript="(export wiz_mail_masquerade=`__WIZ_HOME__/postfix_wizard/scripts/compute_masquerade.sh`; echo $wiz_mail_masquerade)"
 			helpText="Form of the Address"
-			guiType="textfield"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
-		<Info
-			name="info31"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info20"
-			alignement="East"
 			helpText="To accept these values, and configure your server, click on \qConfigure\q or use the Back button to correct them."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -577,34 +313,13 @@ needed to configure your Internet Mail Service:"
 	>
 
 		<Info
-			name="info21"
-			alignement="Center"
 			helpText="Hmmm"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info22"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info23"
-			alignement="Center"
 			helpText="There seems to be a problem... go ask to the big black man downstairs"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -620,66 +335,24 @@ needed to configure your Internet Mail Service:"
 	>
 
 		<Info
-			name="errorLabel"
-			alignement="Center"
 			helpText="Network not configured yet"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info23"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
-		>
-		</Info>
 
 		<Info
-			name="info22"
-			alignement="Center"
 			helpText="You have to configure the basic network parameters before launch this wizard."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info25"
-			alignement="Center"
 			helpText="Press next to configure these parameters now, or Cancel to exit this wizard."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info26"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info24"
-			alignement="Center"
 			helpText="If you choose to configure now, you will automatically continue with the POSTFIX configuration"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -706,34 +379,13 @@ needed to configure your Internet Mail Service:"
 	>
 
 		<Info
-			name="info24"
-			alignement="Center"
 			helpText="Congratulations"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info25"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info26"
-			alignement="Center"
 			helpText="The wizard successfully configured your Internet Mail service of your server."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
diff --git a/proxy_wizard/proxy.wiz b/proxy_wizard/proxy.wiz
index c56d9b77..cd264303 100644
--- a/proxy_wizard/proxy.wiz
+++ b/proxy_wizard/proxy.wiz
@@ -6,14 +6,7 @@
 	libScript="__WIZ_HOME__/common/scripts/functions.sh"
 	wizardTitle="Squid wizard"
 	imagePosition="top"
-	defaultImage="images/proxy.jpg"
-	height="400"
-	width="525"
-	hasDb="true"
-	dbPositions="2"
-	dbFilename="/var/log/wizards/proxy.wdb"
-	referenceLength="425"
-	referenceHeight="13"
+	defaultImage="__WIZ_HOME__/proxy_wizard/images/proxy"
 	perlModule="__WIZ_HOME__/proxy_wizard/scripts/Squidconf.pm"
 	rpm="squid"
 >
@@ -24,9 +17,6 @@
 		shellVariable="wiz_squid_level"
 		defaultValue="2"
 		valueIsTranslated="false"
-		persistent="true"
-		dbPosition="0"
-		key="false"
 	>
 	</Variable>
 
@@ -35,9 +25,6 @@
 		shellVariable="wiz_squid_port"
 		defaultValue="3128"
 		valueIsTranslated="false"
-		persistent="true"
-		dbPosition="1"
-		key="false"
 	>
 	</Variable>
 
@@ -46,9 +33,6 @@
 		shellVariable="wiz_squid_mem"
 		defaultValue="16"
 		valueIsTranslated="false"
-		persistent="true"
-		dbPosition="2"
-		key="false"
 	>
 	</Variable>
 
@@ -57,9 +41,6 @@
 		shellVariable="wiz_squid_disk"
 		defaultValue="200"
 		valueIsTranslated="false"
-		persistent="true"
-		dbPosition="3"
-		key="false"
 	>
 	</Variable>
 
@@ -68,9 +49,6 @@
 		shellVariable="wiz_squid_mynetw"
 		defaultValue="0.0.0.0/0.0.0.0"
 		valueIsTranslated="false"
-		persistent="true"
-		dbPosition="4"
-		key="false"
 	>
 	</Variable>
 
@@ -79,9 +57,6 @@
 		shellVariable="wiz_squid_defdir"
 		defaultValue="/var/spool/squid"
 		valueIsTranslated="false"
-		persistent="true"
-		dbPosition="5"
-		key="false"
 	>
 	</Variable>
 
@@ -89,9 +64,6 @@
 		name="wiz_squid_cachepeer"
 		shellVariable="wiz_squid_cachepeer"
 		valueIsTranslated="false"
-		persistent="true"
-		dbPosition="6"
-		key="false"
 	>
 	</Variable>
 
@@ -100,9 +72,6 @@
 		shellVariable="wiz_squid_peerport"
 		defaultValue="3128"
 		valueIsTranslated="false"
-		persistent="true"
-		dbPosition="7"
-		key="false"
 	>
 	</Variable>
 
@@ -111,9 +80,6 @@
 		shellVariable="wiz_squid_menupeer"
 		defaultValue="1"
 		valueIsTranslated="false"
-		persistent="true"
-		dbPosition="8"
-		key="false"
 	>
 	</Variable>
 
@@ -146,45 +112,18 @@
 		</Target>
 
 		<Info
-			name="welcomeTitle"
-			alignement="Center"
 			helpText="Proxy Configuration Wizard"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info7"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info1"
-			alignement="Center"
 			helpText="Squid is a web caching proxy server, it allows faster web acces for your local network."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info3"
-			alignement="Center"
 			helpText="This wizard will help you configuring your proxy server."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -202,136 +141,64 @@
 		<Freetext
 			name="def1"
 			variableName="wiz_squid_port"
-			alignement="Center"
 			fillScript="get_var wiz_squid_port"
-			guiType="textfield"
-			inputType="uint"
 			editable="true"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
 		<Freetext
 			name="def2"
 			variableName="wiz_squid_mem"
-			alignement="Center"
 			fillScript="get_var wiz_squid_mem"
-			guiType="textfield"
-			inputType="uint"
 			editable="true"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
 		<Freetext
 			name="def3"
 			variableName="wiz_squid_defdir"
-			alignement="Center"
 			fillScript="get_var wiz_squid_defdir"
-			guiType="textfield"
-			inputType="uint"
 			editable="true"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
 		<Freetext
 			name="def4"
 			variableName="wiz_squid_disk"
-			alignement="Center"
 			fillScript="get_var wiz_squid_disk"
-			guiType="textfield"
-			inputType="uint"
 			editable="true"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
 		<Freetext
 			name="def5"
 			variableName="wiz_squid_level"
-			alignement="Center"
 			fillScript="get_var wiz_squid_level"
-			guiType="textfield"
-			inputType="uint"
 			editable="true"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
 		<Freetext
 			name="def6"
 			variableName="wiz_squid_mynetw"
-			alignement="Center"
 			fillScript="get_var wiz_squid_mynetw"
-			guiType="textfield"
-			inputType="any"
 			editable="true"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
 		<Freetext
 			name="def7"
 			variableName="wiz_squid_cachepeer"
-			alignement="Center"
 			fillScript="get_var wiz_squid_cachepeer"
-			guiType="textfield"
-			inputType="any"
 			editable="true"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
 		<Freetext
 			name="def8"
 			variableName="wiz_squid_peerport"
-			alignement="Center"
 			fillScript="get_var wiz_squid_peerport"
-			guiType="textfield"
-			inputType="any"
 			editable="true"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 	</Page>
@@ -365,72 +232,25 @@
 		</Target>
 
 		<Info
-			name="info11"
-			alignement="Center"
 			helpText="Proxy Port"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info12"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info13"
-			alignement="East"
 			helpText="Proxy port value sets what port the proxy server will listen on for http requests. Default is 3128, other common value can be 8080, the port value need to be greater than 1024."
-			guiType="multiline"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info14"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Freetext
 			name="wiz_squid_port"
 			variableName="wiz_squid_port"
-			alignement="Fill"
 			helpText="Proxy port:"
-			guiType="textfield"
-			inputType="uint"
 			editable="true"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="40"
-			length="30"
 		>
 		</Freetext>
 
-		<Info
-			name="info15"
-			alignement="Center"
-			guiType="label"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 	</Page>
 
 	<Page
@@ -444,144 +264,55 @@
 	>
 
 		<Info
-			name="info21"
-			alignement="Center"
 			helpText="Proxy Cache Size"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info22"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info23"
-			alignement="East"
 			helpText="Memory Cache is the amount of RAM dedicated to cache memory operations (note that actual memory usage of the whole squid process is bigger)."
-			guiType="multiline"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info24"
-			alignement="East"
 			helpText="Disk Cache is the amount of disk space that can be used for caching on disk."
-			guiType="multiline"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info25"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Freetext
 			name="wiz_squid_mem"
 			variableName="wiz_squid_mem"
-			alignement="Fill"
 			helpText="Memory cache (MB):"
-			guiType="textfield"
-			inputType="uint"
 			editable="true"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="40"
-			length="30"
 		>
 		</Freetext>
 
 		<Freetext
 			name="wiz_squid_disk"
 			variableName="wiz_squid_disk"
-			alignement="Fill"
 			helpText="Disk space (MB):"
-			guiType="textfield"
-			inputType="uint"
 			editable="true"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="40"
-			length="30"
 		>
 		</Freetext>
 
-		<Info
-			name="info26"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info27"
-			alignement="East"
 			helpText="For information, here is /var/spool/squid space on disk:"
-			guiType="multiline"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info28"
-			alignement="East"
 			helpText="Filesystem            Size  Used Avail Use% Mounted on"
-			guiType="label"
-			fontName="Monospaced"
-			fontStyle="plain"
-			fontSize="12"
 		>
 		</Info>
 
 		<Info
-			name="dfh"
 			comment="free space on disk"
-			alignement="East"
 			fillScript="__WIZ_HOME__/proxy_wizard/scripts/dfh.sh"
-			guiType="label"
-			fontName="Monospaced"
-			fontStyle="plain"
-			fontSize="12"
 		>
 		</Info>
 
-		<Info
-			name="info29"
-			alignement="Center"
-			guiType="label"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 	</Page>
 
 	<Page
@@ -613,72 +344,29 @@
 		</Target>
 
 		<Info
-			name="hostnameTitile"
-			alignement="Center"
 			helpText="Access Control"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info8"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info9"
-			alignement="East"
 			helpText="The proxy can be configured to use different access control levels."
-			guiType="multiline"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info5"
-			alignement="East"
 			helpText="Choose the level that suit to your needs. If you don't know,the Local Network level is usually the most appropriate. Beware that the All level may be not secure."
-			guiType="multiline"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info4"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Chooser
 			name="chooser1"
 			variableName="wiz_squid_level"
-			alignement="Center"
 			helpFontName="Default"
 			helpFontStyle="plain"
 			helpFontSize="12"
 			editable="false"
-			guiType="checkbox"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
 		>
 
 			<Option
@@ -712,74 +400,25 @@
 	>
 
 		<Info
-			name="info30"
-			alignement="Center"
 			helpText="Warning:"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info31"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info32"
-			alignement="Center"
 			helpText="You have entered a port that may be useful for this service:"
-			guiType="multiline"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info"
-			alignement="Center"
-			guiType="label"
-			fontStyle="plain"
-			fontSize="12"
-		>
-		</Info>
 
 		<Info
-			name="info33"
-			alignement="Center"
 			fillScript="__WIZ_HOME__/proxy_wizard/scripts/printservices.sh"
-			guiType="multiligne"
-			fontName="Monospaced"
-			fontStyle="plain"
-			fontSize="12"
 		>
 		</Info>
 
-		<Info
-			name="info20"
-			alignement="Center"
-			guiType="label"
-			fontStyle="plain"
-			fontSize="12"
-		>
-		</Info>
 
 		<Info
-			name="info203"
-			alignement="Center"
 			helpText="Press Next if you want to keep this value, or Back to correct your choice."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -795,84 +434,30 @@
 	>
 
 		<Info
-			name="info30"
-			alignement="Center"
 			helpText="Grant acces on local network"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info31"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info32"
-			alignement="East"
 			helpText="Access will be allowed for hosts on the network. Here is the information found about your current local network, you can modify it if needed."
-			guiType="multiline"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info41"
-			alignement="East"
 			helpText="You can use either a numeric format like \q192.168.1.0/255.255.255.0\q or a text format like \q.domain.net\q"
-			guiType="multiline"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="12"
-		>
-		</Info>
 
 		<Freetext
 			name="f_wiz_squid_mynetw"
 			variableName="wiz_squid_mynetw"
-			alignement="Fill"
 			helpText="Authorised network:"
-			guiType="textfield"
-			inputType="mandatory"
 			editable="true"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
-		<Info
-			name="info20"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="12"
-		>
-		</Info>
 	</Page>
 
 	<Page
@@ -896,72 +481,29 @@
 		>
 		</Target>
 		<Info
-			name="ch"
-			alignement="Center"
 			helpText="Cache hierarchy"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info8"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info9"
-			alignement="East"
 			helpText="As an option, Squid can be configured in proxy cascading. You can add a new upper level proxy by specifying its hostname and port."
-			guiType="multiline"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info5"
-			alignement="East"
 			helpText="You can safely select \qNo upper level proxy\q if you don't need this feature."
-			guiType="multiline"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info4"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Chooser
 			name="chooser4"
 			variableName="wiz_squid_menupeer"
-			alignement="Center"
 			helpFontName="Default"
 			helpFontStyle="plain"
 			helpFontSize="12"
 			editable="false"
-			guiType="checkbox"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
 		>
 
 			<Option
@@ -993,89 +535,33 @@
 	>
 
 		<Info
-			name="info42"
-			alignement="Center"
 			helpText="Cache hierarchy"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info43"
-			alignement="Center"
-			guiType="label"
-			fontStyle="plain"
-			fontSize="12"
-		>
-		</Info>
 
 		<Info
-			name="info45"
-			alignement="East"
 			helpText="Enter the qualified hostname (like \qcache.domain.net\q) and the port of the proxy to use."
-			guiType="multiline"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info46"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="12"
-		>
-		</Info>
 
 		<Freetext
 			name="_wiz_squid_cachepeer"
 			variableName="wiz_squid_cachepeer"
-			alignement="Fill"
 			helpText="Upper level proxy hostname:"
-			guiType="Textfield"
-			inputType="mandatory"
 			editable="true"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="40"
-			length="30"
 		>
 		</Freetext>
 
 		<Freetext
 			name="_wiz_squid_peerport"
 			variableName="wiz_squid_peerport"
-			alignement="Fill"
 			helpText="Upper level proxy port:"
-			guiType="textfield"
-			inputType="uint"
 			editable="true"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="40"
-			length="30"
 		>
 		</Freetext>
 
-		<Info
-			name="info47"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="12"
-		>
-		</Info>
 	</Page>
 
 	<Page
@@ -1102,156 +588,67 @@
 		</Target>
 
 		<Info
-			name="doitTitle"
-			alignement="Center"
 			helpText="Configuring the Proxy"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info14"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="doneLabel"
-			alignement="East"
 			helpText="The wizard collected the following parameters needed to configure your proxy:"
-			guiType="multiline"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Freetext
 			name="s_port"
 			variableName="wiz_squid_port"
-			alignement="Fill"
 			helpText="Port:"
-			guiType="textfield"
-			inputType="any"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="30"
 		>
 		</Freetext>
 
 		<Freetext
 			name="s_mem"
 			variableName="wiz_squid_mem"
-			alignement="Fill"
 			helpText="Memory cache (MB):"
-			guiType="textfield"
-			inputType="any"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="20"
-			length="30"
 		>
 		</Freetext>
 
 		<Freetext
 			name="s_disk"
 			variableName="wiz_squid_disk"
-			alignement="Fill"
 			helpText="Disk space (MB):"
-			guiType="textfield"
-			inputType="any"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="20"
-			length="30"
 		>
 		</Freetext>
 
 		<Freetext
 			name="s_level"
-			alignement="Fill"
 			fillScript="__WIZ_HOME__/proxy_wizard/scripts/showlevel.sh $wiz_squid_level"
 			helpText="Access Control:"
-			guiType="textfield"
-			inputType="any"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="20"
-			length="30"
 		>
 		</Freetext>
 
 		<Freetext
 			name="s_peer"
 			variableName="wiz_squid_cachepeer"
-			alignement="Fill"
 			helpText="Upper level proxy hostname:"
-			guiType="textfield"
-			inputType="any"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="20"
-			length="30"
 		>
 		</Freetext>
 
 		<Freetext
 			name="s_peerport"
 			variableName="wiz_squid_peerport"
-			alignement="Fill"
 			helpText="Upper level proxy port:"
-			guiType="textfield"
-			inputType="any"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="20"
-			length="30"
 		>
 		</Freetext>
 
-		<Info
-			name="info10"
-			alignement="Center"
-			guiType="label"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info18"
-			alignement="East"
 			helpText="To accept these values, and configure your server, click on \qConfigure\q or use the Back button to correct them."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -1280,134 +677,54 @@
 		</Target>
 
 		<Info
-			name="doitTitle"
-			alignement="Center"
 			helpText="Configuring the Proxy"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info14"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="doneLabel"
-			alignement="East"
 			helpText="The wizard collected the following parameters needed to configure your proxy:"
-			guiType="multiline"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 		
-		<Info
-			name="info14"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 
 		<Freetext
 			name="s_port"
 			variableName="wiz_squid_port"
-			alignement="Fill"
 			helpText="Port:"
-			guiType="textfield"
-			inputType="any"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="30"
 		>
 		</Freetext>
 
 		<Freetext
 			name="s_mem"
 			variableName="wiz_squid_mem"
-			alignement="Fill"
 			helpText="Memory cache (MB):"
-			guiType="textfield"
-			inputType="any"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="20"
-			length="30"
 		>
 		</Freetext>
 
 		<Freetext
 			name="s_disk"
 			variableName="wiz_squid_disk"
-			alignement="Fill"
 			helpText="Disk space (MB):"
-			guiType="textfield"
-			inputType="any"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="20"
-			length="30"
 		>
 		</Freetext>
 
 		<Freetext
 			name="s_level"
-			alignement="Fill"
 			variableName="wiz_squid_mynetw"
 			fillScript="__WIZ_HOME__/proxy_wizard/scripts/showlevel.sh $wiz_squid_level"
 			helpText="Access Control:"
-			guiType="textfield"
-			inputType="any"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="20"
-			length="30"
 		>
 		</Freetext>
 
-		<Info
-			name="info10"
-			alignement="Center"
-			guiType="label"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info18"
-			alignement="East"
 			helpText="To accept these values, and configure your server, click on \qConfigure\q or use the Back button to correct them."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -1423,34 +740,13 @@
 	>
 
 		<Info
-			name="doneTitile"
-			alignement="Center"
 			helpText="Congratulations"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info16"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="successLabel"
-			alignement="Center"
 			helpText="The wizard successfully configured your proxy server."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -1467,13 +763,7 @@
 	>
 
 		<Info
-			name="catastrophe_text"
-			alignement="Center"
 			helpText="Something terrible happened"
-			guiType="label"
-			fontName="Default"
-			fontStyle="italic"
-			fontSize="14"
 		>
 		</Info>
 	</Page>
@@ -1490,13 +780,7 @@
 	>
 
 		<Info
-			name="root_error_message"
-			alignement="Center"
 			helpText="This Wizard need to run as root"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 	</Page>
@@ -1514,73 +798,23 @@
 	>
 
 		<Info
-			name="info35"
-			alignement="Center"
 			helpText="Warning:"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info36"
-			alignement="Center"
-			guiType="label"
-			fontStyle="plain"
-			fontSize="12"
-		>
-		</Info>
 
 		<Info
-			name="info37"
-			alignement="Center"
 			helpText="You must choose a port greater than 1024 and lower than 65535"
-			guiType="multiline"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info34"
-			alignement="Center"
-			guiType="label"
-			fontStyle="plain"
-			fontSize="12"
-		>
-		</Info>
 
-		<Info
-			name="info39"
-			alignement="Center"
-			guiType="label"
-			fontStyle="plain"
-			fontSize="12"
-		>
-		</Info>
 
 		<Info
-			name="info40"
-			alignement="Center"
 			helpText="Press back to change the value."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="12"
 		>
 		</Info>
 
-		<Info
-			name="info38"
-			alignement="Center"
-			guiType="label"
-			fontStyle="plain"
-			fontSize="12"
-		>
-		</Info>
 	</Page>
 
 	<Page
@@ -1594,66 +828,24 @@
 	>
 
 		<Info
-			name="errorLabel"
-			alignement="Center"
 			helpText="Network not configured yet"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info23"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
-		>
-		</Info>
 
 		<Info
-			name="info22"
-			alignement="Center"
 			helpText="You have to configure the basic network parameters before launch this wizard."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info25"
-			alignement="Center"
 			helpText="Press next to configure these parameters now, or Cancel to exit this wizard."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info26"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info24"
-			alignement="Center"
 			helpText="If you choose to configure now, you will automatically continue with the Proxy configuration."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
diff --git a/samba_wizard/samba.wiz b/samba_wizard/samba.wiz
index 2e4ca149..f490b5dc 100644
--- a/samba_wizard/samba.wiz
+++ b/samba_wizard/samba.wiz
@@ -6,14 +6,7 @@
 	libScript="__WIZ_HOME__/common/scripts/functions.sh"
 	wizardTitle="Samba wizard"
 	imagePosition="top"
-	defaultImage="__WIZ_HOME__/images/samba.jpg"
-	height="400"
-	width="525"
-	hasDb="true"
-	dbPositions="5"
-	dbFilename="/var/log/wizards/samba.wdb"
-	referenceLength="425"
-	referenceHeight="13"
+	defaultImage="__WIZ_HOME__/samba_wizard/images/samba"
 	perlModule="__WIZ_HOME__/samba_wizard/scripts/Smbconf.pm"
 	rpm="samba-server"
 >
@@ -22,9 +15,6 @@
 		name="doFileSharing"
 		comment="true if we do file sharing, false otherwise"
 		shellVariable="wiz_do_file_sharing"
-		persistent="true"
-		dbPosition="0"
-		key="false"
 	>
 	</Variable>
 
@@ -32,9 +22,6 @@
 		name="doPrinterSharing"
 		comment="true if samba do printer sharing"
 		shellVariable="wiz_do_printer_sharing"
-		persistent="true"
-		dbPosition="1"
-		key="false"
 	>
 	</Variable>
 
@@ -42,9 +29,6 @@
 		name="workgroup"
 		comment="The workgroup name"
 		shellVariable="wiz_workgroup"
-		persistent="true"
-		dbPosition="2"
-		key="false"
 	>
 	</Variable>
 
@@ -52,9 +36,6 @@
 		name="banner"
 		comment="The samba server banner name"
 		shellVariable="wiz_banner"
-		persistent="true"
-		dbPosition="3"
-		key="false"
 	>
 	</Variable>
 
@@ -87,45 +68,18 @@
 		</Target>
 
 		<Info
-			name="welcome1"
-			alignement="Center"
 			helpText="Samba Configuration Wizard"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info7"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info1"
-			alignement="Center"
 			helpText="Samba allows your server to behave as a file and print server for workstations running non-Linux systems."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info11"
-			alignement="Center"
 			helpText="This wizard will help you configuring the Samba services of your server."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -153,46 +107,16 @@
 		</Target>
 
 		<Info
-			name="servicesLabel"
-			alignement="Center"
 			helpText="Enabled Samba Services"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info8"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info17"
-			alignement="East"
 			helpText="Samba can provide a common file sharing area to your Windows workstation, and can also provide printer sharing for the printers connected to your server."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info20"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Boolean
 			name="fileSharingBoolean"
@@ -200,12 +124,6 @@
 			forceEnabled="true"
 			forceDisabled="false"
 			helpText="Enable Common File Sharing Area"
-			guiType="chechbox"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
 		>
 		</Boolean>
 
@@ -215,12 +133,6 @@
 			forceEnabled="true"
 			forceDisabled="false"
 			helpText="Enable Server Printer Sharing"
-			guiType="chechbox"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
 		>
 		</Boolean>
 	</Page>
@@ -238,24 +150,12 @@
 	>
 
 		<Info
-			name="info3"
-			alignement="Center"
 			helpText="No Samba service has been requested"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info12"
-			alignement="Center"
 			helpText="Press Quit to exit or Back to correct your choice"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -283,60 +183,22 @@
 		</Target>
 
 		<Info
-			name="info4"
-			alignement="Center"
 			helpText="Workgroup"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info10"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info21"
-			alignement="East"
 			helpText="Samba need to know the Windows Workgroup it will serve."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info22"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Freetext
 			name="freetext2"
 			variableName="workgroup"
-			alignement="Fill"
 			helpText="Workgroup:"
-			guiType="textfield"
 			editable="true"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 	</Page>
@@ -353,13 +215,7 @@
 	>
 
 		<Info
-			name="info5"
-			alignement="Center"
 			helpText="The Workgroup is wrong"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 	</Page>
@@ -387,60 +243,22 @@
 		</Target>
 
 		<Info
-			name="bannerLabel"
-			alignement="Center"
 			helpText="Server Banner."
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info9"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info23"
-			alignement="East"
 			helpText="The banner is the way this server will be described in the Windows workstations."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info25"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Freetext
 			name="serverBannerInput"
 			variableName="banner"
-			alignement="Fill"
 			helpText="Banner:"
-			guiType="textfield"
 			editable="true"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 	</Page>
@@ -457,13 +275,7 @@
 	>
 
 		<Info
-			name="serverErrorMessage"
-			alignement="Center"
 			helpText="The Server Banner is incorrect"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 	</Page>
@@ -492,120 +304,52 @@
 		</Target>
 
 		<Info
-			name="info13"
-			alignement="Center"
 			helpText="Configuring Samba"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info14"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="doneLabel"
-			alignement="East"
 			helpText="The wizard collected the following parameters
 needed to configure Samba."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Freetext
 			name="freetext"
 			variableName="doFileSharing"
-			alignement="Fill"
 			helpText="File Sharing:"
-			guiType="textfield"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
 		<Freetext
 			name="freetext1"
 			variableName="doPrinterSharing"
-			alignement="Fill"
 			helpText="Print Server:"
-			guiType="textfield"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
 		<Freetext
 			name="freetext3"
 			variableName="workgroup"
-			alignement="Fill"
 			helpText="Workgroup:"
-			guiType="textfield"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
 		<Freetext
 			name="freetext4"
 			variableName="banner"
-			alignement="Fill"
 			helpText="Server Banner:"
-			guiType="textfield"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
-		<Info
-			name="info28"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info29"
-			alignement="East"
 			helpText="To accept these values, and configure your server, click on \qConfigure\q or use the Back button to correct them."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -621,34 +365,13 @@ needed to configure Samba."
 	>
 
 		<Info
-			name="info15"
-			alignement="Center"
 			helpText="Congratulations"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info16"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="successLabel"
-			alignement="Center"
 			helpText="The wizard successfully configured your Samba server."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -665,13 +388,7 @@ needed to configure Samba."
 	>
 
 		<Info
-			name="catastrophe_text"
-			alignement="Center"
 			helpText="Something terrible happened"
-			guiType="label"
-			fontName="ZapfDingbats"
-			fontStyle="italic"
-			fontSize="14"
 		>
 		</Info>
 	</Page>
@@ -688,13 +405,7 @@ needed to configure Samba."
 	>
 
 		<Info
-			name="root_error_message"
-			alignement="Center"
 			helpText="This Wizard need to run as root"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 	</Page>
@@ -710,66 +421,24 @@ needed to configure Samba."
 	>
 
 		<Info
-			name="errorLabel"
-			alignement="Center"
 			helpText="Network not configured yet"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info23"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
-		>
-		</Info>
 
 		<Info
-			name="info22"
-			alignement="Center"
 			helpText="You have to configure the basic network parameters before launch this wizard."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info25"
-			alignement="Center"
 			helpText="Press next to configure these parameters now, or Cancel to exit this wizard."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info26"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info24"
-			alignement="Center"
 			helpText="If you choose to configure now, you will automatically continue with the SAMBA configuration"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
diff --git a/server_wizard/server.wiz b/server_wizard/server.wiz
index 4deb45f6..14fab983 100644
--- a/server_wizard/server.wiz
+++ b/server_wizard/server.wiz
@@ -6,14 +6,7 @@
 	libScript="__WIZ_HOME__/common/scripts/functions.sh"
 	wizardTitle="Server Wizard"
 	imagePosition="top"
-	defaultImage="__WIZ_HOME__/images/intranet.jpg"
-	height="400"
-	width="525"
-	hasDb="true"
-	dbPositions="5"
-	dbFilename="/var/log/wizards/server.wdb"
-	referenceLength="425"
-	referenceHeight="13"
+	defaultImage="__WIZ_HOME__/server_wizard/images/intranet"
 	perlModule="__WIZ_HOME__/server_wizard/scripts/Serverconf.pm"
 >
 
@@ -23,9 +16,6 @@
 		shellVariable="wiz_host_name"
 		defaultValue="host.domain.net"
 		valueIsTranslated="false"
-		persistent="true"
-		dbPosition="0"
-		key="true"
 	>
 	</Variable>
 
@@ -35,9 +25,6 @@
 		shellVariable="wiz_domain_name"
 		defaultValue="domain"
 		valueIsTranslated="false"
-		persistent="true"
-		dbPosition="1"
-		key="false"
 	>
 	</Variable>
 
@@ -47,9 +34,6 @@
 		shellVariable="wiz_ip_net"
 		defaultValue="192.168.0.0"
 		valueIsTranslated="false"
-		persistent="true"
-		dbPosition="2"
-		key="false"
 	>
 	</Variable>
 
@@ -59,9 +43,6 @@
 		shellVariable="wiz_ip_server"
 		defaultValue="192.168.0.1"
 		valueIsTranslated="false"
-		persistent="true"
-		dbPosition="3"
-		key="false"
 	>
 	</Variable>
 
@@ -71,9 +52,6 @@
 		shellVariable="wiz_device"
 		defaultValue="eth0"
 		valueIsTranslated="false"
-		persistent="true"
-		dbPosition="4"
-		key="false"
 	>
 	</Variable>
 
@@ -81,9 +59,6 @@
 		name="wiz_extn_device"
 		shellVariable="wiz_extn_device"
 		valueIsTranslated="false"
-		persistent="true"
-		dbPosition="0"
-		key="false"
 	>
 	</Variable>
 
@@ -91,9 +66,6 @@
 		name="wiz_extn_gateway"
 		shellVariable="wiz_extn_gateway"
 		valueIsTranslated="false"
-		persistent="true"
-		dbPosition="0"
-		key="false"
 	>
 	</Variable>
 
@@ -120,46 +92,16 @@
 		</Target>
 
 		<Info
-			name="welcome1"
-			alignement="Center"
 			helpText="Basic Network Configuration Wizard"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="filler"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info1"
-			alignement="Center"
 			helpText="This wizard will help you configuring the basic networking services of your server."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info53"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 	</Page>
 
 	<Page
@@ -173,55 +115,19 @@
 	>
 
 		<Info
-			name="welcome1"
-			alignement="Center"
 			helpText="Warning"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="filler"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info44"
-			alignement="Center"
 			helpText="This wizard will set the basic networking parameter of your server."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info45"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info46"
-			alignement="Center"
 			helpText="You should not run any  other applications while running this wizard and at the end of the wizard you should exit your session and redo the login."
-			guiType="label"
-			fontName="Default"
-			fontStyle="italic"
-			fontSize="14"
 		>
 		</Info>
 	</Page>
@@ -237,56 +143,23 @@
 	>
 
 		<Info
-			name="welcome1"
-			alignement="Center"
 			helpText="Note about networking"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="filler"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info44"
-			alignement="East"
 			helpText="As regards these wizards, your computer is seen as a server managing his own local network (C class network)."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info46"
-			alignement="East"
 			helpText="So, it's very probable that domain name and IP adresses for this local network are DIFFERENT from the server \qexternal\q connection."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info48"
-			alignement="East"
 			helpText="External connection is a network from which the computer is client (Internet or upstream network), connected using another network card or a modem."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -304,17 +177,8 @@
 		<Freetext
 			name="freetext"
 			variableName="hostname"
-			alignement="Center"
 			fillScript="get_var wiz_host_name"
-			guiType="textfield"
-			inputType="any"
 			editable="true"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 	</Page>
@@ -342,84 +206,30 @@
 		</Target>
 
 		<Info
-			name="hostnameLabel"
-			alignement="Center"
 			helpText="Host Name"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info21"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info13"
-			alignement="East"
 			helpText="The hostname is the name under which your server will be known from the other workstations in your network and maybe on the Internet (depending of your upstream configuration)."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="hostnameFiller"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Freetext
 			name="hostnameInput"
 			comment="Host name input field"
 			variableName="hostname"
-			alignement="Fill"
 			fillScript="get_var wiz_host_name $wiz_host_name"
 			helpText="Host Name:"
-			guiType="textfield"
-			inputType="domain"
 			editable="true"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
-		<Info
-			name="info22"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info19"
-			alignement="East"
 			helpText="Host names must be in the form \qhost.domain.domaintype\q; if your server will be an Internet server, the domain name should be the name registered with your provider. If you will only have intranet any valid name is OK, like \qcompany.net\q."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -437,13 +247,7 @@
 	>
 
 		<Info
-			name="info3"
-			alignement="Center"
 			helpText="The host name is not correct"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 	</Page>
@@ -458,84 +262,32 @@
 	>
 
 		<Info
-			name="deviceLabel"
-			alignement="Center"
 			helpText="Network Device"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info11"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info37"
-			alignement="East"
 			helpText="Choose the network device (usually a card) the server should use to connect to your network. It's the device for the local network, probably not the same device used for internet access."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info43"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Chooser
 			name="deviceChooser"
 			variableName="net_device"
-			alignement="Fill"
 			fillScript="__WIZ_HOME__/server_wizard/scripts/liste_device.sh"
 			helpText="Device:"
 			helpFontName="Default"
 			helpFontStyle="plain"
 			helpFontSize="12"
 			editable="false"
-			guiType="choice"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="true"
-			ratio="30"
 		>
 		</Chooser>
 
-		<Info
-			name="info39"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info42"
-			alignement="East"
 			helpText="Devices are presented with the Linux name and, if known, with the card description."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -550,48 +302,24 @@
 	>
 
 		<Info
-			name="debug22"
-			alignement="Fill"
 			helpText="This page compute the domainname; it should be invisible"
-			guiType="label"
-			fontName="Monospaced"
-			fontStyle="italic"
-			fontSize="14"
 		>
 		</Info>
 		<Freetext
 			name="net_deviceField"
 			variableName="net_device"
-			alignement="Fill"
 			fillScript="get_var wiz_device"
 			helpText="net device"
-			guiType="textfield"
-			inputType="any"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
 		<Freetext
 			name="domainnameField"
 			variableName="domainname"
-			alignement="Fill"
 			fillScript="__WIZ_HOME__/server_wizard/scripts/compute_domain.sh"
 			helpText="Computed domain Name"
-			guiType="textfield"
-			inputType="any"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 	</Page>
@@ -608,17 +336,8 @@
 		<Freetext
 			name="freetext1"
 			variableName="network_address"
-			alignement="Center"
 			fillScript="get_val wiz_ip_net"
-			guiType="textfield"
-			inputType="any"
 			editable="true"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 	</Page>
@@ -646,83 +365,29 @@
 		</Target>
 
 		<Info
-			name="networkAddressTitle"
-			alignement="Center"
 			helpText="Network Address"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info23"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info24"
-			alignement="East"
 			helpText="The network address is a number identifing your network; the proposed value is designed for a configuration not connected to Internet, or connected using IP masquerading; unless you know what you are doing, accept the default value."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info10"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Freetext
 			name="freetext2"
 			variableName="network_address"
-			alignement="Fill"
 			fillScript="__WIZ_HOME__/server_wizard/scripts/compute_ipnet.sh"
 			helpText="IP net address:"
-			guiType="textfield"
-			inputType="ip"
 			editable="true"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
-		<Info
-			name="info29"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info28"
-			alignement="East"
 			helpText="Network addresses are a list of four numbers smaller than 256, separated by dots; the last number of the list must be zero."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -739,13 +404,7 @@
 	>
 
 		<Info
-			name="info5"
-			alignement="Center"
 			helpText="The network address is wrong"
-			guiType="label"
-			fontName="Default"
-			fontStyle="italic"
-			fontSize="14"
 		>
 		</Info>
 	</Page>
@@ -760,30 +419,15 @@
 	>
 
 		<Info
-			name="debug4"
-			alignement="Center"
 			helpText="This page compute the default server address; should be invisible."
-			guiType="label"
-			fontName="Monospaced"
-			fontStyle="italic"
-			fontSize="14"
 		>
 		</Info>
 
 		<Freetext
 			name="freetext3"
 			variableName="server_address"
-			alignement="Fill"
 			fillScript="__WIZ_HOME__/server_wizard/scripts/compute_server_ip.sh"
-			guiType="textfield"
-			inputType="any"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 	</Page>
@@ -800,17 +444,8 @@
 		<Freetext
 			name="freetext4"
 			variableName="wiz_extn_device"
-			alignement="Center"
 			fillScript="echo `get_var wiz_extn_device`"
-			guiType="textfield"
-			inputType="any"
 			editable="true"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 	</Page>
@@ -827,17 +462,8 @@
 		<Freetext
 			name="freetext5"
 			variableName="wiz_extn_gateway"
-			alignement="Center"
 			fillScript="echo `get_var wiz_extn_gateway`"
-			guiType="textfield"
-			inputType="any"
 			editable="true"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 	</Page>
@@ -865,82 +491,28 @@
 		</Target>
 
 		<Info
-			name="serverAddressTitle"
-			alignement="Center"
 			helpText="Server Address"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info34"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info33"
-			alignement="East"
 			helpText="The server IP address is a number identifing your server in your network; the proposed value designed for a private network , with no internet visibility, or connected using IP masquerading; unless you know what you are doing, accept the default value."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info9"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Freetext
 			name="serverAddressInput"
 			variableName="server_address"
-			alignement="Fill"
 			helpText="Server IP address:"
-			guiType="textfield"
-			inputType="ip"
 			editable="true"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
-		<Info
-			name="info36"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info35"
-			alignement="East"
 			helpText="IP addresses are a dotted list of four numbers smaller than 256."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -957,13 +529,7 @@
 	>
 
 		<Info
-			name="serverErrorMessage"
-			alignement="Center"
 			helpText="The Server IP address is incorrect"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 	</Page>
@@ -979,100 +545,40 @@
 	>
 
 		<Info
-			name="info51"
-			alignement="Center"
 			helpText="External gateway"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info58"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info56"
-			alignement="East"
 			helpText="Here is your current value for the external gateway (value specified during the initial installation). The device (network card or modem) should be different from the one used for the internal network."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info52"
-			alignement="East"
 			helpText="Note: the gateway IP address should be non empty if you want an access to outside world."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info57"
-			alignement="East"
 			helpText="(you can change here these values if you know exactly what you're doing)"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info59"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Freetext
 			name="get_gatewaydev"
 			variableName="wiz_extn_device"
-			alignement="Fill"
 			helpText="Gateway device:"
-			guiType="textfield"
-			inputType="any"
 			editable="true"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
 		<Freetext
 			name="get_ipgateway"
 			variableName="wiz_extn_gateway"
-			alignement="Fill"
 			helpText="Gateway IP:"
-			guiType="textfield"
-			inputType="any"
 			editable="true"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 	</Page>
@@ -1095,167 +601,68 @@
 		</Target>
 
 		<Info
-			name="doitTitle"
-			alignement="Center"
 			helpText="Configuring your network"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info14"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="explication1"
-			alignement="East"
 			helpText="The wizard collected the following parameters needed to configure your network"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Freetext
 			name="serverNameConfirm"
 			variableName="hostname"
-			alignement="Fill"
 			helpText="Server Name:"
-			guiType="textfield"
-			inputType="any"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
 		<Freetext
 			name="networkIPConfirm"
 			variableName="network_address"
-			alignement="Fill"
 			helpText="Network Address:"
-			guiType="textfield"
-			inputType="any"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
 		<Freetext
 			name="serverIPConfirm"
 			variableName="server_address"
-			alignement="Fill"
 			helpText="Server Address:"
-			guiType="textfield"
-			inputType="any"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
 		<Freetext
 			name="deviceConfirm"
 			variableName="net_device"
-			alignement="Fill"
 			helpText="Device:"
-			guiType="textfield"
-			inputType="any"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
 		<Freetext
 			name="gatewayip_confirm"
 			variableName="wiz_extn_gateway"
-			alignement="Fill"
 			helpText="Gateway IP:"
-			guiType="textfield"
-			inputType="any"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
 		<Freetext
 			name="gatewaydev_confirm"
 			variableName="wiz_extn_device"
-			alignement="Fill"
 			helpText="Gateway device:"
-			guiType="textfield"
-			inputType="any"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
-		<Info
-			name="info12"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="doneLabel"
-			alignement="East"
 			helpText="To accept these values, and configure your server, click on \qConfigure\q or use the Back button to correct them."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -1272,13 +679,7 @@
 	>
 
 		<Info
-			name="catastrophe_text"
-			alignement="Center"
 			helpText="Wizard Error."
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 	</Page>
@@ -1294,34 +695,13 @@
 	>
 
 		<Info
-			name="info15"
-			alignement="Center"
 			helpText="Congratulations"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info16"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="successLabel"
-			alignement="Center"
 			helpText="The wizard successfully configured the basic networking services of your server."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -1338,13 +718,7 @@
 	>
 
 		<Info
-			name="root_error_message"
-			alignement="Center"
 			helpText="This Wizard need to run as root"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 	</Page>
diff --git a/time_wizard/time.wiz b/time_wizard/time.wiz
index 5c8ca6b6..9a4c7dcf 100644
--- a/time_wizard/time.wiz
+++ b/time_wizard/time.wiz
@@ -6,76 +6,48 @@
 	libScript="__WIZ_HOME__/common/scripts/functions.sh"
 	wizardTitle="Time wizard"
 	imagePosition="top"
-	defaultImage="__WIZ_HOME__/images/Time.jpg"
-	height="400"
-	width="525"
-	hasDb="true"
-	dbPositions="6"
-	dbFilename="/var/log/wizards/time.wdb"
-	referenceLength="425"
-	referenceHeight="13"
+	defaultImage="__WIZ_HOME__/time_wizard/images/Time"
 >
 
 	<Variable
 		name="chooser1"
 		shellVariable="chooser1"
-		persistent="true"
-		dbPosition="0"
-		key="false"
 	>
 	</Variable>
 
 	<Variable
 		name="server1"
 		shellVariable="server1"
-		persistent="true"
-		dbPosition="1"
-		key="false"
 	>
 	</Variable>
 
 	<Variable
 		name="typedserver1"
 		shellVariable="typedserver1"
-		persistent="true"
-		dbPosition="2"
-		key="false"
 	>
 	</Variable>
 
 	<Variable
 		name="server2"
 		shellVariable="server2"
-		persistent="true"
-		dbPosition="3"
-		key="false"
 	>
 	</Variable>
 
 	<Variable
 		name="typedserver2"
 		shellVariable="typedserver2"
-		persistent="true"
-		dbPosition="4"
-		key="false"
 	>
 	</Variable>
 
 	<Variable
 		name="chooser4"
 		shellVariable="chooser4"
-		persistent="true"
-		dbPosition="5"
-		key="false"
 	>
 	</Variable>
 
 	<Variable
 		name="wiz_timezone"
 		shellVariable="wiz_timezone"
-		persistent="true"
-		dbPosition="0"
-		key="false"
 	>
 	</Variable>
 
@@ -83,7 +55,6 @@
 		name="wiz_time_ok"
 		shellVariable="wiz_time_ok"
 		defaultValue="ok"
-		persistent="false"
 	>
 	</Variable>
 
@@ -116,67 +87,28 @@
 		</Target>
 
 		<Info
-			name="info1"
-			alignement="Center"
 			helpText="Time configuration wizard"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info39"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info2"
-			alignement="Center"
 			helpText="This wizard will help you to set the time of your server,"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info3"
-			alignement="Center"
 			helpText="either locally or synchronized with an external time server."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info42"
-			alignement="Center"
 			helpText="Thus your server will be the local time server for your network."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info4"
-			alignement="Center"
 			helpText="press next to begin, or cancel to leave this wizard"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -216,104 +148,40 @@
 		</Target>
 
 		<Info
-			name="info9"
-			alignement="Center"
 			helpText="Type of setting"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info27"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info33"
-			alignement="East"
 			helpText="You can set the time of your machine in two ways: Locally means that the setting"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info35"
-			alignement="East"
 			helpText="will simply set the system clock, without synchronizing with the external world"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info38"
-			alignement="East"
 			helpText="If you use a time server, your machine will ask to that server the correct time."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info36"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info34"
-			alignement="East"
 			helpText="Which kind of setting would you like to do?"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info40"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Chooser
 			name="chooser1"
 			variableName="chooser1"
-			alignement="Center"
 			helpFontName="Default"
 			helpFontStyle="bold"
 			helpFontSize="14"
 			editable="false"
-			guiType="checkbox"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
 		>
 
 			<Option
@@ -343,16 +211,8 @@
 		<Freetext
 			name="freetext"
 			variableName="wiz_time_ok"
-			alignement="Center"
 			fillScript="echo not_ok"
-			guiType="textfield"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 	</Page>
@@ -380,57 +240,27 @@
 		</Target>
 
 		<Info
-			name="info10"
-			alignement="Center"
 			helpText="WARNING:"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="14"
 		>
 		</Info>
 
 		<Info
-			name="info11"
-			alignement="Center"
 			helpText="No network have been detected."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="14"
 		>
 		</Info>
 
 		<Info
-			name="info12"
-			alignement="Center"
 			helpText="If you want to continue (and you know what you are doing)"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="14"
 		>
 		</Info>
 
 		<Info
-			name="info13"
-			alignement="Center"
 			helpText="Press next. otherwise, press \qback\q to set the local time only,"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="14"
 		>
 		</Info>
 
 		<Info
-			name="info14"
-			alignement="Center"
 			helpText="or cancel to exit this wizard."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="14"
 		>
 		</Info>
 	</Page>
@@ -458,46 +288,22 @@
 		</Target>
 
 		<Info
-			name="info5"
-			alignement="Center"
 			helpText="WARNING: the net time tool arent there."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="14"
 		>
 		</Info>
 
 		<Info
-			name="info6"
-			alignement="Center"
 			helpText="Click next to install that tools,"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="14"
 		>
 		</Info>
 
 		<Info
-			name="info15"
-			alignement="Center"
 			helpText="back to return,"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="14"
 		>
 		</Info>
 
 		<Info
-			name="info16"
-			alignement="Center"
 			helpText="or cancel to exit this wizard."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="14"
 		>
 		</Info>
 	</Page>
@@ -525,35 +331,17 @@
 		</Target>
 
 		<Info
-			name="info28"
-			alignement="Center"
 			helpText="Cant install the NTP tools!"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="14"
 		>
 		</Info>
 
 		<Info
-			name="info29"
-			alignement="Center"
 			helpText="please, install ntp manually if you can,"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="14"
 		>
 		</Info>
 
 		<Info
-			name="info30"
-			alignement="Center"
 			helpText="or insert the CDROM containing it"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="14"
 		>
 		</Info>
 	</Page>
@@ -568,73 +356,30 @@
 	>
 
 		<Info
-			name="info17"
-			alignement="Center"
 			helpText="Time Servers"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info21"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
-		>
-		</Info>
 
 		<Info
-			name="info31"
-			alignement="East"
 			helpText="Select a primary and secondary server from the list, or specify one:"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info32"
-			alignement="East"
 			helpText="(please, choose servers in your geographical area)"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info43"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Chooser
 			name="server1"
 			variableName="server1"
-			alignement="Fill"
 			helpText="Primary Time Server:"
 			helpFontName="Default"
 			helpFontStyle="plain"
 			helpFontSize="12"
 			editable="true"
-			guiType="choice"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="true"
-			ratio="30"
 		>
 
 			<Option
@@ -809,18 +554,11 @@
 		<Chooser
 			name="server2"
 			variableName="server2"
-			alignement="Fill"
 			helpText="Secondary Time Server:"
 			helpFontName="Default"
 			helpFontStyle="plain"
 			helpFontSize="12"
 			editable="true"
-			guiType="choice"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="true"
-			ratio="30"
 		>
 
 			<Option
@@ -992,15 +730,6 @@
 			</Option>
 		</Chooser>
 
-		<Info
-			name="info44"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<TDline
 			name="line"
@@ -1010,7 +739,6 @@
 		<Chooser
 			name="wiz_timezone"
 			variableName="wiz_timezone"
-			alignement="VFill"
 			defaultOptionScript="get_var wiz_timezone"
 			fillScript="__WIZ_HOME__/time_wizard/scripts/compute_liste.sh"
 			helpText="Choose a time zone:"
@@ -1018,12 +746,6 @@
 			helpFontStyle="plain"
 			helpFontSize="12"
 			editable="false"
-			guiType="list"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
 		>
 		</Chooser>
 	</Page>
@@ -1051,108 +773,41 @@
 		</Target>
 
 		<Info
-			name="info18"
-			alignement="Center"
 			helpText="Testing  the time servers availability"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info41"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info20"
-			alignement="East"
 			helpText="If the time server is not immediately available"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info45"
-			alignement="East"
 			helpText="(network or other reason), you will wait about 30 seconds"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info46"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info19"
-			alignement="East"
 			helpText="Press next to start the time servers test."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info37"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Freetext
 			name="freetext1"
-			alignement="Fill"
 			fillScript="echo $server1"
 			helpText="Primary Time Server:"
-			guiType="textfield"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
 		<Freetext
 			name="freetext2"
-			alignement="Fill"
 			fillScript="echo $server2"
 			helpText="Secondary Time Server:"
-			guiType="textfield"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 	</Page>
@@ -1170,16 +825,8 @@
 		<Freetext
 			name="freetext"
 			variableName="wiz_time_ok"
-			alignement="Center"
 			fillScript="echo not_ok"
-			guiType="textfield"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 	</Page>
@@ -1207,106 +854,48 @@
 		</Target>
 
 		<Info
-			name="info22"
-			alignement="Center"
 			helpText="WARNING"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
 		<Info
-			name="info23"
-			alignement="East"
 			helpText="The time servers are not responding. The causes could be:"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info24"
-			alignement="East"
 			helpText="- non existant time servers"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info25"
-			alignement="East"
 			helpText="- no outside network"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info26"
-			alignement="East"
 			helpText="- other reasons..."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info49"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info50"
-			alignement="Center"
 			helpText="You can try again to contact time servers,"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info51"
-			alignement="Center"
 			helpText="or save configuration without actually setting time."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Chooser
 			name="chooser4"
 			variableName="chooser4"
-			alignement="Center"
 			helpFontName="Default"
 			helpFontStyle="plain"
 			helpFontSize="12"
 			editable="false"
-			guiType="checkbox"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
 		>
 
 			<Option
@@ -1333,57 +922,18 @@
 		canCancel="false"
 	>
 
-		<Info
-			name="info7"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info8"
-			alignement="Center"
 			helpText="Time server configuration saved"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info52"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info48"
-			alignement="Center"
 			helpText="Your server can now act has a time server for your local network."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info47"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 	</Page>
 
 	<Page
@@ -1396,13 +946,7 @@
 	>
 
 		<Info
-			name="info"
-			alignement="Center"
 			helpText="Sorry, you must be root to run this wizard"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 	</Page>
@@ -1418,77 +962,29 @@
 	>
 
 		<Info
-			name="errorLabel"
-			alignement="Center"
 			helpText="Network not configured yet"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info23"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
-		>
-		</Info>
 
 		<Info
-			name="info22"
-			alignement="Center"
 			helpText="You have to configure the basic network parameters before launch this wizard."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info25"
-			alignement="Center"
 			helpText="Press next to configure these parameters now, or Cancel to exit this wizard."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info26"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info24"
-			alignement="Center"
 			helpText="If you choose to configure now, you will automatically continue"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info27"
-			alignement="Center"
 			helpText="with the TIME configuration"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
diff --git a/web_wizard/web.wiz b/web_wizard/web.wiz
index d25154cc..4adcf3e0 100644
--- a/web_wizard/web.wiz
+++ b/web_wizard/web.wiz
@@ -6,13 +6,7 @@
 	libScript="__WIZ_HOME__/common/scripts/functions.sh"
 	wizardTitle="Web wizard"
 	imagePosition="top"
-	defaultImage="__WIZ_HOME__/images/apache.jpg"
-	height="400"
-	width="525"
-	hasDb="false"
-	dbPositions="0"
-	referenceLength="425"
-	referenceHeight="13"
+	defaultImage="__WIZ_HOME__/web_wizard/images/apache"
 	perlModule="__WIZ_HOME__/web_wizard/scripts/Webconf.pm"
 	rpm="apache-conf"
 >
@@ -20,14 +14,12 @@
 	<Variable
 		name="wiz_web_internal"
 		shellVariable="wiz_web_internal"
-		persistent="false"
 	>
 	</Variable>
 
 	<Variable
 		name="wiz_web_external"
 		shellVariable="wiz_web_external"
-		persistent="false"
 	>
 	</Variable>
 
@@ -60,34 +52,13 @@
 		</Target>
 
 		<Info
-			name="info1"
-			alignement="Center"
 			helpText="Web Server Configuration Wizard"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info2"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info3"
-			alignement="Center"
 			helpText="This wizard will help you configuring the Web Server for your network."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -103,13 +74,7 @@
 	>
 
 		<Info
-			name="info"
-			alignement="Center"
 			helpText="Sorry, you must be root to do this..."
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 	</Page>
@@ -125,13 +90,7 @@
 	>
 
 		<Info
-			name="errorLabel"
-			alignement="Center"
 			helpText="Warning\nYou are in dhcp, server may doesn't work with your configuration."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -157,67 +116,22 @@
 	>
 
 		<Info
-			name="webTitle"
-			alignement="Center"
 			helpText="Web Server"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info6"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info7"
-			alignement="East"
 			helpText="Your server can act as a Web Server toward your internal network (intranet) and as a Web Server for the Internet."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info10"
-			alignement="East"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info5"
-			alignement="East"
 			helpText="Select the kind of Web service you want to activate:"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info21"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Boolean
 			name="wiz_web_internal"
@@ -225,24 +139,9 @@
 			forceEnabled="1"
 			forceDisabled="0"
 			helpText="Enable the Web Server for the Intranet"
-			guiType="chechbox"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
 		>
 		</Boolean>
 
-		<Info
-			name="info8"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Boolean
 			name="wiz_web_external"
@@ -250,33 +149,12 @@
 			forceEnabled="1"
 			forceDisabled="0"
 			helpText="Enable the Web Server for the Intranet and for the Internet"
-			guiType="chechbox"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
 		>
 		</Boolean>
 
-		<Info
-			name="info9"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info12"
-			alignement="East"
 			helpText="Don't check any box if you don't want to activate your Web Server."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -294,98 +172,37 @@
 	>
 
 		<Info
-			name="confirmationTitle"
-			alignement="Center"
 			helpText="Configuring the Web Server"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info13"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info14"
-			alignement="East"
 			helpText="The wizard collected the following parameters
 needed to configure your Web Server"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info16"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Freetext
 			name="freetext1"
-			alignement="Fill"
 			variableName="wiz_web_internal"
 			helpText="Intranet Web Server:"
-			guiType="textfield"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
 		<Freetext
 			name="freetext2"
-			alignement="Fill"
 			variableName="wiz_web_external"
 			helpText="Internet Web Server:"
-			guiType="textfield"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
-		<Info
-			name="info17"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info18"
-			alignement="East"
 			helpText="To accept these values, and configure your server, click on \qConfigure\q or use the Back button to correct them."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -401,34 +218,13 @@ needed to configure your Web Server"
 	>
 
 		<Info
-			name="info23"
-			alignement="Center"
 			helpText="Congratulations"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info20"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info24"
-			alignement="Center"
 			helpText="The wizard successfully configured your Intranet/Internet Web Server"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>