diff --git a/org.eclipse.e4.builder/builder/general/ant-test.xml b/org.eclipse.e4.builder/builder/general/ant-test.xml
index 717b6ed..9218bc1 100644
--- a/org.eclipse.e4.builder/builder/general/ant-test.xml
+++ b/org.eclipse.e4.builder/builder/general/ant-test.xml
@@ -1,8 +1,16 @@
-<project name="Build specific targets and properties" default="postSetup">
-	<property name="transformedRepoLocation" value="/shared/eclipse/e4/build/e4/downloads/drops/4.0.0/targets/helios-p2"/>
+<project name="Build specific targets and properties" default="testTransform">
+	<property name="builddate" value="20090924"/>
+	<property name="buildtime" value="1515"/>
+	<property name="wstBuildDir" value="I-3.2I-20090910052601"/>
+	
 	<property name="builder" value="/opt/pwebster/workspaces/e4/releng/org.eclipse.e4.builder/builder/general"/>
+	<property name="buildProperties" location="${builder}/build.properties"/>
+	<property file="${buildProperties}"/>
+	
+	<!--property name="transformedRepoLocation" value="/shared/eclipse/e4/build/e4/downloads/drops/4.0.0/targets/helios-p2"/-->
 
-	<target name="postSetup">
+	
+	<target name="testFixIbuild">
 		<unjar src="${transformedRepoLocation}-mirrored/content.jar" dest="${transformedRepoLocation}-mirrored"/>
 		<xslt style="${builder}/fix-ibuild.xsl" in="${transformedRepoLocation}-mirrored/content.xml" out="${transformedRepoLocation}-mirrored/out_content.xml">
 			<outputproperty name="method" value="xml"/>
@@ -13,4 +21,25 @@
 			basedir="${transformedRepoLocation}-mirrored"
 			update="true"/>
 	</target>
+	
+	<target name="testTransform">
+		<echo>${builddate}</echo>
+		<echo>${buildLabel}</echo>
+		<echo>${buildId}</echo>
+		<filter token="repbuildid" value="${buildLabel}"/>
+		<filter token="repmaindate" value="${repmaindate}"/>
+		<filter token="repbuilddate" value="${buildLabel}"/>
+		<filter token="repobuildsize" value="${repobuildsize}"/>
+		<filter token="timestamp" value="${timestamp}"/>
+		<filter token="buildType" value="${buildType}"/>
+		<filter token="buildId" value="${buildId}"/>
+		<filter token="buildLabel" value="${buildLabel}"/>
+		<filter token="eclipsep2Repo" value="${eclipsep2Repo}"/>
+		<filter token="emfp2Repo" value="${emfp2Repo}"/>
+		<filter token="gefp2Repo" value="${gefp2Repo}"/>
+		<filter token="wstp2Repo" value="${wstp2Repo}"/>
+		<filter token="wstBuildDir" value="${wstBuildDir}"/>
+		<delete file="${builder}/0.html"/>
+		<copy filtering="true" file="${builder}/../../templates/build.index.html" tofile="${builder}/0.html" />
+	</target>
 </project>
diff --git a/org.eclipse.e4.builder/builder/general/customTargets.xml b/org.eclipse.e4.builder/builder/general/customTargets.xml
index 87a079b..e45970d 100644
--- a/org.eclipse.e4.builder/builder/general/customTargets.xml
+++ b/org.eclipse.e4.builder/builder/general/customTargets.xml
@@ -216,11 +216,12 @@
 		<filter token="buildId" value="${buildId}"/>
 		<filter token="buildLabel" value="${buildLabel}"/>
 		<filter token="eclipseIbuild" value="${eclipseBuildId}"/>
-		<filter token="eclipseBaseURL" value="${eclipseBaseURL}"/>
-		<filter token="emfBaseURL" value="${emfBaseURL}"/>
 		<filter token="emfBuildId" value="${emfBuildId}"/>
-		<filter token="gefBaseURL" value="${gefBaseURL}"/>
-		<filter token="wstBaseURL" value="${wstBaseURL}"/>
+		<filter token="eclipsep2Repo" value="${eclipsep2Repo}"/>
+		<filter token="emfp2Repo" value="${emfp2Repo}"/>
+		<filter token="gefp2Repo" value="${gefp2Repo}"/>
+		<filter token="wstp2Repo" value="${wstp2Repo}"/>
+		<filter token="wstBuildDir" value="${wstBuildDir}"/>
 		<copy filtering="true" file="${builder}/../../templates/build.index.html" tofile="${buildDirectory}/${buildLabel}/index.html" />
 		<copy filtering="true" file="${builder}/tests/build.label.properties" tofile="${buildDirectory}/label.properties" />
 
diff --git a/org.eclipse.e4.builder/templates/build.index.html b/org.eclipse.e4.builder/templates/build.index.html
index b432b4d..5a8ed12 100644
--- a/org.eclipse.e4.builder/templates/build.index.html
+++ b/org.eclipse.e4.builder/templates/build.index.html
@@ -54,28 +54,28 @@
 			  <p>
 			  A list of pre-requisite components that you need to run e4.  If you install
 			  e4 from the update site, the pre-requisites will be installed automatically:<br />
-			  E4 runs on the Eclipse SDK <a href="@eclipseBaseURL@">@eclipseIbuild@</a> or 
+			  E4 runs on the Eclipse SDK <a href="@eclipsep2Repo@">@eclipseIbuild@</a> or 
 			  <a href="http://download.eclipse.org/eclipse/downloads/">compatible</a>.
 			  </p>
-			  <p><b>Resources</b> - Eclipse SDK <a href="@eclipseBaseURL@">@eclipseIbuild@</a></p>
+			  <p><b>Resources</b> - Eclipse SDK <a href="@eclipsep2Repo@">@eclipseIbuild@</a></p>
 			  <p><b>Modeled UI and CSS</b>
 			  <ul>
-			    <li>Eclipse SDK <a href="@eclipseBaseURL@">@eclipseIbuild@</a></li>
-			    <li>EMF runtime <a href="@emfBaseURL@">@emfBuildId@</a></li>
+			    <li>Eclipse SDK <a href="@eclipsep2Repo@">@eclipseIbuild@</a></li>
+			    <li>EMF runtime <a href="@emfp2Repo@">@emfBuildId@</a></li>
 			  </ul></p>
 			  <p><b>XWT and Tools</b>
 			  <ul>
-			    <li>Eclipse SDK <a href="@eclipseBaseURL@">@eclipseIbuild@</a></li>
-			    <li>EMF runtime <a href="@emfBaseURL@">@emfBuildId@</a></li>
-			    <li>XSD runtime <a href="@emfBaseURL@">@emfBuildId@</a></li>
-			    <li>GEF SDK <a href="@gefBaseURL@">R200906221200</a></li>
-			    <li>WST SDK <a href="@wstBaseURL@">R-3.1-20090616035105</a></li>
+			    <li>Eclipse SDK <a href="@eclipsep2Repo@">@eclipseIbuild@</a></li>
+			    <li>EMF runtime <a href="@emfp2Repo@">@emfBuildId@</a></li>
+			    <li>XSD runtime <a href="@emfp2Repo@">@emfBuildId@</a></li>
+			    <li>GEF SDK <a href="@gefp2Repo@">@gefBuildId@</a></li>
+			    <li>WST SDK <a href="@wstp2Repo@">@wstBuildDir@</a></li>
 			  </ul></p>
 			  <p><b>Toolkit Model</b>
 			  <ul>
-			    <li>Eclipse SDK <a href="@eclipseBaseURL@">@eclipseIbuild@</a></li>
-			    <li>EMF runtime <a href="@emfBaseURL@">@emfBuildId@</a></li>
-			    <li>XSD runtime <a href="@emfBaseURL@">@emfBuildId@</a></li>
+			    <li>Eclipse SDK <a href="@eclipsep2Repo@">@eclipseIbuild@</a></li>
+			    <li>EMF runtime <a href="@emfp2Repo@">@emfBuildId@</a></li>
+			    <li>XSD runtime <a href="@emfp2Repo@">@emfBuildId@</a></li>
 			  </ul></p>
 			  </td>
 			</tr>
@@ -128,14 +128,6 @@
 </tr>
 
 <tr><td><div align="left"><img src = "OK.gif" width="19" height="23" /></div></td>
-
-<td>All (<a href="http://www.eclipse.org/e4/development/readme/readme_e4_0.9.html#TargetOperatingEnvironments">Supported Versions</a>)</td>
-<td><div align="left" id="repdownloadlink"><a href="download.php?dropFile=org.eclipse.swt.e4.flex-incubation-@repbuilddate@.zip">(http)</a>&nbsp;&nbsp;</div></td>
-<td id="repdownloadsize">N/A</td>
-<td id="repdownloadlabel">org.eclipse.swt.e4.flex-incubation-@repbuilddate@.zip</td><td>use: import existing projects into workspace</td>
-</tr>
-
-<tr><td><div align="left"><img src = "OK.gif" width="19" height="23" /></div></td>
 <td>win32 (<a href="http://www.eclipse.org/e4/development/readme/readme_e4_0.9.html#TargetOperatingEnvironments">Supported Versions</a>)</td>
 <td><div align="left" id="repdownloadlink"><a href="download.php?dropFile=eclipse-e4-SDK-incubation-@repbuilddate@-win32.zip">(http)</a>&nbsp;&nbsp;</div></td>
 <td id="repdownloadsize">204M</td>