diff --git a/build.xml b/build.xml
index c28451086..dbd45220c 100644
--- a/build.xml
+++ b/build.xml
@@ -12,56 +12,39 @@
     
     <target name="default" depends="zip"/>
 
-    <target name="build" description="Builds the complete SDK" depends="-check-platform, -update-sdk-platform-config">
+    <target name="build" description="Builds the complete GDE, copies over engine libraries." depends="-check-platform, -update-sdk-platform-config">
         <ant dir="engine" target="update-sdk"/>
-        <ant dir="sdk" target="zip-templates"/>
         <ant dir="sdk" target="build"/>
     </target>
 
-    <target name="build-engine" description="Builds the engine only">
+    <target name="build-engine" description="Builds the engine libraries only">
         <ant dir="engine" target="clean"/>
-        <ant dir="engine" target="jar"/>
+        <ant dir="engine" target="dist"/>
     </target>
 
-    <target name="clean" description="Clean all build products">
+    <target name="clean" description="Clean all build products" depends="-check-platform, -update-sdk-platform-config">
         <ant dir="engine" target="clean"/>
         <ant dir="sdk" target="clean"/>
     </target>
 
-    <target name="run" description="Runs the SDK" depends="build">
+    <target name="run" description="Runs the SDK" depends="-check-platform, -update-sdk-platform-config">
+        <ant dir="engine" target="update-sdk"/>
         <ant dir="sdk" target="run"/>
     </target>
 
     <target name="zip" description="Builds the complete SDK and packs it as a ZIP file" depends="build">
-        <ant dir="sdk" target="build-zip"/>
-        <move file="sdk/dist/jmonkeyplatform.zip" tofile="./jME3-SDK.zip"/>
+        <propertyfile file="sdk/nbproject/project.properties"/>
+        <move file="sdk/dist/${app.name}.zip" tofile="./jMonkeyEngine-GDE-${app.version}.zip"/>
     </target>
-
+    
     <target name="update-platform" description="Updates the base platform to the latest available build" depends="-remove-platform,-check-platform"/>
 
-    <target name="hudson-nightly" depends="-update-platform-hudson">
-        <ant dir="engine" target="deploy-hudson"/>
-        <ant dir="engine" target="hudson-update-sdk"/>
-        <ant dir="sdk" target="hudson-nightly"/>
-    </target>
-
-    <target name="hudson-stable" depends="-update-platform-hudson">
-        <ant dir="engine" target="dist"/>
-        <ant dir="engine" target="hudson-update-sdk"/>
-        <ant dir="sdk" target="hudson-nightly"/>
-    </target>
-
-    <target name="-update-platform-hudson" description="Updates the base platform to the latest available build" depends="-remove-platform">
-        <copy file="/var/www/com/platform/base/alpha/platform-base.zip" todir="./"/>
-        <unzip src="platform-base.zip" dest="./"/>
-        <antcall target="-update-sdk-platform-config"/>
-        <delete file="platform-base.zip"/>
-    </target>
-
     <target name="-check-platform" depends="-check-platform-present" unless="platform.present">
+        <property file="sdk/nbproject/project.properties"/>
         <echo message="Downloading base platform, this only has to be done once."/>
         <!--get src="http://jmonkeyengine.googlecode.com/files/platform-base.zip" dest="./" skipexisting="true"/-->
-        <get src="http://jmonkeyengine.com/platform/base/alpha/platform-base.zip" dest="./" skipexisting="true"/>
+        <get src="http://jmonkeyengine.com/platform/base/alpha/platform-base.zip" dest="./" skipexisting="false"/>
+        <!--get src="http://jmonkeyengine.com/updates/${app.version}/platform-base.zip" dest="./" skipexisting="false"/-->
         <unzip src="platform-base.zip" dest="./"/>
         <antcall target="-update-sdk-platform-config"/>
         <delete file="platform-base.zip"/>
@@ -85,6 +68,30 @@
         <replace file="sdk/nbproject/private/platform-private.properties" token="\" value="\\"/>
     </target>
     
-    <target name="update-sdk-platform-config" depends="-update-sdk-platform-config"/>
+    <!--
+       ****************************************************************
+       Only Relevant for building nightly on Hudson server from here on
+       ****************************************************************
+      -->
+      
+    <target name="hudson-nightly" depends="update-platform">
+        <exec executable="svn" dir="engine">
+            <arg value="update" />
+        </exec>
+        <ant dir="engine" target="dist"/>
+        <ant dir="engine" target="build-bullet-natives"/>
+        <ant dir="engine" target="update-sdk"/>
+        <ant dir="sdk" target="hudson-nightly"/>
+    </target>
+
+    <target name="hudson-stable" depends="update-platform">
+        <exec executable="svn" dir="engine">
+            <arg value="update" />
+        </exec>
+        <ant dir="engine" target="dist"/>
+        <ant dir="engine" target="build-bullet-natives"/>
+        <ant dir="engine" target="update-sdk"/>
+        <ant dir="sdk" target="hudson-stable"/>
+    </target>
 
 </project>
\ No newline at end of file
diff --git a/sdk/build.xml b/sdk/build.xml
index 78e5649a5..c0607bdcc 100644
--- a/sdk/build.xml
+++ b/sdk/build.xml
@@ -13,27 +13,17 @@
     <taskdef name="deb" classname="com.googlecode.ant_deb_task.Deb" classpathref="ant-import.classpath"/>
     <taskdef name="desktopentry" classname="com.googlecode.ant_deb_task.DesktopEntry" classpathref="ant-import.classpath"/>
 
-    <!--zips up the templates and adds them to the template project-->
-    <target name="zip-templates" description="Updates the template zip files">
-        <zip basedir="BasicGameTemplate/" destfile="jme3-templates/src/com/jme3/gde/templates/BasicGameProject.zip">
-            <exclude name="**/build/"/>
-            <exclude name="**/dist/"/>
-            <exclude name="**/nbproject/private/"/>
-        </zip>
-        <zip basedir="JME3TestsTemplate/" destfile="jme3-tests-template/src/com/jme3/gde/templates/tests/JmeTestsProject.zip">
-            <exclude name="**/build/"/>
-            <exclude name="**/dist/"/>
-            <exclude name="**/nbproject/private/"/>
-        </zip>
+    <!--override branding target to include netbeans config file creation, using this target makes sure init was called-->
+    <target name="branding" depends="-create-netbeans-config, -set-base-version, -zip-templates, suite.branding">
     </target>
 
-    <!--override build to include netbeans config file creation-->
-    <target name="build" depends="-create-netbeans-config, suite.build">
+    <!--updates the help sets-->
+    <target name="update-help-sets" description="Loads the wiki pages from the web and converts them to JavaHelp html for manual.">
+        <ant antfile="build.xml" target="update-help-sets" inheritall="false" inheritrefs="false" dir="jme3-core/"/>
     </target>
 
-    <!--replaces default values in jmonkeyplatform.conf file with run.args.extra from project.properties-->
     <target name="-create-netbeans-config">
-        <property file="nbproject/project.properties"/>
+        <!--replaces default values in jmonkeyplatform.conf file with run.args.extra from project.properties-->
         <mkdir dir="build/launcher/etc"/>
         <copy file="${harness.dir}/etc/app.conf" tofile="build/launcher/etc/${app.name}.conf">
             <filterchain>
@@ -44,18 +34,74 @@
         </copy>
     </target>
 
-    <!--creates update center version via hudson build server-->
-    <target name="hudson-stable" depends="suite.clean, -revert-svn-changes, zip-templates, set-impl-version, suite.nbms, unset-impl-version">
+    <!--zips up the templates and adds them to the template project-->
+    <target name="-zip-templates" description="Updates the template zip files">
+        <zip basedir="BasicGameTemplate/" destfile="jme3-templates/src/com/jme3/gde/templates/BasicGameProject.zip">
+            <exclude name="**/build/"/>
+            <exclude name="**/dist/"/>
+            <exclude name="**/nbproject/private/"/>
+        </zip>
+        <zip basedir="JME3TestsTemplate/" destfile="jme3-tests-template/src/com/jme3/gde/templates/tests/JmeTestsProject.zip">
+            <exclude name="**/build/"/>
+            <exclude name="**/dist/"/>
+            <exclude name="**/nbproject/private/"/>
+        </zip>
     </target>
 
-    <!--creates update center version via hudson build server-->
-    <target name="hudson-nightly" depends="suite.clean, -revert-svn-changes, zip-templates, set-impl-version, suite.nbms, unset-impl-version">
+    <target name="-set-base-version" description ="sets/unsets base version to major version for all plugins, updates branding version">
+        <!--sets/unsets base version to major version (e.g. 3.0.1) for all plugins-->
+        <foreach target="-do-base-version" list="${modules}" delimiter=":" param="module_dir" inheritall="true"/>
+        <!--sets version to application branding files-->
+        <replaceregexp file="${basedir}/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties"
+                        match="currentVersion=(.*)"
+                        replace="currentVersion=${app.title} ${app.version}"
+                        byline="true"/>
+        <replaceregexp file="${basedir}/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties"
+                        match="CTL_MainWindow_Title=(.*)"
+                        replace="CTL_MainWindow_Title=${app.title} ${app.version}"
+                        byline="true"/>
+        <replaceregexp file="${basedir}/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties"
+                        match="CTL_MainWindow_Title_No_Project=(.*)"
+                        replace="CTL_MainWindow_Title_No_Project=${app.title} ${app.version}"
+                        byline="true"/>
+        <!--propertyfile
+            file="${basedir}/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties" 
+            comment="Updated by build script">
+            <entry key="currentVersion" value="${app.title} ${app.version}" />
+        </propertyfile-->
+        <!--propertyfile
+            file="${basedir}/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties"
+            comment="Updated by build script">
+            <entry key="CTL_MainWindow_Title" value="${app.title} ${app.version}" />
+            <entry key="CTL_MainWindow_Title_No_Project" value="${app.title} ${app.version}" />
+        </propertyfile-->
     </target>
 
+    <target name="-do-base-version">
+        <!--propertyfile
+            file="${module_dir}/nbproject/project.properties"
+            comment="Updated by build script">
+            <entry key="spec.version.base" value="${plugins.version}" />
+        </propertyfile-->
+        <replaceregexp file="${module_dir}/nbproject/project.properties"
+                        match="spec.version.base=(.*)"
+                        replace="spec.version.base=${plugins.version}"
+                        byline="true"/>
+    </target>
+    
+    <!--
+       ****************************************************************
+       Only Relevant for building nightly on Hudson server from here on
+       ****************************************************************
+      -->
+      
     <!--creates update center version via hudson build server-->
-    <target name="hudson-release" depends="suite.clean, -revert-svn-changes, zip-templates, set-impl-version, build, unset-impl-version">
+    <target name="hudson-nightly" depends="suite.clean, update-help-sets, -revert-svn-changes, set-impl-version, suite.nbms, unset-impl-version">
     </target>
 
+    <target name="hudson-stable" depends="suite.clean, -revert-svn-changes, set-impl-version, suite.nbms, unset-impl-version">
+    </target>
+    
     <target name="set-impl-version">
         <property file="nbproject/project.properties"/>
         <antcall target="-create-jme3-svn-properties" inheritall="true">
@@ -163,11 +209,6 @@
         </exec>
     </target>
 
-    <!--updates the help sets-->
-    <target name="-update-help-sets">
-        <ant antfile="build.xml" target="update-help-sets" inheritall="false" inheritrefs="false" dir="jme3-core/"/>
-    </target>
-
     <!--creates properties files containing svn info for the jme3 folders-->
     <target name="-create-jme3-svn-properties">
         <mkdir dir="build"/>
@@ -200,30 +241,30 @@
         </unzip>
         <desktopentry
             toFile="build/jmonkeyplatform.desktop"
-            name="jMonkeyEngine3 SDK"
-            comment="jMonkeyEngine3 Game SDK"
-            exec="/usr/local/jmonkeyplatform/bin/jmonkeyplatform"
-            icon="/usr/local/jmonkeyplatform/jmonkeyplatform.png"
+            name="jMonkeyEngine3 GDE"
+            comment="jMonkeyEngine3 Game Development Environment"
+            exec="/usr/local/${app.name}/bin/${app.name}"
+            icon="/usr/local/${app.name}/jmonkeyengine.png"
             categories="Development;Java"
         />
         <deb toDir="dist"
             package="jme3-sdk"
-            version="0.6.1"
+            version="${app.version}"
             section="devel"
             depends="sun-java6-jdk"
             maintainer="jMonkeyEngine"
             homepage="http://www.jmonkeyengine.com"
             postrm="debscripts/postrm"
             >
-            <tarfileset dir="dist/jmonkeyplatform/" prefix="usr/local/jmonkeyplatform">
+            <tarfileset dir="dist/${app.name}/" prefix="usr/local/${app.name}">
                 <exclude name="bin/**"/>
             </tarfileset>
-            <tarfileset dir="dist/jmonkeyplatform/bin" prefix="usr/local/jmonkeyplatform/bin" filemode="755">
+            <tarfileset dir="dist/${app.name}/bin" prefix="usr/local/${app.name}/bin" filemode="755">
                 <exclude name="*.exe"/>
             </tarfileset>
-            <tarfileset file="build/jmonkeyplatform.desktop" prefix="usr/share/applications"/>
-            <tarfileset file="jmonkeyplatform.png" prefix="usr/local/jmonkeyplatform"/>
-            <description synopsis="jMonkeyEngine3 SDK is a complete solution for Java OpenGL game development.">
+            <tarfileset file="build/jmonkeyengine.desktop" prefix="usr/share/applications"/>
+            <tarfileset file="jmonkeyengine.png" prefix="usr/local/${app.name}"/>
+            <description synopsis="jMonkeyEngine3 Game Development Environment is a complete solution for Java OpenGL game development.">
 jMonkeyEngine 3 was rebuilt from the ground up to be a modern 3D game engine,
 compatible with OpenGL 2.0 and above.
 Its architecture is shader-based, making it fully capable of current and
diff --git a/sdk/jmonkeyplatform.icns b/sdk/jmonkeyengine.icns
similarity index 100%
rename from sdk/jmonkeyplatform.icns
rename to sdk/jmonkeyengine.icns
diff --git a/sdk/jmonkeyplatform.png b/sdk/jmonkeyengine.png
similarity index 100%
rename from sdk/jmonkeyplatform.png
rename to sdk/jmonkeyengine.png
diff --git a/sdk/nbproject/project.properties b/sdk/nbproject/project.properties
index a96f101cd..fe13aea5d 100644
--- a/sdk/nbproject/project.properties
+++ b/sdk/nbproject/project.properties
@@ -1,10 +1,13 @@
 app.icon=branding/core/core.jar/org/netbeans/core/startup/frame48.gif
-app.name=jmonkeyplatform
-app.title=jMonkeyPlatform
-app.icon.icns=jmonkeyplatform.icns
+app.name=jmonkeyengine
+app.title=jMonkeyEngine SDK
+app.icon.icns=jmonkeyengine.icns
 branding.token=${app.name}
-#jme-specific, changes settings folder name:
-app.version=3.0-beta
+#version name used for application and settings folder, no spaces!
+app.version=3.0beta
+#version number used for plugins, only numbers (e.g. 3.1.3)
+plugins.version=3.0.0
+run.args.extra=-J-Xmx512m -J-XX:PermSize=256m
 auxiliary.org-netbeans-modules-apisupport-installer.license-file=license-jme.txt
 auxiliary.org-netbeans-modules-apisupport-installer.os-linux=true
 auxiliary.org-netbeans-modules-apisupport-installer.os-macosx=true
@@ -41,7 +44,7 @@ modules=\
     ${project.com.jme3.gde.obfuscate}:\
     ${project.com.jme3.gde.blender}:\
     ${project.com.jme3.gde.angelfont}
-project.com.jme3.gde.android=jme3-android
+project.com.jme3.gde.android=Android Support
 project.com.jme3.gde.angelfont=jme3-angelfont
 project.com.jme3.gde.blender=jme3-blender
 project.com.jme3.gde.codecheck=jme3-code-check
@@ -72,4 +75,3 @@ project.com.jme3.gde.textureeditor=jme3-texture-editor
 project.com.jme3.gde.vehiclecreator=jme3-vehicle-creator
 project.com.jme3.gde.wavefront=jme3-wavefront
 project.com.jme3.gde.welcome=jme3-welcome-screen
-run.args.extra=-J-Xmx512m -J-XX:PermSize=256m