diff --git a/bin/Prebuild.exe b/bin/Prebuild.exe
index 6d259f01..377ab92b 100644
Binary files a/bin/Prebuild.exe and b/bin/Prebuild.exe differ
diff --git a/prebuild.xml b/prebuild.xml
index e9f29856..9c4158ec 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -31,9 +31,9 @@
         <NoStdLib>false</NoStdLib>
       </Options>
     </Configuration>
-    
-	<!-- Libraries -->
-	
+
+    <!-- Libraries -->
+
     <Project name="OpenMetaverse" path="OpenMetaverse" type="Library" rootNamespace="OpenMetaverse">
       <Configuration name="Debug">
         <Options>
@@ -42,8 +42,8 @@
       </Configuration>
       <Configuration name="Release">
         <Options>
-	<OutputPath>../bin/</OutputPath>
-	<XmlDocFile>OpenMetaverse.XML</XmlDocFile>
+          <OutputPath>../bin/</OutputPath>
+          <XmlDocFile>OpenMetaverse.XML</XmlDocFile>
         </Options>
       </Configuration>
 
@@ -66,8 +66,8 @@
       </Configuration>
       <Configuration name="Release">
         <Options>
-	<OutputPath>../bin/</OutputPath>
-	<XmlDocFile>OpenMetaverse.Utilities.XML</XmlDocFile>
+          <OutputPath>../bin/</OutputPath>
+          <XmlDocFile>OpenMetaverse.Utilities.XML</XmlDocFile>
         </Options>
       </Configuration>
 
@@ -103,7 +103,7 @@
         <Match pattern="*.cs" recurse="true"/>
       </Files>
     </Project>
-    
+
     <Project name="GridProxy" path="Programs/GridProxy" type="Library">
       <Configuration name="Debug">
         <Options>
@@ -128,7 +128,7 @@
         <Match pattern="XmlRpcCS/*.cs" recurse="true"/>
       </Files>
     </Project>
-    
+
     <Project name="OpenMetaverse.Rendering.Simple" path="OpenMetaverse.Rendering.Simple" type="Library">
       <Configuration name="Debug">
         <Options>
@@ -148,7 +148,7 @@
         <Match pattern="*.cs" recurse="true"/>
       </Files>
     </Project>
-    
+
     <Project name="OpenMetaverse.Rendering.GPL" path="OpenMetaverse.Rendering.GPL" type="Library">
       <Configuration name="Debug">
         <Options>
@@ -168,10 +168,10 @@
         <Match pattern="*.cs" recurse="true"/>
       </Files>
     </Project>
-    
-	<!-- Programs -->
-	
-	<Project name="AvatarPreview" path="Programs/AvatarPreview" type="WinExe">
+
+    <!-- Programs -->
+
+    <Project name="AvatarPreview" path="Programs/AvatarPreview" type="WinExe">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../bin/</OutputPath>
@@ -195,10 +195,12 @@
 
       <Files>
         <Match pattern="*.cs" recurse="true"/>
+        <Match pattern="frm*.cs" subType="Form"/>
+        <Match pattern="*.resx" buildAction="EmbeddedResource" recurse="true"/>
       </Files>
     </Project>
-	
-	<Project name="Baker" path="Programs/Baker" type="WinExe">
+
+    <Project name="Baker" path="Programs/Baker" type="WinExe">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../bin/</OutputPath>
@@ -219,10 +221,11 @@
 
       <Files>
         <Match pattern="*.cs" recurse="true"/>
+        <Match pattern="*.resx" buildAction="EmbeddedResource" recurse="true"/>
       </Files>
     </Project>
-	
-	<Project name="importprimscript" path="Programs/importprimscript" type="Exe">
+
+    <Project name="importprimscript" path="Programs/importprimscript" type="Exe">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../bin/</OutputPath>
@@ -243,7 +246,7 @@
         <Match pattern="*.cs" recurse="true"/>
       </Files>
     </Project>
-    
+
     <Project name="mapgenerator" path="Programs/mapgenerator" type="Exe">
       <Configuration name="Debug">
         <Options>
@@ -264,7 +267,7 @@
         <Match pattern="ProtocolManager.cs"/>
       </Files>
     </Project>
-    
+
     <Project name="PrimWorkshop" path="Programs/PrimWorkshop" type="WinExe">
       <Configuration name="Debug">
         <Options>
@@ -291,9 +294,10 @@
 
       <Files>
         <Match pattern="*.cs" recurse="true"/>
+        <Match pattern="*.resx" buildAction="EmbeddedResource" recurse="true"/>
       </Files>
     </Project>
-    
+
     <Project name="SecondGlance" path="Programs/SecondGlance" type="WinExe">
       <Configuration name="Debug">
         <Options>
@@ -316,9 +320,10 @@
 
       <Files>
         <Match pattern="*.cs" recurse="true"/>
+        <Match pattern="*.resx" buildAction="EmbeddedResource" recurse="true"/>
       </Files>
     </Project>
-    
+
     <Project name="GridImageUpload" path="Programs/GridImageUpload" type="WinExe">
       <Configuration name="Debug">
         <Options>
@@ -340,9 +345,10 @@
 
       <Files>
         <Match pattern="*.cs" recurse="true"/>
+        <Match pattern="*.resx" buildAction="EmbeddedResource" recurse="true"/>
       </Files>
     </Project>
-    
+
     <Project name="GridProxyApp" path="Programs/GridProxy" type="Exe">
       <Configuration name="Debug">
         <Options>
@@ -364,7 +370,7 @@
         <Match pattern="GridProxyMain.cs"/>
       </Files>
     </Project>
-    
+
     <Project name="VisualParamGenerator" path="Programs/VisualParamGenerator" type="Exe">
       <Configuration name="Debug">
         <Options>
@@ -386,7 +392,7 @@
         <Match pattern="VisualParamGenerator.cs"/>
       </Files>
     </Project>
-    
+
     <Project name="VoiceTest" path="Programs/VoiceTest" type="Exe">
       <Configuration name="Debug">
         <Options>
@@ -408,9 +414,9 @@
         <Match pattern="*.cs" recurse="true"/>
       </Files>
     </Project>
-    
+
     <!-- Examples -->
-    
+
     <Project name="groupmanager" path="Programs/examples/groupmanager" type="WinExe">
       <Configuration name="Debug">
         <Options>
@@ -432,9 +438,10 @@
 
       <Files>
         <Match pattern="*.cs" recurse="true"/>
+        <Match pattern="*.resx" buildAction="EmbeddedResource" recurse="true"/>
       </Files>
     </Project>
-    
+
     <Project name="GUITestClient" path="Programs/examples/GUITestClient" type="WinExe">
       <Configuration name="Debug">
         <Options>
@@ -456,9 +463,10 @@
 
       <Files>
         <Match pattern="*.cs" recurse="true"/>
+        <Match pattern="*.resx" buildAction="EmbeddedResource" recurse="true"/>
       </Files>
     </Project>
-    
+
     <Project name="Heightmap" path="Programs/examples/Heightmap" type="WinExe">
       <Configuration name="Debug">
         <Options>
@@ -480,9 +488,10 @@
 
       <Files>
         <Match pattern="*.cs" recurse="true"/>
+        <Match pattern="*.resx" buildAction="EmbeddedResource" recurse="true"/>
       </Files>
     </Project>
-    
+
     <Project name="GridAccountant" path="Programs/examples/GridAccountant" type="WinExe">
       <Configuration name="Debug">
         <Options>
@@ -504,9 +513,10 @@
 
       <Files>
         <Match pattern="*.cs" recurse="true"/>
+        <Match pattern="*.resx" buildAction="EmbeddedResource" recurse="true"/>
       </Files>
     </Project>
-    
+
     <Project name="PacketDump" path="Programs/examples/PacketDump" type="Exe">
       <Configuration name="Debug">
         <Options>
@@ -527,7 +537,7 @@
         <Match pattern="*.cs" recurse="true"/>
       </Files>
     </Project>
-    
+
     <Project name="TestClient" path="Programs/examples/TestClient" type="Exe">
       <Configuration name="Debug">
         <Options>
@@ -551,6 +561,6 @@
         <Match pattern="*.cs" recurse="true"/>
       </Files>
     </Project>
-    
+
   </Solution>
 </Prebuild>