diff --git a/installer/install-linux.xml b/installer/install-linux.xml
index 781f6d9a..cc4b6ddb 100644
--- a/installer/install-linux.xml
+++ b/installer/install-linux.xml
@@ -1,103 +1,138 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
-
-<installation version="1.0">
-
-    <info>
-        <appname>Enginuity</appname>
-        <appversion>0.4.2 Beta</appversion>
-        <authors>
-            <author name="Jared Gould" email="jared.gould@enginuity.org"/>
-        </authors>
-        <url>http://www.enginuity.org</url>
-    </info>
-    <native type="izpack" name="ShellLink.dll"/>
-    <guiprefs width="640" height="480" resizable="no"/>
-    <locale>
-        <langpack iso3="eng"/>
-    </locale>
-    <resources>
-        <res id="LicencePanel.licence" src="license.txt"/>
-        <res id="InfoPanel.info" src="release_notes.txt"/>
-        <res id="shortcutSpec.xml" src="installer/shortcutSpec.xml"/>
-    </resources>
-
-    <panels>
-        <!-- <panel classname="HelloPanel"/>
- -->
-        <panel classname="InfoPanel"/>
-        <panel classname="LicencePanel"/>
-        <panel classname="TargetPanel"/>
-        <panel classname="PacksPanel"/>
-        <panel classname="ShortcutPanel"/>
-        <panel classname="InstallPanel"/>
-        <panel classname="SimpleFinishPanel"/>
-    </panels>
-
-    <packs>
-        <pack name="Base" required="yes">
-            <description>Enginuity binary files</description>
-            <file src="Enginuity.jar" targetdir="$INSTALL_PATH"/>
-	    <file src="Enginuity.bat" targetdir="$INSTALL_PATH"/>
-	    <file src="log4j.properties" targetdir="$INSTALL_PATH"/>
-            <file src="license.txt" targetdir="$INSTALL_PATH"/>
-            <file src="release_notes.txt" targetdir="$INSTALL_PATH"/>
-            <file src="images" targetdir="$INSTALL_PATH"/>
-            <fileset dir="graphics" targetdir="$INSTALL_PATH/graphics" excludes="*.bmp"/>
-
-            <!-- Logger files -->
-            <file src="logger.xml" targetdir="$INSTALL_PATH"/>
-            <file src="logger.dtd" targetdir="$INSTALL_PATH"/>
-            <file src="profile.dtd" targetdir="$INSTALL_PATH"/>
-	    <file src="utec/utec.properties" targetdir="$INSTALL_PATH/utec"/>
-
-            <file src="lib/BareBonesBrowserLaunch.jar" targetdir="$INSTALL_PATH/lib"/>
-            <file src="lib/jep.jar" targetdir="$INSTALL_PATH/lib"/>
-            <file src="lib/JFontChooser.jar" targetdir="$INSTALL_PATH/lib"/>
-            <file src="lib/swing-layout-1.0.jar" targetdir="$INSTALL_PATH/lib"/>
-            <file src="lib/log4j-1.2.14.jar" targetdir="$INSTALL_PATH/lib"/>
-
-            <file src="lib/Graph3d/jama-1.0.2.jar" targetdir="$INSTALL_PATH/lib"/>
-            <file src="lib/Graph3d/linux/Graph3d.jar" targetdir="$INSTALL_PATH/lib" os="unix"/>
-            <file src="lib/Graph3d/linux/lib/j3dcore.jar" targetdir="$INSTALL_PATH/lib" os="unix"/>
-            <file src="lib/Graph3d/linux/lib/j3dutils.jar" targetdir="$INSTALL_PATH/lib" os="unix"/>
-            <file src="lib/Graph3d/linux/lib/libj3dcore-ogl.so" targetdir="$INSTALL_PATH/lib" os="unix"/>
-            <file src="lib/Graph3d/linux/lib/libj3dcore-ogl-cg.so" targetdir="$INSTALL_PATH/lib" os="unix"/>
-            <file src="lib/Graph3d/linux/lib/librxtxParallel.so" targetdir="$INSTALL_PATH/lib" os="unix"/>
-            <file src="lib/Graph3d/linux/lib/librxtxSerial.so" targetdir="$INSTALL_PATH/lib" os="unix"/>
-            <file src="lib/Graph3d/linux/lib/vecmath.jar" targetdir="$INSTALL_PATH/lib" os="unix"/>
-
-            <file src="lib/jdic/jdic.jar" targetdir="$INSTALL_PATH/lib"/>
-            <file src="lib/jdic/linux/jdic_stub.jar" targetdir="$INSTALL_PATH/lib" os="unix"/>
-            <file src="lib/jdic/linux/x86/libjdic.so" targetdir="$INSTALL_PATH/lib" os="unix"/>
-            <file src="lib/jdic/linux/x86/libmozembed-linux-gtk1.2.so" targetdir="$INSTALL_PATH/lib" os="unix"/>
-            <file src="lib/jdic/linux/x86/libmozembed-linux-gtk2.so" targetdir="$INSTALL_PATH/lib" os="unix"/>
-            <file src="lib/jdic/linux/x86/libtray.so" targetdir="$INSTALL_PATH/lib" os="unix"/>
-            <file src="lib/jdic/linux/x86/mozembed-linux-gtk1.2" targetdir="$INSTALL_PATH/lib" os="unix"/>
-            <file src="lib/jdic/linux/x86/mozembed-linux-gtk2" targetdir="$INSTALL_PATH/lib" os="unix"/>
-
-            <file src="lib/logger/jcommon-1.0.7.jar" targetdir="$INSTALL_PATH/lib"/>
-            <file src="lib/logger/jfreechart-1.0.3.jar" targetdir="$INSTALL_PATH/lib"/>
-            <file src="lib/logger/rxtx/RXTXcomm.jar" targetdir="$INSTALL_PATH/lib"/>
-            <file src="lib/logger/rxtx/linux/i686/librxtxSerial.so" targetdir="$INSTALL_PATH/lib"/>
-	    <file src="lib/tts/cmu_time_awb.jar" targetdir="$INSTALL_PATH/lib"/>
- 	    <file src="lib/tts/cmu_us_kal.jar" targetdir="$INSTALL_PATH/lib"/> 
-	    <file src="lib/tts/cmutimelex.jar" targetdir="$INSTALL_PATH/lib"/> 
-	    <file src="lib/tts/en_us.jar" targetdir="$INSTALL_PATH/lib"/> 
-	    <file src="lib/tts/freetts.jar" targetdir="$INSTALL_PATH/lib"/> 
-	    <file src="lib/tts/cmulex.jar" targetdir="$INSTALL_PATH/lib"/> 
-	    <file src="lib/tts/cmudict04.jar" targetdir="$INSTALL_PATH/lib"/> 
-
-        </pack>
-        <!-- END Base Pack -->
-
-        <pack name="ECU Definitions" required="no">
-            <description>The latest official ECU definitions</description>
-            <file src="ecu_defs/ecu_defs.xml" targetdir="$INSTALL_PATH"/>
-        </pack>
-
-        <pack name="Source Files" required="no">
-            <description>Enginuity Source Files</description>
-            <file src="src" targetdir="$INSTALL_PATH"/>
-        </pack>
-    </packs>
-</installation>
+<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
+
+<installation version="1.0">
+
+	<info>
+		<appname>Enginuity</appname>
+		<appversion>0.4.2 Beta</appversion>
+		<authors>
+			<author name="Jared Gould"
+				email="jared.gould@enginuity.org" />
+		</authors>
+		<url>http://www.enginuity.org</url>
+	</info>
+	<native type="izpack" name="ShellLink.dll" />
+	<guiprefs width="640" height="480" resizable="no" />
+	<locale>
+		<langpack iso3="eng" />
+	</locale>
+	<resources>
+		<res id="LicencePanel.licence" src="license.txt" />
+		<res id="InfoPanel.info" src="release_notes.txt" />
+		<res id="shortcutSpec.xml" src="installer/shortcutSpec.xml" />
+	</resources>
+
+	<panels>
+		<!-- <panel classname="HelloPanel"/>
+		-->
+		<panel classname="InfoPanel" />
+		<panel classname="LicencePanel" />
+		<panel classname="TargetPanel" />
+		<panel classname="PacksPanel" />
+		<panel classname="ShortcutPanel" />
+		<panel classname="InstallPanel" />
+		<panel classname="SimpleFinishPanel" />
+	</panels>
+
+	<packs>
+		<pack name="Base" required="yes">
+			<description>Enginuity binary files</description>
+			<file src="Enginuity.jar" targetdir="$INSTALL_PATH" />
+			<file src="Enginuity.bat" targetdir="$INSTALL_PATH" />
+			<file src="log4j.properties" targetdir="$INSTALL_PATH" />
+			<file src="license.txt" targetdir="$INSTALL_PATH" />
+			<file src="release_notes.txt" targetdir="$INSTALL_PATH" />
+			<file src="images" targetdir="$INSTALL_PATH" />
+			<fileset dir="graphics" targetdir="$INSTALL_PATH/graphics"
+				excludes="*.bmp" />
+
+			<!-- Logger files -->
+			<file src="logger.xml" targetdir="$INSTALL_PATH" />
+			<file src="logger.dtd" targetdir="$INSTALL_PATH" />
+			<file src="profile.dtd" targetdir="$INSTALL_PATH" />
+			<file src="utec/utec.properties"
+				targetdir="$INSTALL_PATH/utec" />
+
+			<file src="lib/BareBonesBrowserLaunch.jar"
+				targetdir="$INSTALL_PATH/lib" />
+			<file src="lib/jep.jar" targetdir="$INSTALL_PATH/lib" />
+			<file src="lib/JFontChooser.jar"
+				targetdir="$INSTALL_PATH/lib" />
+			<file src="lib/swing-layout-1.0.jar"
+				targetdir="$INSTALL_PATH/lib" />
+			<file src="lib/log4j-1.2.14.jar"
+				targetdir="$INSTALL_PATH/lib" />
+
+			<file src="lib/Graph3d/jama-1.0.2.jar"
+				targetdir="$INSTALL_PATH/lib" />
+			<file src="lib/Graph3d/linux/Graph3d.jar"
+				targetdir="$INSTALL_PATH/lib" os="unix" />
+			<file src="lib/Graph3d/linux/lib/j3dcore.jar"
+				targetdir="$INSTALL_PATH/lib" os="unix" />
+			<file src="lib/Graph3d/linux/lib/j3dutils.jar"
+				targetdir="$INSTALL_PATH/lib" os="unix" />
+			<file src="lib/Graph3d/linux/lib/libj3dcore-ogl.so"
+				targetdir="$INSTALL_PATH/lib" os="unix" />
+			<file src="lib/Graph3d/linux/lib/libj3dcore-ogl-cg.so"
+				targetdir="$INSTALL_PATH/lib" os="unix" />
+			<file src="lib/Graph3d/linux/lib/librxtxParallel.so"
+				targetdir="$INSTALL_PATH/lib" os="unix" />
+			<file src="lib/Graph3d/linux/lib/librxtxSerial.so"
+				targetdir="$INSTALL_PATH/lib" os="unix" />
+			<file src="lib/Graph3d/linux/lib/vecmath.jar"
+				targetdir="$INSTALL_PATH/lib" os="unix" />
+
+			<file src="lib/jdic/jdic.jar" targetdir="$INSTALL_PATH/lib" />
+			<file src="lib/jdic/linux/jdic_stub.jar"
+				targetdir="$INSTALL_PATH/lib" os="unix" />
+			<file src="lib/jdic/linux/x86/libjdic.so"
+				targetdir="$INSTALL_PATH/lib" os="unix" />
+			<file src="lib/jdic/linux/x86/libmozembed-linux-gtk1.2.so"
+				targetdir="$INSTALL_PATH/lib" os="unix" />
+			<file src="lib/jdic/linux/x86/libmozembed-linux-gtk2.so"
+				targetdir="$INSTALL_PATH/lib" os="unix" />
+			<file src="lib/jdic/linux/x86/libtray.so"
+				targetdir="$INSTALL_PATH/lib" os="unix" />
+			<file src="lib/jdic/linux/x86/mozembed-linux-gtk1.2"
+				targetdir="$INSTALL_PATH/lib" os="unix" />
+			<file src="lib/jdic/linux/x86/mozembed-linux-gtk2"
+				targetdir="$INSTALL_PATH/lib" os="unix" />
+
+			<file src="lib/logger/jcommon-1.0.7.jar"
+				targetdir="$INSTALL_PATH/lib" />
+			<file src="lib/logger/jfreechart-1.0.3.jar"
+				targetdir="$INSTALL_PATH/lib" />
+			<file src="lib/logger/rxtx/RXTXcomm.jar"
+				targetdir="$INSTALL_PATH/lib" />
+			<file src="lib/logger/rxtx/linux/i686/librxtxSerial.so"
+				targetdir="$INSTALL_PATH/lib" />
+			<file src="lib/tts/cmu_time_awb.jar"
+				targetdir="$INSTALL_PATH/lib" />
+			<file src="lib/tts/cmu_us_kal.jar"
+				targetdir="$INSTALL_PATH/lib" />
+			<file src="lib/tts/cmutimelex.jar"
+				targetdir="$INSTALL_PATH/lib" />
+			<file src="lib/tts/en_us.jar" targetdir="$INSTALL_PATH/lib" />
+			<file src="lib/tts/freetts.jar"
+				targetdir="$INSTALL_PATH/lib" />
+			<file src="lib/tts/cmulex.jar"
+				targetdir="$INSTALL_PATH/lib" />
+			<file src="lib/tts/cmudict04.jar"
+				targetdir="$INSTALL_PATH/lib" />
+
+		</pack>
+		<!-- END Base Pack -->
+
+		<pack name="ECU Definitions" required="no">
+			<description>
+				The latest official ECU definitions
+			</description>
+			<file src="ecu_defs/ecu_defs.xml" targetdir="$INSTALL_PATH" />
+		</pack>
+
+		<pack name="Source Files" required="no">
+			<description>Enginuity Source Files</description>
+			<file src="src" targetdir="$INSTALL_PATH" />
+		</pack>
+	</packs>
+</installation>
diff --git a/installer/shortcutSpec.xml b/installer/shortcutSpec.xml
index a13a1c5f..9058e1c6 100644
--- a/installer/shortcutSpec.xml
+++ b/installer/shortcutSpec.xml
@@ -10,8 +10,8 @@
      applications="no"
      startMenu="no"
      startup="no"
-     target="java"
-     commandLine="-jar &quot;$INSTALL_PATH/Enginuity.jar&quot;"
+     target="$JAVA_HOME/bin/java"
+     commandLine="-Djava.library.path=lib -Xmx256M -jar &quot;$INSTALL_PATH/Enginuity.jar&quot;"
      initialState="noShow"
      iconFile="$INSTALL_PATH/graphics/enginuity-ico.ico"
      workingDirectory="$INSTALL_PATH"
@@ -70,7 +70,7 @@
      applications="no"
      startMenu="no"
      startup="no"
-     target="java"
+     target="$JAVA_HOME/bin/java"
      commandLine="-jar &quot;$INSTALL_PATH/Uninstaller/uninstaller.jar&quot;"
      initialState="noShow"
      iconFile="trashcan_full"
@@ -82,20 +82,4 @@
      <createForPack name="Base" />
    </shortcut>
    
-	<!-- 
-	<shortcut name="Enginuity" target="$INSTALL_PATH\Enginuity.bat"
-		workingDirectory="$INSTALL_PATH"
-		iconFile="$INSTALL_PATH\graphics\enginuity-ico.ico" programGroup="yes"
-		encoding="UTF-8"
-		desktop="yes" />
-
-	<shortcut name="Release Notes"
-		target="$INSTALL_PATH\release notes.txt" programGroup="yes" />
-
-	<shortcut name="License Agreement"
-		target="$INSTALL_PATH\license.txt" programGroup="yes" />
-
-	<shortcut name="Uninstall Enginuity"
-		target="$INSTALL_PATH\Uninstaller\uninstaller.jar" programGroup="yes" />
-	-->
 </shortcuts>