fix fixed_val and fixed_list

16 files changed, 196 insertions, 198 deletions

diff --git a/Wiztemplate.pm b/Wiztemplate.pm
index 68a19f33..f87421ad 100755
--- a/Wiztemplate.pm
+++ b/Wiztemplate.pm
@@ -67,9 +67,9 @@ $o->{pages} = {
 	      summary => {
 	        name =>  "\n\n" . "\n\n",
                 data => [
-		      { label => '', fixed_val => \$o->{var}{ip1} },
+		      { label => '', val_ref => \$o->{var}{ip1} },
 		      { label => '' },
-		      { label => '', fixed_val => \$o->{var}{ip2} },
+		      { label => '', val_ref => \$o->{var}{ip2} },
 		  ],
 		post => \&do_it,
 	        next => 'end'
diff --git a/dns_wizard/Bind.pm b/dns_wizard/Bind.pm
index e9316fa0..75d99b53 100644
--- a/dns_wizard/Bind.pm
+++ b/dns_wizard/Bind.pm
@@ -66,7 +66,6 @@ my $o = {
 		 CLIENTNAME => '',
 		 CLIENTIP => $CLIENTIP,
 		},
-	 defaultimage => "/usr/share/wizards//dns_wizard/images/DNS.png",
 	 init => sub {
 	   test_host_domain($SHORTHOSTNAME, $DOMAINNAME);
 	 },
@@ -127,8 +126,8 @@ $o->{pages} = {
 	       addhost => {
 			   name => N("Client identification:") . "\n\n" . N("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.") . "\n\n" . N("(You don't need to add the domain after the name)") . "\n\n" . N("Note that the given IP address and client name should be unique in the network."),
 			   data => [
-				    { label => N("Server:"), fixed_val => \$o->{var}{SHORTHOSTNAME} },
-				    { label => N("DNS Domainname:"), fixed_val => \$o->{var}{DOMAINNAME} },
+				    { label => N("Server:"), val_ref => \$o->{var}{SHORTHOSTNAME} },
+				    { label => N("DNS Domainname:"), val_ref => \$o->{var}{DOMAINNAME} },
 				    { label => N("Name of the machine:"), val => \$o->{var}{CLIENTNAME} },
 				    { label => N("IP address of the machine:"), val => \$o->{var}{CLIENTIP} },
 				   ],
@@ -138,7 +137,7 @@ $o->{pages} = {
 	       removehost => {
 			      name => N("Remove host:") . "\n\n" . N("Remove a host in existing DNS configuration.") . "\n\n" . N("Choose the host you want to remove in the following list."),
 			      data => [
-				       { label => N("Computer Name:"), val => \$o->{var}{CLIENTNAME}, fixed_list => \@list_hosts },
+				       { label => N("Computer Name:"), val => \$o->{var}{CLIENTNAME}, list_ref => \@list_hosts },
 				      ],
 			      post => \&list_hosts,
 			      next => 'summaryremove', no_back => 1,
@@ -215,7 +214,7 @@ $o->{pages} = {
 	       summaryslave => {
 				name => N("Wizard will Now build your DNS slave configuration") . "\n\n" . N("with this configuration:"),
 				data => [
-					 { label => N("IP Address of the master DNS server:"), fixed_val => \$o->{var}{IPMASTER} },
+					 { label => N("IP Address of the master DNS server:"), val_ref => \$o->{var}{IPMASTER} },
 					],
 				post => \&do_it_slave,
 				next => 'end',
@@ -223,10 +222,10 @@ $o->{pages} = {
 	       summaryadd => {
 			      name => N("Client with this identification will be added to your DNS"),
 			      data => [
-				       { label => N("Server:"), fixed_val => \$o->{var}{SHORTHOSTNAME} },
-				       { label => N("DNS Domainname:"), fixed_val => \$o->{var}{DOMAINNAME} },
-				       { label => N("Computer name:"), fixed_val => \$o->{var}{CLIENTNAME} },
-				       { label => N("Computer IP address:"), fixed_val => \$o->{var}{CLIENTIP} },
+				       { label => N("Server:"), val_ref => \$o->{var}{SHORTHOSTNAME} },
+				       { label => N("DNS Domainname:"), val_ref => \$o->{var}{DOMAINNAME} },
+				       { label => N("Computer name:"), val_ref => \$o->{var}{CLIENTNAME} },
+				       { label => N("Computer IP address:"), val_ref => \$o->{var}{CLIENTIP} },
 				      ],
 			      post => \&do_it_add,
 			      next => 'endadd',
@@ -234,7 +233,7 @@ $o->{pages} = {
 	       summaryremove => {
 				 name => N("Client with this identification will be removed from your DNS"),
 				 data => [
-					  { label => N("Computer name:"), val => \$o->{var}{CLIENTNAME}, fixed_list => \@list_hosts },
+					  { label => N("Computer name:"), val => \$o->{var}{CLIENTNAME}, list_ref => \@list_hosts },
 					 ],
 				 post => \&do_it_remove,
 				 next => 'endremove',
@@ -242,10 +241,10 @@ $o->{pages} = {
 	       summary => {
 			   name => N("The DNS server is about to be configured with the following configuration"),
 			   data => [
-				    { label => N("Server Hostname:"), fixed_val => \$o->{var}{SHORTHOSTNAME} },
-				    { label => N("Domainname:"), fixed_val => \$o->{var}{DOMAINNAME} },
-				    { label => N("External DNS:"), fixed_val => \$o->{var}{IPOFFORWARDER} },
-				    { label => N("Default domain name to search:"), fixed_val => \$o->{var}{ADDSEARCH} },
+				    { label => N("Server Hostname:"), val_ref => \$o->{var}{SHORTHOSTNAME} },
+				    { label => N("Domainname:"), val_ref => \$o->{var}{DOMAINNAME} },
+				    { label => N("External DNS:"), val_ref => \$o->{var}{IPOFFORWARDER} },
+				    { label => N("Default domain name to search:"), val_ref => \$o->{var}{ADDSEARCH} },
 				   ],
 			   post => \&do_it_master,
 			   next => 'end',
diff --git a/ftp_wizard/Proftpd.pm b/ftp_wizard/Proftpd.pm
index 2f5cba0d..e5855971 100755
--- a/ftp_wizard/Proftpd.pm
+++ b/ftp_wizard/Proftpd.pm
@@ -153,13 +153,13 @@ $o->{pages} = {
 			     $o->{var}{fxp} = $o->{var}{wiz_ftp_fxp} ? N("enabled") : N("disabled");
 			   },
 			   data => [
-				    { label => N('FTP Port:'), fixed_val => \$o->{var}{wiz_port} },
-				    { label => N("Intranet FTP server:"), fixed_val => \$o->{var}{internal} },
-				    { label => N("Internet FTP server:"), fixed_val => \$o->{var}{external} },
-				    { label => N("Permit root Login"), fixed_val => \$o->{var}{rootlogin} },
-				    { label => N("Chroot Home user"), fixed_val => \$o->{var}{defaultroot} },
-				    { label => N("Allow FTP resume"), fixed_val => \$o->{var}{ftpresume} },
-				    { label => N("Allow FXP"), fixed_val => \$o->{var}{fxp} },
+				    { label => N('FTP Port:'), val_ref => \$o->{var}{wiz_port} },
+				    { label => N("Intranet FTP server:"), val_ref => \$o->{var}{internal} },
+				    { label => N("Internet FTP server:"), val_ref => \$o->{var}{external} },
+				    { label => N("Permit root Login"), val_ref => \$o->{var}{rootlogin} },
+				    { label => N("Chroot Home user"), val_ref => \$o->{var}{defaultroot} },
+				    { label => N("Allow FTP resume"), val_ref => \$o->{var}{ftpresume} },
+				    { label => N("Allow FXP"), val_ref => \$o->{var}{fxp} },
 				   ],
 			   post => \&do_it,
 			   next => 'end'
diff --git a/installsrv_wizard/Installsrv.pm b/installsrv_wizard/Installsrv.pm
index e4b44cda..3ea0dd7a 100644
--- a/installsrv_wizard/Installsrv.pm
+++ b/installsrv_wizard/Installsrv.pm
@@ -89,10 +89,10 @@ $o->{pages} = {
 				 $o->{var}{http} = $o->{var}{wiz_http} ? N("enabled") : N("disabled");
 			       },
 			       data => [
-					{ label => "Path to data:", fixed_val => \$o->{var}{SOURCEDIR} },
-					{ label => "Destination directory:", fixed_val => \$o->{var}{DESTDIR} },
-					{ label => N("Enable NFS install server:"), fixed_val => \$o->{var}{nfs} },
-					{ label => N("Enable HTTP install server:"), fixed_val => \$o->{var}{http} },
+					{ label => "Path to data:", val_ref => \$o->{var}{SOURCEDIR} },
+					{ label => "Destination directory:", val_ref => \$o->{var}{DESTDIR} },
+					{ label => N("Enable NFS install server:"), val_ref => \$o->{var}{nfs} },
+					{ label => N("Enable HTTP install server:"), val_ref => \$o->{var}{http} },
 					],
 				   post => \&do_it,
 				   no_back => 1,
diff --git a/ldap_wizard/Ldap.pm b/ldap_wizard/Ldap.pm
index a58de7d8..5f54f5b6 100644
--- a/ldap_wizard/Ldap.pm
+++ b/ldap_wizard/Ldap.pm
@@ -216,10 +216,10 @@ $o->{pages} = {
                                     name =>  N("Confirmation of the user to create"),
                                     data => [
 					     { label => " " },
-					     { label => N("Name:"), type => 'field', fixed_val => \$o->{var}{sn} },
-					     { label => N("First name:"), type => 'field', fixed_val => \$o->{var}{cn} },
-					     { label => N("User Name:"), type => 'field', fixed_val => \$o->{var}{uid} },
-					     { label => N("Create in:"), type => 'field', fixed_val => \$o->{var}{defou} }, #. \$o->{var}{suffix} },
+					     { label => N("Name:"), type => 'field', val_ref => \$o->{var}{sn} },
+					     { label => N("First name:"), type => 'field', val_ref => \$o->{var}{cn} },
+					     { label => N("User Name:"), type => 'field', val_ref => \$o->{var}{uid} },
+					     { label => N("Create in:"), type => 'field', val_ref => \$o->{var}{defou} }, #. \$o->{var}{suffix} },
                                             ],
                                     post => \&do_it_user_add,
                                     next => $o->{var}{useraddisnogood},
@@ -228,9 +228,9 @@ $o->{pages} = {
                                    name =>  N("Confirmation Information for create an LDAP server"),
                                    data => [
 					    { label => " " },
-                                            { label => N("LDAP directory tree:"), type => 'field', fixed_val => \$o->{var}{suffix} },
-				            { label => N("LDAP Administrator:"), type => 'field', fixed_val => \$o->{var}{rootdn} },
-			         	    { label => N("Users Container:"), type => 'field', fixed_val => \$o->{var}{defou} },
+                                            { label => N("LDAP directory tree:"), type => 'field', val_ref => \$o->{var}{suffix} },
+				            { label => N("LDAP Administrator:"), type => 'field', val_ref => \$o->{var}{rootdn} },
+			         	    { label => N("Users Container:"), type => 'field', val_ref => \$o->{var}{defou} },
                                            ],
                                    post => \&do_it_setldap,
                                    next => 'end',
@@ -250,7 +250,7 @@ $o->{pages} = {
 				 name => N("Successfully added User"),
 				 data => [
 					  { label => " " },
-					  { label => "\n" , fixed_val => \$o->{var}{error_user_add} },
+					  { label => "\n" , val_ref => \$o->{var}{error_user_add} },
 					 ],
 				 no_back => '1',
 				 next => 'ask_menu',
@@ -259,7 +259,7 @@ $o->{pages} = {
 				   name => N("Error when adding user in Ldap database"),
 				   data => [
 					    { label => " " },
-					    { label => "\n" , fixed_val => \$o->{var}{error_user_add} },
+					    { label => "\n" , val_ref => \$o->{var}{error_user_add} },
 					   ],
 				   no_back => '1',
 				   next => 'add_userposix',
@@ -270,9 +270,9 @@ $o->{pages} = {
 			    my $container_ou = $o->{var}{wiz_level} . "," . $o->{var}{suffix};
 			  },
 			  data => [ { label => " " } ,
-				    { label => N("LDAP directory tree:"), type => 'field', fixed_val => \$o->{var}{suffix} },
-				    { label => N("LDAP Administrator:"), type => 'field', fixed_val => \$o->{var}{rootdn} },
-				    { label => N("Users Container:"), type => 'field', fixed_val => \$o->{var}{defou} },
+				    { label => N("LDAP directory tree:"), type => 'field', val_ref => \$o->{var}{suffix} },
+				    { label => N("LDAP Administrator:"), type => 'field', val_ref => \$o->{var}{rootdn} },
+				    { label => N("Users Container:"), type => 'field', val_ref => \$o->{var}{defou} },
 				  ],
 			  no_back => '1',
 			  next => 'ask_menu',
diff --git a/news_wizard/Inn.pm b/news_wizard/Inn.pm
index 364f1a7b..0cd3e06f 100755
--- a/news_wizard/Inn.pm
+++ b/news_wizard/Inn.pm
@@ -85,8 +85,8 @@ $o->{pages} = {
 	      summary => {
 	        name =>  N("Configuring the Internet News") . "\n\n" . N("The wizard collected the following parameters needed to configure your Internet News service:") . "\n\n" . N("To accept these values, and configure your server, click the next button or use the back button to correct them."),
                 data => [
-		      { label => N("News server:"), fixed_val => \$o->{var}{news_server} },
-		      { label => N("Polling interval:"), fixed_val => \$o->{var}{news_freq} },
+		      { label => N("News server:"), val_ref => \$o->{var}{news_server} },
+		      { label => N("Polling interval:"), val_ref => \$o->{var}{news_freq} },
 		  ],
 		post => \&do_it,
 	        next => 'end'
diff --git a/nfs_wizard/NFS.pm b/nfs_wizard/NFS.pm
index f38286e0..66fa2757 100755
--- a/nfs_wizard/NFS.pm
+++ b/nfs_wizard/NFS.pm
@@ -95,9 +95,9 @@ $o->{pages} = {
 	  $o->{var}{wiz_netmask} = $o->{var}{wiz_nfs_level} == 1 ? "0.0.0.0/0.0.0.0" : $o->{var}{wiz_netmask} 
       },
       data => [
-            { label => N("Exported dir:"), fixed_val => \$o->{var}{wiz_nfs_dir} },
-            { label => N("Access:"), fixed_val => \$o->{var}{wiz_text_level} },
-            { label => N("Netmask:"), fixed_val => \$o->{var}{wiz_netmask} },
+            { label => N("Exported dir:"), val_ref => \$o->{var}{wiz_nfs_dir} },
+            { label => N("Access:"), val_ref => \$o->{var}{wiz_text_level} },
+            { label => N("Netmask:"), val_ref => \$o->{var}{wiz_netmask} },
         ],
       post => \&do_it,
       next => 'end'
diff --git a/nisautofs_wizard/Nisautofs.pm b/nisautofs_wizard/Nisautofs.pm
index 52f27c2a..eb10d4ca 100644
--- a/nisautofs_wizard/Nisautofs.pm
+++ b/nisautofs_wizard/Nisautofs.pm
@@ -59,7 +59,6 @@ my $o = {
 		 create_missing_directory => '',
 		},
 	 needed_rpm => [ 'ypserv', 'ypbind', 'nfs-utils', 'yp-tools', 'nfs-utils-clients' ],
-	 defaultimage => "$ENV{__WIZ_HOME__}/nisautofs_wizard/images/nisautofs.png",
 	 init => sub {
 	   test_host_domain($HOST, $NISDOMAIN);
 	 },
@@ -92,14 +91,14 @@ $o->{pages} = {
 	       summaryserver => {
 				 name => N("The wizard will set your NIS server with autofs map"),
 				 data => [
-					  { label => N("NIS server:"), fixed_val => \$HOST },
-					  { label => N("Home NIS:"), fixed_val => \$o->{var}{HOMENIS} },
-					  { label => N("NIS domainname:"), fixed_val => \$o->{var}{NISDOMAIN} },
-					  { label => N("NIS directory:"), fixed_val => \$o->{var}{NIS_DIRMAKEFILE} },
-#					  { label => N("Network file:"), fixed_val => \$o->{var}{NETWORKFILE} },
-#					  { label => N("NFS exports:"), fixed_val => \$o->{var}{NFSEXPORTS} },
-#					  { label => N("Auto master:"), fixed_val => \$o->{var}{AUTOMASTER} },
-#					  { label => N("Auto home:"), fixed_val => \$o->{var}{AUTOHOME} },
+					  { label => N("NIS server:"), val_ref => \$HOST },
+					  { label => N("Home NIS:"), val_ref => \$o->{var}{HOMENIS} },
+					  { label => N("NIS domainname:"), val_ref => \$o->{var}{NISDOMAIN} },
+					  { label => N("NIS directory:"), val_ref => \$o->{var}{NIS_DIRMAKEFILE} },
+#					  { label => N("Network file:"), val_ref => \$o->{var}{NETWORKFILE} },
+#					  { label => N("NFS exports:"), val_ref => \$o->{var}{NFSEXPORTS} },
+#					  { label => N("Auto master:"), val_ref => \$o->{var}{AUTOMASTER} },
+#					  { label => N("Auto home:"), val_ref => \$o->{var}{AUTOHOME} },
 					 ],
 				 post => \&do_it_server,
 				     next => 'endserver',
diff --git a/postfix_wizard/Postfix.pm b/postfix_wizard/Postfix.pm
index 45c0552c..7074937c 100755
--- a/postfix_wizard/Postfix.pm
+++ b/postfix_wizard/Postfix.pm
@@ -177,8 +177,8 @@ $o->{pages} = {
 				  $o->{var}{wiz_masquerade_domains} ||=$postfix->{masquerade_domains};
 				},
 			       data => [
-					{ label => N('helo required:'), val => \$o->{var}{wiz_smtpd_helo_required}, fixed_list => \@yesorno },
-					{ label => N('Disable verify command:'), val => \$o->{var}{wiz_disable_vrfy_command}, fixed_list => \@yesorno },
+					{ label => N('helo required:'), val => \$o->{var}{wiz_smtpd_helo_required}, list_ref => \@yesorno },
+					{ label => N('Disable verify command:'), val => \$o->{var}{wiz_disable_vrfy_command}, list_ref => \@yesorno },
 					{ label => N('Masquerade domains'), val => \$o->{var}{wiz_masquerade_domains}, help => N('This should be chosen consistently with the address you use for incoming mail. Address masquerading is a method to hide all hosts inside a domain behind their mail gateway, and to make it appear as if the mail comes from the gateway itself, instead of from individual machines.') },
 				       ],
 			       complete => sub {
@@ -249,8 +249,8 @@ $o->{pages} = {
 	       summary_relay => {
 			   name =>  N("Configuring your relay mail server") . "\n\n" . N("The wizard collected the following parameters needed to configure your relay mail server:") . "\n\n" . N("To accept these values, and configure your server, click the next button or use the back button to correct them."),
 			   data => [
-				    { label => N('Relay host:'), fixed_val => \$o->{var}{wiz_relayhost} },
-				    { label => N('Relay domains:'), fixed_val => \$o->{var}{wiz_relay_domains} },
+				    { label => N('Relay host:'), val_ref => \$o->{var}{wiz_relayhost} },
+				    { label => N('Relay domains:'), val_ref => \$o->{var}{wiz_relay_domains} },
 				   ],
 			   post => \&do_it_relay_server,
 			   next => 'end'
@@ -258,9 +258,9 @@ $o->{pages} = {
 	       summary_main => {
 				name =>  N("The wizard will now configure your Postfix mail server."),
 				data => [
-					 { label => N('inet interfaces:'), fixed_val => \$o->{var}{wiz_inet_interfaces} },
-					 { label => N('my destination:'), fixed_val => \$o->{var}{wiz_mydestination} },
-					 { label => N('my networks:'), fixed_val => \$o->{var}{wiz_mynetworks} },
+					 { label => N('inet interfaces:'), val_ref => \$o->{var}{wiz_inet_interfaces} },
+					 { label => N('my destination:'), val_ref => \$o->{var}{wiz_mydestination} },
+					 { label => N('my networks:'), val_ref => \$o->{var}{wiz_mynetworks} },
 					],
 				post => \&do_it_main_server,
 				next => 'end'
diff --git a/proxy_wizard/Squid.pm b/proxy_wizard/Squid.pm
index 4848b428..9693494e 100755
--- a/proxy_wizard/Squid.pm
+++ b/proxy_wizard/Squid.pm
@@ -87,7 +87,7 @@ $o->{pages} = {
 	      warning_port => {
 		name => N("Warning.") . "\n\n" . N("You have entered a port that may be useful for this service:") . "\n\n" . N("Press Next if you want to keep this value, or Back to correct your choice."),
 		data => [ 
-		    { label => '/etc/services:', fixed_val => \$o->{var}{used_by} },
+		    { label => '/etc/services:', val_ref => \$o->{var}{used_by} },
 		    ],
 	        next => 'memory'
 	      },
@@ -154,12 +154,12 @@ $o->{pages} = {
 	      summary => {
 	        name =>  N("Configuring the Proxy") . "\n\n" . N("The wizard collected the following parameters needed to configure your proxy:") . "\n\n" . N("To accept these values, and configure your server, click the Next button or use the Back button to correct them."),
                 data => [
-		      { label => N("Port:"), type => 'field', fixed_val => \$o->{var}{wiz_squid_port} },
-		      { label => N("Memory cache (MB):"), type => 'field', fixed_val => \$o->{var}{wiz_squid_mem} },
-		      { label => N("Disk space (MB):"), type => 'field', fixed_val => \$o->{var}{wiz_squid_disk} },
-		      { label => N("Access Control:"), type => 'field', fixed_val => \$o->{var}{wiz_squid_mynetw} },
-		      { label => N("Upper level proxy hostname:"), type => 'field', fixed_val => \$o->{var}{wiz_squid_cachepeer} },
-		      { label => N("Upper level proxy port:"), type => 'field', fixed_val => \$o->{var}{wiz_squid_peerport} },
+		      { label => N("Port:"), type => 'field', val_ref => \$o->{var}{wiz_squid_port} },
+		      { label => N("Memory cache (MB):"), type => 'field', val_ref => \$o->{var}{wiz_squid_mem} },
+		      { label => N("Disk space (MB):"), type => 'field', val_ref => \$o->{var}{wiz_squid_disk} },
+		      { label => N("Access Control:"), type => 'field', val_ref => \$o->{var}{wiz_squid_mynetw} },
+		      { label => N("Upper level proxy hostname:"), type => 'field', val_ref => \$o->{var}{wiz_squid_cachepeer} },
+		      { label => N("Upper level proxy port:"), type => 'field', val_ref => \$o->{var}{wiz_squid_peerport} },
 		  ],
 		post => \&do_it,
 	        next => 'end'
@@ -167,10 +167,10 @@ $o->{pages} = {
 	      summary_2 => {
 	        name =>  N("Configuring the Proxy") . "\n\n" . N("The wizard collected the following parameters needed to configure your proxy:") . "\n\n" . N("To accept these values, and configure your server, click the Next button or use the Back button to correct them."),
                 data => [
-		      { label => N("Port:"), type => 'field', fixed_val => \$o->{var}{wiz_squid_port} },
-		      { label => N("Memory cache (MB):"), type => 'field', fixed_val => \$o->{var}{wiz_squid_mem} },
-		      { label => N("Disk space (MB):"), type => 'field', fixed_val => \$o->{var}{wiz_squid_disk} },
-		      { label => N("Access Control:"), type => 'field', fixed_val => \$o->{var}{wiz_squid_mynetw} },
+		      { label => N("Port:"), type => 'field', val_ref => \$o->{var}{wiz_squid_port} },
+		      { label => N("Memory cache (MB):"), type => 'field', val_ref => \$o->{var}{wiz_squid_mem} },
+		      { label => N("Disk space (MB):"), type => 'field', val_ref => \$o->{var}{wiz_squid_disk} },
+		      { label => N("Access Control:"), type => 'field', val_ref => \$o->{var}{wiz_squid_mynetw} },
 		  ],
 		post => \&do_it,
 	        next => 'end'
diff --git a/pxe_wizard/Pxe.pm b/pxe_wizard/Pxe.pm
index 2bcfb4a7..36d1f80b 100644
--- a/pxe_wizard/Pxe.pm
+++ b/pxe_wizard/Pxe.pm
@@ -152,7 +152,7 @@ $o->{pages} = {
 	       removeimg => {
 			     name => N("Remove a boot image") . "\n\n" . N("Please choose the PXE boot image you want to remove from the PXE server.") . "\n\n" . N("The PXE boot image, and the related entry in PXE menu will be deleted."),
 			     data => [
-				      { label => N("Boot image to remove:"), val => \$o->{var}{IMGTOREMOVE}, fixed_list => \@list_menu },
+				      { label => N("Boot image to remove:"), val => \$o->{var}{IMGTOREMOVE}, list_ref => \@list_menu },
 				     ],
 			     no_back => 1,
 			     next => 'summaryremove',
@@ -160,7 +160,7 @@ $o->{pages} = {
 	       modifyimg => {
 			     name => N("Add options to boot image") . "\n\n" . N("In some cases, you want to add some options to the PXE boot image. This wizard provides an easy way to customize a boot image with common parameters.") . "\n\n" . N("Please choose, from the list below, the PXE boot image you want to modify"),
 			     data => [
-				      { label => N("Boot image to modify:"), val => \$o->{var}{IMGTOMODIFY}, fixed_list => \@list_menu },
+				      { label => N("Boot image to modify:"), val => \$o->{var}{IMGTOMODIFY}, list_ref => \@list_menu },
 				     ],
 			     post => \&read_option,
 			     no_back => 1,
@@ -169,21 +169,21 @@ $o->{pages} = {
 	       gomodify => {
 			    name => N("Add option to the PXE boot image") . "\n\n" . N("Server IP: IP address of the server, which contains installation directory. You can create one with Mandriva Linux install server wizard.") . "\n" . N("Install directory: the full path to Mandriva Linux install server directory") . "\n" . N("Installation method: choose NFS or HTTP."),
 			    data => [
-				     { label => N("Boot image to modify:"), fixed_val => \$o->{var}{i} },
+				     { label => N("Boot image to modify:"), val_ref => \$o->{var}{i} },
 				     { label => N("Server IP:"), val => \$o->{var}{IP} },
 				     { label => N("Install directory:"), val => \$o->{var}{DIR} },
-				     { label => N("Installation method:"), val => \$o->{var}{METHOD}, fixed_list => \@list_method },
+				     { label => N("Installation method:"), val => \$o->{var}{METHOD}, list_ref => \@list_method },
 				    ],
 			    next => 'gomodify2',
 			    },
 	       gomodify2 => {
 			     name => N("Network client interface: the network interface used for the installation process.") . "\n" . N("Ramsize: adjust the ramsize parameter on boot image.") . "\n" . N("VGA option: if you encounter any problem with VGA, please adjust. ") . "\n" . N("ACPI option: Advanced Configuration and Power Interface"),
 			     data => [
-				      { label => N("Network client interface:"), val => \$o->{var}{ETH}, fixed_list => \@list_eth },
-				      { label => N("Ramsize:"), val => \$o->{var}{RAM}, fixed_list => \@list_ram },
-				      { label => N("VGA option:"), val => \$o->{var}{VGA}, fixed_list => \@list_vga },
-				      { label => N("ACPI option:"), val => \$o->{var}{ACPI}, fixed_list => \@list_acpi },
-				      { label => N("APIC option:"), val => \$o->{var}{APIC}, fixed_list => \@list_apic },
+				      { label => N("Network client interface:"), val => \$o->{var}{ETH}, list_ref => \@list_eth },
+				      { label => N("Ramsize:"), val => \$o->{var}{RAM}, list_ref => \@list_ram },
+				      { label => N("VGA option:"), val => \$o->{var}{VGA}, list_ref => \@list_vga },
+				      { label => N("ACPI option:"), val => \$o->{var}{ACPI}, list_ref => \@list_acpi },
+				      { label => N("APIC option:"), val => \$o->{var}{APIC}, list_ref => \@list_apic },
 				      { label => N("Custom option:"), val => \$o->{var}{OPTION} },
 				     ],
 			     next => 'summarymodify',
@@ -236,10 +236,10 @@ $o->{pages} = {
 	       summaryserver => {
 				 name => N("The wizard will now prepare all default files to set your PXE server"),
 				 data => [
-					  { label => N("TFTP directory:"), fixed_val => \$TFTPDIR },
-					  { label => N("Boot image path:"), fixed_val => \$IMGPATH },
-					  { label => N("PXE 'default' file:"), fixed_val => \$PXEDEFAULT },
-					  { label => N("PXE 'help' file:"), fixed_val => \$PXEHELP },
+					  { label => N("TFTP directory:"), val_ref => \$TFTPDIR },
+					  { label => N("Boot image path:"), val_ref => \$IMGPATH },
+					  { label => N("PXE 'default' file:"), val_ref => \$PXEDEFAULT },
+					  { label => N("PXE 'help' file:"), val_ref => \$PXEHELP },
 					 ],
 				 post => \&do_it_pxe,
 				 next => 'endserver',
@@ -247,16 +247,16 @@ $o->{pages} = {
 	       summarymodify => {
 				 name => N("The wizard will now modify boot options with those parameters:"),
 				 data => [
-					  { label => N("Boot image to modify:"), fixed_val => \$o->{var}{i} },
-					  { label => N("Server IP:"), fixed_val => \$o->{var}{IP} },
-					  { label => N("Install directory:"), fixed_val => \$o->{var}{DIR} },
-					  { label => N("Installation method:"), fixed_val => \$o->{var}{METHOD} },
-					  { label => N("Network client interface:"), fixed_val => \$o->{var}{ETH} },
-					  { label => N("Ramsize:"), fixed_val => \$o->{var}{RAM} },
-					  { label => N("VGA option:"), fixed_val => \$o->{var}{VGA} },
-					  { label => N("ACPI option:"), fixed_val => \$o->{var}{ACPI} },
-					  { label => N("APIC option:"), fixed_val => \$o->{var}{APIC} },
-					  { label => N("Custom option:"), fixed_val => \$o->{var}{OPTION} },
+					  { label => N("Boot image to modify:"), val_ref => \$o->{var}{i} },
+					  { label => N("Server IP:"), val_ref => \$o->{var}{IP} },
+					  { label => N("Install directory:"), val_ref => \$o->{var}{DIR} },
+					  { label => N("Installation method:"), val_ref => \$o->{var}{METHOD} },
+					  { label => N("Network client interface:"), val_ref => \$o->{var}{ETH} },
+					  { label => N("Ramsize:"), val_ref => \$o->{var}{RAM} },
+					  { label => N("VGA option:"), val_ref => \$o->{var}{VGA} },
+					  { label => N("ACPI option:"), val_ref => \$o->{var}{ACPI} },
+					  { label => N("APIC option:"), val_ref => \$o->{var}{APIC} },
+					  { label => N("Custom option:"), val_ref => \$o->{var}{OPTION} },
 					 ],
 				 post => \&do_it_modify,
 				 next => 'endmodify',
@@ -264,7 +264,7 @@ $o->{pages} = {
 	       summaryremove => {
 				 name => N("The wizard will now remove this PXE boot image"),
 				 data => [
-					  { label => N("PXE entry to remove:"), fixed_val => \$o->{var}{IMGTOREMOVE} },
+					  { label => N("PXE entry to remove:"), val_ref => \$o->{var}{IMGTOREMOVE} },
 					 ],
 				 no_back => 1,
 				 post => \&do_it_remove,
@@ -273,9 +273,9 @@ $o->{pages} = {
 	       summaryadd => {
 			      name => N("The wizard will now add this PXE boot image"),
 				 data => [
-					  { label => "PXE name:", fixed_val => \$o->{var}{PXENAME} },
-					  { label => "PXE description:", fixed_val => \$o->{var}{DESCR} },
-					  { label => "Path to boot image:", fixed_val => \$o->{var}{IMG} },
+					  { label => "PXE name:", val_ref => \$o->{var}{PXENAME} },
+					  { label => "PXE description:", val_ref => \$o->{var}{DESCR} },
+					  { label => "Path to boot image:", val_ref => \$o->{var}{IMG} },
 					 ],
 			      post => \&do_it_add,
 			      next => 'endadd',
@@ -283,10 +283,10 @@ $o->{pages} = {
 	       summaryaddrdz => {
 			      name => N("The wizard will now add this PXE boot image"),
 				 data => [
-					  { label => "PXE name:", fixed_val => \$o->{var}{PXENAME} },
-					  { label => "PXE description:", fixed_val => \$o->{var}{DESCR} },
-					  { label => "Full path to all.rdz image:", fixed_val => \$o->{var}{ALLRDZ} },
-					  { label => "Full path to vmlinuz:", fixed_val => \$o->{var}{VMLINUZ} },
+					  { label => "PXE name:", val_ref => \$o->{var}{PXENAME} },
+					  { label => "PXE description:", val_ref => \$o->{var}{DESCR} },
+					  { label => "Full path to all.rdz image:", val_ref => \$o->{var}{ALLRDZ} },
+					  { label => "Full path to vmlinuz:", val_ref => \$o->{var}{VMLINUZ} },
 					 ],
 			      post => \&do_it_addrdz,
 			      next => 'endadd',
diff --git a/samba_wizard/Samba.pm b/samba_wizard/Samba.pm
index d665b980..ad35c822 100755
--- a/samba_wizard/Samba.pm
+++ b/samba_wizard/Samba.pm
@@ -141,12 +141,12 @@ $o->{pages} = {
 #			 $o->{var}{wiz_passdb_backend_yn} =~ /yes/ and return 'ldap_conf';
 #		       },
 		       data => [
-				{ label => N("Domain logons:"), fixed_val => \$o->{var}{wiz_domain_logons} },
-				{ label => N("Domain master:"), fixed_val => \$o->{var}{wiz_domain_master} },
-				{ label => N("Security:"), fixed_val => \$o->{var}{wiz_security} },
+				{ label => N("Domain logons:"), val_ref => \$o->{var}{wiz_domain_logons} },
+				{ label => N("Domain master:"), val_ref => \$o->{var}{wiz_domain_master} },
+				{ label => N("Security:"), val_ref => \$o->{var}{wiz_security} },
 				{ label => N("Wins support:"), val => \$o->{var}{wiz_wins_support}, fixed_list => \@yesorno },
 				{ label => N("admin users:"), val => \$o->{var}{wiz_admin_users}, help => N("root \@adm") },
-				{ label => N("Os level:"), fixed_val => \$o->{var}{wiz_oslevel}, help => N("The global os level option dictates the operating system level at which Samba will masquerade during a browser election. If you wish to have Samba win an election and become the master browser, you can set the level above that of the operating system on your network with the highest current value. ie: os level = 34") },
+				{ label => N("Os level:"), val_ref => \$o->{var}{wiz_oslevel}, help => N("The global os level option dictates the operating system level at which Samba will masquerade during a browser election. If you wish to have Samba win an election and become the master browser, you can set the level above that of the operating system on your network with the highest current value. ie: os level = 34") },
 #				{ label => N("Use LDAP Passdb backend"), val => \$o->{var}{wiz_passdb_backend_yn}, fixed_list => \@yesorno },
 			       ],
 		       complete => sub {
@@ -190,13 +190,13 @@ $o->{pages} = {
 	       ask_bdc2 => {
 			    name => N("BDC server: needed fixed options"),
 			    data => [
-				     { label => N("Domain master:"), fixed_val => \$o->{var}{wiz_domain_master} },
-				     { label => N("Security:"), fixed_val => \$o->{var}{wiz_security} },
-				     { label => N("Os level:"), fixed_val => \$o->{var}{wiz_oslevel} },
-				     { label => N("Local master:"), fixed_val => \$o->{var}{wiz_local_master} },
-				     { label => N("Domain master"), fixed_val => \$o->{var}{wiz_domain_master} },
-				     { label => N("Preferred master"), fixed_val => \$o->{var}{wiz_preferred_master} },
-				     { label => N("Domain logons"), fixed_val => \$o->{var}{wiz_domain_logons} },
+				     { label => N("Domain master:"), val_ref => \$o->{var}{wiz_domain_master} },
+				     { label => N("Security:"), val_ref => \$o->{var}{wiz_security} },
+				     { label => N("Os level:"), val_ref => \$o->{var}{wiz_oslevel} },
+				     { label => N("Local master:"), val_ref => \$o->{var}{wiz_local_master} },
+				     { label => N("Domain master"), val_ref => \$o->{var}{wiz_domain_master} },
+				     { label => N("Preferred master"), val_ref => \$o->{var}{wiz_preferred_master} },
+				     { label => N("Domain logons"), val_ref => \$o->{var}{wiz_domain_logons} },
 				     { label => N("admin users:"), val => \$o->{var}{wiz_admin_users}, help => N("root \@adm") },
 				    ],
 			    next => 'ldap_conf',
@@ -219,8 +219,8 @@ $o->{pages} = {
 			  data => [
 				   { label => N("Password server"), hidden => 1, val => \$o->{var}{wiz_password_server} },
 				   { label => N("Use LDAP Passdb backend"), val => \$o->{var}{wiz_passdb_backend_yn}, fixed_list => \@yesorno },
-				   { label => N("Security:"), fixed_val => \$o->{var}{wiz_security} },
-				   { label => N("Domain master:"), fixed_val => \$o->{var}{wiz_domain_master} },
+				   { label => N("Security:"), val_ref => \$o->{var}{wiz_security} },
+				   { label => N("Domain master:"), val_ref => \$o->{var}{wiz_domain_master} },
 
 				  ],
 			  complete => sub {
@@ -339,10 +339,10 @@ $o->{pages} = {
 			     $o->{var}{wiz_sambatype} = $type{$o->{var}{wiz_type}};
 			   },
 			   data => [
-				    { label => N("Samba type:"), fixed_val => \$o->{var}{wiz_sambatype} },
-				    { label => N("Workgroup:"), fixed_val => \$o->{var}{wiz_workgroup} },
-				    { label => N("Server banner:"), fixed_val => \$o->{var}{wiz_banner} },
-				    { label => N("Log file:"), fixed_val => \$o->{var}{wiz_log_file} },
+				    { label => N("Samba type:"), val_ref => \$o->{var}{wiz_sambatype} },
+				    { label => N("Workgroup:"), val_ref => \$o->{var}{wiz_workgroup} },
+				    { label => N("Server banner:"), val_ref => \$o->{var}{wiz_banner} },
+				    { label => N("Log file:"), val_ref => \$o->{var}{wiz_log_file} },
 				   ],
 			   post => \&do_it,
 			   next => 'end'
diff --git a/samba_wizard/Sambaprint.pm b/samba_wizard/Sambaprint.pm
index 8a6c5df3..b0821be0 100755
--- a/samba_wizard/Sambaprint.pm
+++ b/samba_wizard/Sambaprint.pm
@@ -129,10 +129,10 @@ $o->{pages} = {
 			     $o->{var}{wiz_sambatype} = $cprint{$o->{var}{wiz_type}};
 			   },
 			   data => [
-				    { label => N("Comment:"), fixed_val => \$o->{var}{wiz_printers_comment} },
-				    { label => N("Create mode:"), fixed_val => \$o->{var}{wiz_printers_createmode} },
-				    { label => N("Browseable:"), fixed_val => \$o->{var}{wiz_printers_browseable} },
-				    { label => N("Guest ok:"), fixed_val => \$o->{var}{wiz_printers_guestok} },
+				    { label => N("Comment:"), val_ref => \$o->{var}{wiz_printers_comment} },
+				    { label => N("Create mode:"), val_ref => \$o->{var}{wiz_printers_createmode} },
+				    { label => N("Browseable:"), val_ref => \$o->{var}{wiz_printers_browseable} },
+				    { label => N("Guest ok:"), val_ref => \$o->{var}{wiz_printers_guestok} },
 				   ],
 			   post => \&do_it,
 			   next => 'end',
diff --git a/samba_wizard/Sambashare.pm b/samba_wizard/Sambashare.pm
index 694581a7..5b262dbb 100755
--- a/samba_wizard/Sambashare.pm
+++ b/samba_wizard/Sambashare.pm
@@ -172,7 +172,7 @@ $o->{pages} = {
 					  name => N("Delete which share?") . "\n\n" . N("Please choose the share you want to remove."),
 					  pre => \&list_all_shares,
 					  data => [
-						   { label => '', type => 'list', val => \$o->{var}{wiz_selected_share}, fixed_list => \@listshare },
+						   { label => '', type => 'list', val => \$o->{var}{wiz_selected_share}, list_ref => \@listshare },
 						  ],
 					  next => 'summary_delete',
 					 },
@@ -180,7 +180,7 @@ $o->{pages} = {
 					  name => N("Modify which share?") . "\n\n" . N("Please choose the share you want to modify."),
 					  pre => \&list_all_shares_to_modify,
 					  data => [
-                                                   { label => '', type => 'list', val => \$o->{var}{wiz_selected_share}, fixed_list => \@listshare_tomodify },
+                                                   { label => '', type => 'list', val => \$o->{var}{wiz_selected_share}, list_ref => \@listshare_tomodify },
                                                   ],
 					  post => sub { if ($o->{var}{wiz_selected_share} eq 'homes') { return 'modify_homes_share' }
 						      },
@@ -198,8 +198,8 @@ $o->{pages} = {
 				      },
 				      data => [
 					       { label => N("Comment:"), val => \$o->{var}{wiz_homes_comment}, help => N("This is a text field that is seen next to a share when a client does a queries the server") },
-					       { label => N("Writable:"), val => \$o->{var}{wiz_homes_writable}, fixed_list => \@yesorno },
-					       { label => N("Browseable:"), val => \$o->{var}{wiz_homes_browseable}, fixed_list => \@yesorno },
+					       { label => N("Writable:"), val => \$o->{var}{wiz_homes_writable}, list_ref => \@yesorno },
+					       { label => N("Browseable:"), val => \$o->{var}{wiz_homes_browseable}, list_ref => \@yesorno },
 					       { label => N("Create mode:"), val => \$o->{var}{wiz_homes_create_mode} },
 					       { label => N("Create mask:"), val => \$o->{var}{wiz_homes_create_mask} },
 					       { label => N("Directory mask:"), val => \$o->{var}{wiz_homes_directory_mask} },
@@ -244,12 +244,12 @@ $o->{pages} = {
 				  }
 				},
 				data => [
-					 { label => N("Name of the share:"), fixed_val => \$o->{var}{wiz_selected_share} },
+					 { label => N("Name of the share:"), val_ref => \$o->{var}{wiz_selected_share} },
 					 { label => N("Comment:"), val => \$o->{var}{wiz_share_comment}, help => N("This is a text field that is seen next to a share when a client does a queries the server") },
 					 { label => N("Path:"), val => \$o->{var}{wiz_share_path} },
-					 { label => N("Browseable:"), val => \$o->{var}{wiz_share_browseable}, fixed_list => \@yesorno, help => N("Allows share to be displayed in list of share.") },
-					 { label => N("Writable:"), val => \$o->{var}{wiz_share_writable}, fixed_list => \@yesorno, help => ('Inverted synonym for read only.') },
-					 { label => N("Public:"), val => \$o->{var}{wiz_share_public}, fixed_list => \@yesorno },
+					 { label => N("Browseable:"), val => \$o->{var}{wiz_share_browseable}, list_ref => \@yesorno, help => N("Allows share to be displayed in list of share.") },
+					 { label => N("Writable:"), val => \$o->{var}{wiz_share_writable}, list_ref => \@yesorno, help => ('Inverted synonym for read only.') },
+					 { label => N("Public:"), val => \$o->{var}{wiz_share_public}, list_ref => \@yesorno },
 					],
 				no_back => 1,
 				next => 'modify_share_options',
@@ -273,7 +273,7 @@ $o->{pages} = {
 						 { label => N("valid users"), val => \$o->{var}{wiz_share_valid_users}, help => N("To restrict the share to a particular user. If this is empty (the default) then any user  can  login. ie: guibo") },
 						 { label => N("admin users"), val => \$o->{var}{wiz_share_admin_users}, help => N("This is a list of users who will be granted administrative privileges on the share. This means that they will do all file operations as the super-user (root). You  should  use this option very carefully, as any user in this list will be able to do anything they like on the share, irrespective of file permissions.") },
 						 { label => N("Hide files:"), val => \$o->{var}{wiz_share_hidefiles}, help => N("The hide files option provides one or more directory or filename patterns to Samba. Any file matching this pattern will be treated as a hidden file from the perspective of the client. ie: /.icewm/") },
-						 { label => N("Hide dot files:"), val => \$o->{var}{wiz_share_dotfiles}, fixed_list => \@yesorno, help => N("The hide dot files option hides any files on the server that begin with a dot (.)") },
+						 { label => N("Hide dot files:"), val => \$o->{var}{wiz_share_dotfiles}, list_ref => \@yesorno, help => N("The hide dot files option hides any files on the server that begin with a dot (.)") },
 						],
 					complete => sub {
 					  map { my @users = split(" ", $_);
@@ -306,8 +306,8 @@ $o->{pages} = {
 						  { label => N("force create mode"), val => \$o->{var}{wiz_share_force_create_mode}, help => N("This parameter specifies a set of UNIX mode bit permissions that will always be set on a file created by Samba. This is done by bitwise \'OR\'ing these bits onto the mode bits of a file that is being created or having its permissions changed. The default for this parameter is (in octal) 000. ie: force create mode = 0700 ") },
 						  { label => N("force directory mode"), val => \$o->{var}{wiz_share_force_directory_mode}, help => N("This parameter specifies a set of UNIX mode bit permissions that will always be set on a directory created by Samba. This is done by bitwise \'OR\'ing these bits onto the mode bits of a directory that is being created. The default for this parameter is (in octal) 0000 which will not add any extra permission bits to a created directory. ie: force directory mode = 0755") },
 						  { label => N("force group"), val => \$o->{var}{wiz_share_force_group}, help => N("This specifies a UNIX group name that will be assigned as the default primary group for all users connecting to this service. This is useful for sharing files by ensuring that all access to files on service will use the named group for their permissions checking. ie: force group = agroup") },
-						  { label => N("default case"), val => \$o->{var}{wiz_share_default_case}, fixed_list => \@scase, help => N("lower or upper") },
-						  { label => N("preserve case"), val => \$o->{var}{wiz_share_preserve_case}, fixed_list => \@yesorno, help => N("This controls if new filenames are created with the case that the client passes, or if they are forced to be the default case") },
+						  { label => N("default case"), val => \$o->{var}{wiz_share_default_case}, list_ref => \@scase, help => N("lower or upper") },
+						  { label => N("preserve case"), val => \$o->{var}{wiz_share_preserve_case}, list_ref => \@yesorno, help => N("This controls if new filenames are created with the case that the client passes, or if they are forced to be the default case") },
 						 ],
 					 complete => sub {
 					   map {
@@ -324,8 +324,8 @@ $o->{pages} = {
 				      { label => N("Name of the share:"), val => \$o->{var}{wiz_addshare_name} },
 				      { label => N("Comment:"), val => \$o->{var}{wiz_addshare_comment} },
 				      { label => N("Path:"), val => \$o->{var}{wiz_addshare_path} },
-				      { label => N("Browseable:"), val => \$o->{var}{wiz_addshare_browseable}, fixed_list => \@yesorno, help => N("Allows share to be displayed in list of share.") },
-				      { label => N("Public:"), val => \$o->{var}{wiz_addshare_public}, fixed_list => \@yesorno },
+				      { label => N("Browseable:"), val => \$o->{var}{wiz_addshare_browseable}, list_ref => \@yesorno, help => N("Allows share to be displayed in list of share.") },
+				      { label => N("Public:"), val => \$o->{var}{wiz_addshare_public}, list_ref => \@yesorno },
 				     ],
 			     complete => sub {
 			       foreach my $clef (keys %$samba) {
@@ -367,12 +367,12 @@ $o->{pages} = {
 				     $o->{var}{wiz_cdrom_public} = "yes";
 				   },
 				   data => [
-					 { label => N("Comment:"), fixed_val => \$o->{var}{wiz_cdrom_comment} },
-					 { label => N("CDrom path:"), fixed_val => \$o->{var}{wiz_cdrom_path} },
-					 { label => N("Browseable:"), fixed_val => \$o->{var}{wiz_cdrom_browseable} },
-					 { label => N("Root preexec:"), fixed_val => \$o->{var}{wiz_cdrom_pre} },
-					 { label => N("Root postexec:"), fixed_val => \$o->{var}{wiz_cdrom_post} },
-					 { label => N("Public:"), fixed_val => \$o->{var}{wiz_cdrom_public} },
+					 { label => N("Comment:"), val_ref => \$o->{var}{wiz_cdrom_comment} },
+					 { label => N("CDrom path:"), val_ref => \$o->{var}{wiz_cdrom_path} },
+					 { label => N("Browseable:"), val_ref => \$o->{var}{wiz_cdrom_browseable} },
+					 { label => N("Root preexec:"), val_ref => \$o->{var}{wiz_cdrom_pre} },
+					 { label => N("Root postexec:"), val_ref => \$o->{var}{wiz_cdrom_post} },
+					 { label => N("Public:"), val_ref => \$o->{var}{wiz_cdrom_public} },
 					],
 				   next => 'summary_addcdromshare',
 				  },
@@ -434,8 +434,8 @@ $o->{pages} = {
 					     { label => N("Name of the share:"), val => \$o->{var}{wiz_add_public_share_name} },
 					     { label => N("Comment:"), val => \$o->{var}{wiz_add_public_share_comment} },
 					     { label => N("Path:"), val => \$o->{var}{wiz_add_public_share_path} },
-					     { label => N("Writable:"), val => \$o->{var}{wiz_add_public_share_writable}, fixed_list => \@yesorno },
-					     { label => N("Public:"), fixed_val => \$o->{var}{wiz_add_public_share_public} },
+					     { label => N("Writable:"), val => \$o->{var}{wiz_add_public_share_writable}, list_ref => \@yesorno },
+					     { label => N("Public:"), val_ref => \$o->{var}{wiz_add_public_share_public} },
 
 					    ],
 				    complete => sub {
@@ -470,12 +470,12 @@ $o->{pages} = {
 				       $o->{var}{wiz_addshare_directorymask} = "775";
 				     },
 				     data => [
-					      { label => N("Writable:"), val => \$o->{var}{wiz_addshare_writable}, fixed_list => \@yesorno },
+					      { label => N("Writable:"), val => \$o->{var}{wiz_addshare_writable}, list_ref => \@yesorno },
 #					      { label => N("Create mask:"), val => \$o->{var}{wiz_addshare_createmask} },
 					      { label => N("Read list:"), val => \$o->{var}{wiz_addshare_readlist}, help => N("Specifies a list \of users that have read-only access to a writable share. ie: aginies") },
 					      { label => N("Write list:"), val => \$o->{var}{wiz_addshare_writelist}, help => N("Specifies a user that have read-write access to a share. ie: guibo") },
 					      { label => N("User own directory:"), type => 'bool', val => \$o->{var}{wiz_owner} },
-					      { label => N("Hide dot files:"), val => \$o->{var}{wiz_addshare_dotfiles}, fixed_list => \@yesorno, help => N("The hide dot files option hides any files on the server that begin with a dot (.)") },
+					      { label => N("Hide dot files:"), val => \$o->{var}{wiz_addshare_dotfiles}, list_ref => \@yesorno, help => N("The hide dot files option hides any files on the server that begin with a dot (.)") },
 					      { label => N("Hide files:"), val => \$o->{var}{wiz_addshare_hidefiles}, help => N("The hide files option provides one or more directory or filename patterns to Samba. Any file matching this pattern will be treated as a hidden file from the perspective of the client. ie: /.icewm/") },
 					     ],
 				     complete => sub {
@@ -511,8 +511,8 @@ $o->{pages} = {
 			     },
 			     data => [
 				      { label => N("Comment:"), val => \$o->{var}{wiz_home_comment} },
-				      { label => N("Browseable:"), val => \$o->{var}{wiz_home_browseable}, fixed_list => \@yesorno },
-				      { label => N("Writable:"), val => \$o->{var}{wiz_home_writable}, fixed_list => \@yesorno },
+				      { label => N("Browseable:"), val => \$o->{var}{wiz_home_browseable}, list_ref => \@yesorno },
+				      { label => N("Writable:"), val => \$o->{var}{wiz_home_writable}, list_ref => \@yesorno },
 #				      { label => N("Create mode:"), val => \$o->{var}{wiz_home_createmode} },
 				     ],
 			     next => 'summary_homeshare',
@@ -532,10 +532,10 @@ $o->{pages} = {
 				  $o->{var}{wiz_profiles_writable} = "yes";
 				},
 				data => [
-					 { label => N("Path:"), fixed_val => \$o->{var}{wiz_profiles_path} },
-					 { label => N("Browseable:"), fixed_val => \$o->{var}{wiz_profiles_browseable} },
-					 { label => N("Guest access:"), fixed_val => \$o->{var}{wiz_profiles_guest_ok} },
-					 { label => N("Writable:"), fixed_val => \$o->{var}{wiz_profiles_writable} },
+					 { label => N("Path:"), val_ref => \$o->{var}{wiz_profiles_path} },
+					 { label => N("Browseable:"), val_ref => \$o->{var}{wiz_profiles_browseable} },
+					 { label => N("Guest access:"), val_ref => \$o->{var}{wiz_profiles_guest_ok} },
+					 { label => N("Writable:"), val_ref => \$o->{var}{wiz_profiles_writable} },
 					],
 				next => 'end_add_profiles',
 				post => \&do_it_add_profiles,
@@ -544,21 +544,21 @@ $o->{pages} = {
 				     name => N("Summary add home share") . "\n\n" . N("If you really want to add this share, click the Next button or use the Back button."),
 				     post => \&do_it_add_homeshare,
 				     data => [
-					      { label => N("Comment:"), fixed_val => \$o->{var}{wiz_home_comment} },
-					      { label => N("Browseable:"), fixed_val => \$o->{var}{wiz_home_browseable}, },
-					      { label => N("Writable:"), fixed_val => \$o->{var}{wiz_home_writable}, },
-					      { label => N("Create mode:"), fixed_val => \$o->{var}{wiz_home_createmode} },
+					      { label => N("Comment:"), val_ref => \$o->{var}{wiz_home_comment} },
+					      { label => N("Browseable:"), val_ref => \$o->{var}{wiz_home_browseable}, },
+					      { label => N("Writable:"), val_ref => \$o->{var}{wiz_home_writable}, },
+					      { label => N("Create mode:"), val_ref => \$o->{var}{wiz_home_createmode} },
 					     ],
 				     next => 'end_add_share',
 				    },
 	       summary_modify => {
 				  name => N("Summary modify a share") . "\n\n" . N("If you really want to modify this share, click the Next button or use the Back button."),
 				  data => [
-					   { label => N("Name of the share:"), fixed_val => \$o->{var}{wiz_selected_share} },
-					   { label => N("Comment:"), fixed_val => \$o->{var}{wiz_share_comment} },
-					   { label => N("Browseable:"), fixed_val => \$o->{var}{wiz_share_browseable} },
-					   { label => N("Writable:"), fixed_val => \$o->{var}{wiz_share_writable} },
-					   { label => N("Public:"), fixed_val => \$o->{var}{wiz_share_public} },
+					   { label => N("Name of the share:"), val_ref => \$o->{var}{wiz_selected_share} },
+					   { label => N("Comment:"), val_ref => \$o->{var}{wiz_share_comment} },
+					   { label => N("Browseable:"), val_ref => \$o->{var}{wiz_share_browseable} },
+					   { label => N("Writable:"), val_ref => \$o->{var}{wiz_share_writable} },
+					   { label => N("Public:"), val_ref => \$o->{var}{wiz_share_public} },
 					  ],
 				  post => \&do_it_modify_share,
 				  next => 'end_modify_share',
@@ -567,12 +567,12 @@ $o->{pages} = {
 					 name => N("CDROM") . "\n\n" . N("If you really want to share a CDROM, click the Next button or use the Back button."),
 					 post => \&do_it_add_cdromshare,
 					 data => [
-						  { label => N("Comment:"), fixed_val => \$o->{var}{wiz_cdrom_comment} },
-						  { label => N("Cdrom path:"), fixed_val => \$o->{var}{wiz_cdrom_path} },
-						  { label => N("Browseable:"), fixed_val => \$o->{var}{wiz_cdrom_browseable} },
-						  { label => N("Root preexec:"), fixed_val => \$o->{var}{wiz_cdrom_pre} },
-						  { label => N("Root postexec:"), fixed_val => \$o->{var}{wiz_cdrom_post} },
-						  { label => N("Public:"), fixed_val => \$o->{var}{wiz_cdrom_public} },
+						  { label => N("Comment:"), val_ref => \$o->{var}{wiz_cdrom_comment} },
+						  { label => N("Cdrom path:"), val_ref => \$o->{var}{wiz_cdrom_path} },
+						  { label => N("Browseable:"), val_ref => \$o->{var}{wiz_cdrom_browseable} },
+						  { label => N("Root preexec:"), val_ref => \$o->{var}{wiz_cdrom_pre} },
+						  { label => N("Root postexec:"), val_ref => \$o->{var}{wiz_cdrom_post} },
+						  { label => N("Public:"), val_ref => \$o->{var}{wiz_cdrom_public} },
 						 ],
 					 next => 'end_add_share',
 					},
@@ -580,15 +580,15 @@ $o->{pages} = {
 				    name => N("Summary add share") . "\n\n" . N("If you really want to add this share, click the Next button or use the Back button."),
 				    post => \&do_it_add_share,
 				    data => [
-					     { label => N("Name of the share:"), fixed_val => \$o->{var}{wiz_addshare_name} },
-					     { label => N("Comment:"), fixed_val => \$o->{var}{wiz_addshare_comment} },
-					     { label => N("Browseable:"), fixed_val => \$o->{var}{wiz_addshare_browseable} },
-					     { label => N("Create mask:"), fixed_val => \$o->{var}{wiz_addshare_createmask} },
-					     { label => N("Writable:"), fixed_val => \$o->{var}{wiz_addshare_writable} },
-					     { label => N("Public:"), fixed_val => \$o->{var}{wiz_addshare_public} },
-					     { label => N("Read list:"), fixed_val => \$o->{var}{wiz_addshare_readlist} },
-					     { label => N("Write list:"), fixed_val => \$o->{var}{wiz_addshare_writelist} },
-					     { label => N("Hide dot files:"), fixed_val => \$o->{var}{wiz_addshare_dotfiles} },
+					     { label => N("Name of the share:"), val_ref => \$o->{var}{wiz_addshare_name} },
+					     { label => N("Comment:"), val_ref => \$o->{var}{wiz_addshare_comment} },
+					     { label => N("Browseable:"), val_ref => \$o->{var}{wiz_addshare_browseable} },
+					     { label => N("Create mask:"), val_ref => \$o->{var}{wiz_addshare_createmask} },
+					     { label => N("Writable:"), val_ref => \$o->{var}{wiz_addshare_writable} },
+					     { label => N("Public:"), val_ref => \$o->{var}{wiz_addshare_public} },
+					     { label => N("Read list:"), val_ref => \$o->{var}{wiz_addshare_readlist} },
+					     { label => N("Write list:"), val_ref => \$o->{var}{wiz_addshare_writelist} },
+					     { label => N("Hide dot files:"), val_ref => \$o->{var}{wiz_addshare_dotfiles} },
 					    ],
 				    next => 'end_add_share',
 				   },
@@ -599,8 +599,8 @@ $o->{pages} = {
 				    $o->{var}{wiz_selected_share_comment} = $samba->{$dshare}{comment};
 				  },
 				  data => [
-					   { label => N("Delete this share:"), fixed_val => \$o->{var}{wiz_selected_share} },
-					   { label => N("Comment for this share:"), fixed_val => \$o->{var}{wiz_selected_share_comment} },
+					   { label => N("Delete this share:"), val_ref => \$o->{var}{wiz_selected_share} },
+					   { label => N("Comment for this share:"), val_ref => \$o->{var}{wiz_selected_share_comment} },
 					  ],
 				  post => \&do_it_remove_share,
 				  next => 'end_delete_share',
@@ -609,12 +609,12 @@ $o->{pages} = {
 	       summary_modify_homes_share => {
 				     name => N("Summary of modify homes share"),
 				     data => [
-					      { label => N("Comment:"), fixed_val => \$o->{var}{wiz_homes_comment} },
-					      { label => N("Writable:"), fixed_val => \$o->{var}{wiz_homes_writable} },
-					      { label => N("Browseable:"), fixed_val => \$o->{var}{wiz_homes_browseable} },
-					      { label => N("Create mode:"), fixed_val => \$o->{var}{wiz_homes_create_mode} },
-					      { label => N("Create mask:"), fixed_val => \$o->{var}{wiz_homes_create_mask} },
-					      { label => N("Directory mask:"), fixed_val => \$o->{var}{wiz_homes_directory_mask} },
+					      { label => N("Comment:"), val_ref => \$o->{var}{wiz_homes_comment} },
+					      { label => N("Writable:"), val_ref => \$o->{var}{wiz_homes_writable} },
+					      { label => N("Browseable:"), val_ref => \$o->{var}{wiz_homes_browseable} },
+					      { label => N("Create mode:"), val_ref => \$o->{var}{wiz_homes_create_mode} },
+					      { label => N("Create mask:"), val_ref => \$o->{var}{wiz_homes_create_mask} },
+					      { label => N("Directory mask:"), val_ref => \$o->{var}{wiz_homes_directory_mask} },
 					     ],
 				     post => \&do_it_modify_homes_share,
 				     next => 'end_add_user_share',
@@ -622,10 +622,10 @@ $o->{pages} = {
  	       summary_add_user_share => {
 					  name => N("Summary of add a user share") . "\n\n" . N("If you really want to add this share, click the Next button or use the Back button."),
 					  data => [
-						   { label => N("Name of the share:"), fixed_val => \$o->{var}{wiz_add_user_share_name} },
-						   { label => N("Comment:"),  fixed_val => \$o->{var}{wiz_add_user_share_comment} },
-						   { label => N("Path:"),  fixed_val => \$o->{var}{wiz_add_user_share_path} },
-						   { label => N("Write list:"),  fixed_val => \$o->{var}{wiz_add_user_share_writelist} },
+						   { label => N("Name of the share:"), val_ref => \$o->{var}{wiz_add_user_share_name} },
+						   { label => N("Comment:"),  val_ref => \$o->{var}{wiz_add_user_share_comment} },
+						   { label => N("Path:"),  val_ref => \$o->{var}{wiz_add_user_share_path} },
+						   { label => N("Write list:"),  val_ref => \$o->{var}{wiz_add_user_share_writelist} },
 						  ],
 					  post => \&do_it_add_user_share,
 					  next => 'end_add_user_share',
@@ -636,8 +636,8 @@ $o->{pages} = {
 						     { label => N("Name of the share:"), val => \$o->{var}{wiz_add_public_share_name} },
 						     { label => N("Comment:"), val => \$o->{var}{wiz_add_public_share_comment} },
 						     { label => N("Path:"), val => \$o->{var}{wiz_add_public_share_path} },
-						     { label => N("Public:"), fixed_val => \$o->{var}{wiz_add_public_share_public} },
-						     { label => N("Writable:"), fixed_val => \$o->{var}{wiz_add_public_share_writable} },
+						     { label => N("Public:"), val_ref => \$o->{var}{wiz_add_public_share_public} },
+						     { label => N("Writable:"), val_ref => \$o->{var}{wiz_add_public_share_writable} },
 						    ],
 					    post => \&do_it_add_public_share,
 					    next => 'end_add_public_share',
diff --git a/time_wizard/Ntp.pm b/time_wizard/Ntp.pm
index 23d8929d..290a7ff9 100644
--- a/time_wizard/Ntp.pm
+++ b/time_wizard/Ntp.pm
@@ -108,7 +108,7 @@ $o->{pages} = {
 			@country = ref $country{$o->{var}{wiz_region}} ? @{$country{$o->{var}{wiz_region}}} : ()
 		  },
                   data => [
-		      { label => N("Choose a city:"), val => \$o->{var}{wiz_country}, fixed_list => \@country },
+		      { label => N("Choose a city:"), val => \$o->{var}{wiz_country}, list_ref => \@country },
 		      ],
 	          next => 'test_server'
 	      },
@@ -119,9 +119,9 @@ $o->{pages} = {
 		  },
 		  post => \&test,
 		  data => [
-		      { label => N("Primary time server:"), fixed_val => \$o->{var}{varserver1} },
-		      { label => N("Secondary time server:"), fixed_val => \$o->{var}{varserver2} },
-		      { label => N("Time zone:"), fixed_val => \$o->{var}{wiz_timezone} },
+		      { label => N("Primary time server:"), val_ref => \$o->{var}{varserver1} },
+		      { label => N("Secondary time server:"), val_ref => \$o->{var}{varserver2} },
+		      { label => N("Time zone:"), val_ref => \$o->{var}{wiz_timezone} },
 		      ],
 		      next => 'end'
 	      },
diff --git a/web_wizard/Apache.pm b/web_wizard/Apache.pm
index ce6f99d4..586c97f8 100755
--- a/web_wizard/Apache.pm
+++ b/web_wizard/Apache.pm
@@ -138,10 +138,10 @@ $o->{pages} = {
 			     $o->{var}{external} = $o->{var}{web_external} ? N("enabled") : N("disabled")
 			   },
 			   data => [
-				    { label => N("Intranet web server:"), fixed_val => \$o->{var}{internal} },
-				    { label => N("Internet web server:"), fixed_val => \$o->{var}{external} },
-				    { label => N("Document root:"), fixed_val => \$o->{var}{shared_dir} },
-				    { label => N("User directory:"), fixed_val => \$o->{var}{user_dir} },
+				    { label => N("Intranet web server:"), val_ref => \$o->{var}{internal} },
+				    { label => N("Internet web server:"), val_ref => \$o->{var}{external} },
+				    { label => N("Document root:"), val_ref => \$o->{var}{shared_dir} },
+				    { label => N("User directory:"), val_ref => \$o->{var}{user_dir} },
 				   ],
 			   post => \&do_it,
 			   next => 'end',