diff --git a/setup/applications.php b/setup/applications.php
index 238e9505c4..49e9386dbb 100644
--- a/setup/applications.php
+++ b/setup/applications.php
@@ -363,7 +363,7 @@
 		$setup_tpl->set_var('app_remove',lang('Remove'));
 		$setup_tpl->set_var('app_upgrade',lang('Upgrade'));
 		$setup_tpl->set_var('app_resolve',lang('Resolve'));
-		$setup_tpl->set_var('check','check.gif');
+		$setup_tpl->set_var('check','check.png');
 		$setup_tpl->set_var('install_all',lang('Install All'));
 		$setup_tpl->set_var('upgrade_all',lang('Upgrade All'));
 		$setup_tpl->set_var('remove_all',lang('Remove All'));
@@ -398,7 +398,7 @@
 						if (!$GLOBALS['phpgw_setup']->detection->check_app_tables($value['name']))
 						{
 							// App installed and enabled, but some tables are missing
-							$setup_tpl->set_var('instimg','table.gif');
+							$setup_tpl->set_var('instimg','table.png');
 							$setup_tpl->set_var('bg_color','FFCCAA');
 							$setup_tpl->set_var('instalt',lang('Not Completed'));
 							$setup_tpl->set_var('resolution','<a href="applications.php?resolve=' . $value['name'] . '&badinstall=True">' . lang('Potential Problem') . '</a>');
@@ -406,7 +406,7 @@
 						}
 						else
 						{
-							$setup_tpl->set_var('instimg','completed.gif');
+							$setup_tpl->set_var('instimg','completed.png');
 							$setup_tpl->set_var('instalt',lang('Completed'));
 							$setup_tpl->set_var('install','&nbsp;');
 							if($value['enabled'])
@@ -429,7 +429,7 @@
 						}
 						break;
 					case 'U':
-						$setup_tpl->set_var('instimg','incomplete.gif');
+						$setup_tpl->set_var('instimg','incomplete.png');
 						$setup_tpl->set_var('instalt',lang('Not Completed'));
 						if (!@$value['currentver'])
 						{
@@ -463,7 +463,7 @@
 						}
 						break;
 					case 'V':
-						$setup_tpl->set_var('instimg','incomplete.gif');
+						$setup_tpl->set_var('instimg','incomplete.png');
 						$setup_tpl->set_var('instalt',lang('Not Completed'));
 						$setup_tpl->set_var('install','&nbsp;');
 						$setup_tpl->set_var('remove','<input type="checkbox" name="remove[' . $value['name'] . ']">');
@@ -475,7 +475,7 @@
 						$setup_tpl->set_var('bg_color','FFCCCC');
 						$depstring = parsedep($value['depends']);
 						$depstring .= ')';
-						$setup_tpl->set_var('instimg','dep.gif');
+						$setup_tpl->set_var('instimg','dep.png');
 						$setup_tpl->set_var('instalt',lang('Dependency Failure'));
 						$setup_tpl->set_var('install','&nbsp;');
 						$setup_tpl->set_var('remove','&nbsp;');
@@ -487,7 +487,7 @@
 						$setup_tpl->set_var('bg_color','FFCCFF');
 						$depstring = parsedep($value['depends']);
 						$depstring .= ')';
-						$setup_tpl->set_var('instimg','dep.gif');
+						$setup_tpl->set_var('instimg','dep.png');
 						$setup_tpl->set_var('instalt',lang('Post-install Dependency Failure'));
 						$setup_tpl->set_var('install','&nbsp;');
 						$setup_tpl->set_var('remove','&nbsp;');
@@ -496,7 +496,7 @@
 						$status = lang('Post-install Dependency Failure') . ':' . $depstring . $value['status'];
 						break;
 					default:
-						$setup_tpl->set_var('instimg','incomplete.gif');
+						$setup_tpl->set_var('instimg','incomplete.png');
 						$setup_tpl->set_var('instalt',lang('Not Completed'));
 						$setup_tpl->set_var('install','&nbsp;');
 						$setup_tpl->set_var('remove','&nbsp;');
diff --git a/setup/doc/setup3-1.html b/setup/doc/setup3-1.html
index c694995df8..e12789e280 100644
--- a/setup/doc/setup3-1.html
+++ b/setup/doc/setup3-1.html
@@ -7,11 +7,11 @@
 NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.59"><LINK
 REL="HOME"
-TITLE="   phpGroupWare Setup III
+TITLE="   phpGroupWare Setup
   "
 HREF="setup3.html"><LINK
 REL="PREVIOUS"
-TITLE="   phpGroupWare Setup III
+TITLE="   phpGroupWare Setup
   "
 HREF="setup3.html"><LINK
 REL="NEXT"
@@ -31,7 +31,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->phpGroupWare Setup III</TH
+>phpGroupWare Setup</TH
 ></TR
 ><TR
 ><TD
@@ -785,7 +785,7 @@ HREF="setup3-2.html"
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->phpGroupWare Setup III</TD
+>phpGroupWare Setup</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
diff --git a/setup/doc/setup3-2.html b/setup/doc/setup3-2.html
index 4858a8d375..29b5f619bf 100644
--- a/setup/doc/setup3-2.html
+++ b/setup/doc/setup3-2.html
@@ -7,7 +7,7 @@
 NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.59"><LINK
 REL="HOME"
-TITLE="   phpGroupWare Setup III
+TITLE="   phpGroupWare Setup
   "
 HREF="setup3.html"><LINK
 REL="PREVIOUS"
@@ -31,7 +31,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->phpGroupWare Setup III</TH
+>phpGroupWare Setup</TH
 ></TR
 ><TR
 ><TD
@@ -220,4 +220,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
\ No newline at end of file
+>
diff --git a/setup/doc/setup3-3.html b/setup/doc/setup3-3.html
index ed12422586..49c8e58b04 100644
--- a/setup/doc/setup3-3.html
+++ b/setup/doc/setup3-3.html
@@ -7,7 +7,7 @@
 NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.59"><LINK
 REL="HOME"
-TITLE="   phpGroupWare Setup III
+TITLE="   phpGroupWare Setup
   "
 HREF="setup3.html"><LINK
 REL="PREVIOUS"
@@ -31,7 +31,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->phpGroupWare Setup III</TH
+>phpGroupWare Setup</TH
 ></TR
 ><TR
 ><TD
@@ -412,4 +412,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
\ No newline at end of file
+>
diff --git a/setup/doc/setup3-4.html b/setup/doc/setup3-4.html
index 012703b75e..1016f91d4f 100644
--- a/setup/doc/setup3-4.html
+++ b/setup/doc/setup3-4.html
@@ -7,7 +7,7 @@
 NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.59"><LINK
 REL="HOME"
-TITLE="   phpGroupWare Setup III
+TITLE="   phpGroupWare Setup
   "
 HREF="setup3.html"><LINK
 REL="PREVIOUS"
@@ -27,7 +27,7 @@ CELLSPACING="0"
 ><TH
 COLSPAN="3"
 ALIGN="center"
->phpGroupWare Setup III</TH
+>phpGroupWare Setup</TH
 ></TR
 ><TR
 ><TD
@@ -133,4 +133,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
\ No newline at end of file
+>
diff --git a/setup/doc/setup3.html b/setup/doc/setup3.html
index 0cd96ab6b8..2b91d63271 100644
--- a/setup/doc/setup3.html
+++ b/setup/doc/setup3.html
@@ -1,7 +1,7 @@
 <HTML
 ><HEAD
 ><TITLE
->   phpGroupWare Setup III
+>   phpGroupWare Setup
   </TITLE
 ><META
 NAME="GENERATOR"
@@ -20,7 +20,7 @@ CLASS="TITLEPAGE"
 CLASS="TITLE"
 ><A
 NAME="AEN2"
->phpGroupWare Setup III</A
+>phpGroupWare Setup</A
 ></H1
 ><H3
 CLASS="AUTHOR"
@@ -140,4 +140,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
\ No newline at end of file
+>
diff --git a/setup/doc/setup3.lyx b/setup/doc/setup3.lyx
index e1cc5353b1..d681b2b511 100644
--- a/setup/doc/setup3.lyx
+++ b/setup/doc/setup3.lyx
@@ -27,7 +27,7 @@
 
 \layout Title
 \added_space_top vfill \added_space_bottom vfill 
-phpGroupWare Setup III
+phpGroupWare Setup
 \layout Date
 
 June 18, 2001 
diff --git a/setup/doc/setup3.sgml b/setup/doc/setup3.sgml
index 9790059e35..de0fcbe5c1 100644
--- a/setup/doc/setup3.sgml
+++ b/setup/doc/setup3.sgml
@@ -8,7 +8,7 @@
   See http://www.lyx.org/ for more information -->
   <artheader>
    <title>
-   phpGroupWare Setup III
+   phpGroupWare Setup
   </title>
   <date>
    June 18, 2001 
diff --git a/setup/doc/setup3.txt b/setup/doc/setup3.txt
index ca2f9f22ba..b1c3cf35a8 100644
--- a/setup/doc/setup3.txt
+++ b/setup/doc/setup3.txt
@@ -1,6 +1,6 @@
 
 
-phpGroupWare Setup III
+phpGroupWare Setup
 
 June 18, 2001 
 
diff --git a/setup/index.php b/setup/index.php
index 7792f6e776..bf77c92b0a 100644
--- a/setup/index.php
+++ b/setup/index.php
@@ -152,8 +152,8 @@
 	
 	//$GLOBALS['phpgw_setup']->app_status();
 	$GLOBALS['phpgw_info']['server']['app_images'] = 'templates/default/images';
-	$incomplete = $GLOBALS['phpgw_info']['server']['app_images'] . '/incomplete.gif';
-	$completed  = $GLOBALS['phpgw_info']['server']['app_images'] . '/completed.gif';
+	$incomplete = $GLOBALS['phpgw_info']['server']['app_images'] . '/incomplete.png';
+	$completed  = $GLOBALS['phpgw_info']['server']['app_images'] . '/completed.png';
 
 	$setup_tpl->set_var('img_incomplete',$incomplete);
 	$setup_tpl->set_var('img_completed',$completed);
diff --git a/setup/schematoy.php b/setup/schematoy.php
index 67defe8ef6..7cf977893e 100644
--- a/setup/schematoy.php
+++ b/setup/schematoy.php
@@ -255,7 +255,7 @@
 				$GLOBALS['setup_tpl']->set_var('currentver',$value['currentver']);
 				$GLOBALS['setup_tpl']->set_var('bg_color',$bgcolor[$i]);
 
-				$GLOBALS['setup_tpl']->set_var('instimg','completed.gif');
+				$GLOBALS['setup_tpl']->set_var('instimg','completed.png');
 				$GLOBALS['setup_tpl']->set_var('instalt',lang('Completed'));
 				$GLOBALS['setup_tpl']->set_var('install','<input type="checkbox" name="install[' . $value['name'] . ']">');
 				$status = lang('OK') . ' - ' . $value['status'];
diff --git a/setup/templates/default/head.tpl b/setup/templates/default/head.tpl
index bc05cabd55..5210730646 100644
--- a/setup/templates/default/head.tpl
+++ b/setup/templates/default/head.tpl
@@ -14,7 +14,7 @@
   .link { color: #FFFFFF; } 
   -->
   </style>
-  <title>phpGroupWare {lang_setup} III {page_title}</title>
+  <title>phpGroupWare {lang_setup} {page_title}</title>
 </head>
 
 <body bgcolor="#FFFFFF">
@@ -22,7 +22,7 @@
 <table border="0" width="100%" cellspacing="0" cellpadding="2">
 <tr>
 	<td align="left" bgcolor="#4865F1">
-		&nbsp;<font color="#fefefe">phpGroupWare version {pgw_ver} {lang_setup} III{configdomain}</font>
+		&nbsp;<font color="#fefefe">phpGroupWare version {pgw_ver} {lang_setup} {configdomain}</font>
 	</td>
 	<td align="right" bgcolor="#4865F1">
 		{logoutbutton}