diff --git a/src/enginuity/logger/innovate/lc1/plugin/Lc1DataItem.java b/src/enginuity/logger/innovate/lc1/plugin/Lc1DataItem.java
index a6fc1402..3e5278fc 100644
--- a/src/enginuity/logger/innovate/lc1/plugin/Lc1DataItem.java
+++ b/src/enginuity/logger/innovate/lc1/plugin/Lc1DataItem.java
@@ -9,7 +9,7 @@ public final class Lc1DataItem implements ExternalDataItem, DataListener {
     private byte[] bytes;
 
     public String getName() {
-        return "LC-1";
+        return "Innovate LC-1";
     }
 
     public String getDescription() {
diff --git a/src/enginuity/logger/innovate/lm1/plugin/Lm1DataItem.java b/src/enginuity/logger/innovate/lm1/plugin/Lm1DataItem.java
index fecc003e..daa94ee6 100644
--- a/src/enginuity/logger/innovate/lm1/plugin/Lm1DataItem.java
+++ b/src/enginuity/logger/innovate/lm1/plugin/Lm1DataItem.java
@@ -9,7 +9,7 @@ public final class Lm1DataItem implements ExternalDataItem, DataListener {
     private byte[] bytes;
 
     public String getName() {
-        return "LM-1";
+        return "Innovate LM-1";
     }
 
     public String getDescription() {
diff --git a/templates/install-linux.xml.template b/templates/install-linux.xml.template
index 9f75e5c9..465c9b74 100644
--- a/templates/install-linux.xml.template
+++ b/templates/install-linux.xml.template
@@ -4,140 +4,143 @@
 
 <installation version="1.0">
 
-	<info>
-		<appname>@name.package@</appname>
-		<appversion>@version.major@.@version.minor@.@version.patch@ @version.extra@</appversion>
-		<authors>
-			<author name="@name.maintainer@"
-				email="@email.maintainer@" />
-		</authors>
-		<url>@supporturl@</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="build/dist/shortcutSpec-linux.xml" />
-	</resources>
+    <info>
+        <appname>@name.package@</appname>
+        <appversion>@version.major@.@version.minor@.@version.patch@ @version.extra@</appversion>
+        <authors>
+            <author name="@name.maintainer@"
+                    email="@email.maintainer@"/>
+        </authors>
+        <url>@supporturl@</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="build/dist/shortcutSpec-linux.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>
+    <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="build/lib/@name.package@.jar" targetdir="$INSTALL_PATH" />
-			<file src="license.txt" targetdir="$INSTALL_PATH" />
-			<file src="release_notes.txt" targetdir="$INSTALL_PATH" />
-			<file src="log4j.properties" targetdir="$INSTALL_PATH" />
-			<fileset dir="graphics" targetdir="$INSTALL_PATH/graphics"
-				excludes="*.bmp" />
+    <packs>
+        <pack name="Base" required="yes">
+            <description>Enginuity binary files</description>
+            <file src="build/lib/@name.package@.jar" targetdir="$INSTALL_PATH"/>
+            <file src="license.txt" targetdir="$INSTALL_PATH"/>
+            <file src="release_notes.txt" targetdir="$INSTALL_PATH"/>
+            <file src="log4j.properties" 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" />
+            <!-- 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="plugins/aem.plugin" targetdir="$INSTALL_PATH/plugins"/>
+            <file src="plugins/lc1.plugin" targetdir="$INSTALL_PATH/plugins"/>
+            <file src="plugins/lm1.plugin" targetdir="$INSTALL_PATH/plugins"/>
+            <file src="plugins/utec.plugin" targetdir="$INSTALL_PATH/plugins"/>
 
-			<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/@jar.swing-layout@"
-				targetdir="$INSTALL_PATH/lib" />
-			<file src="lib/@jar.log4j@"
-				targetdir="$INSTALL_PATH/lib" />
-			<file src="lib/Jama.jar"
-				targetdir="$INSTALL_PATH/lib" />
-			<file src="lib/jamlab.jar"
-				targetdir="$INSTALL_PATH/lib" />
+            <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/@jar.swing-layout@"
+                  targetdir="$INSTALL_PATH/lib"/>
+            <file src="lib/@jar.log4j@"
+                  targetdir="$INSTALL_PATH/lib"/>
+            <file src="lib/Jama.jar"
+                  targetdir="$INSTALL_PATH/lib"/>
+            <file src="lib/jamlab.jar"
+                  targetdir="$INSTALL_PATH/lib"/>
 
-			<file src="lib/Graph3d/@jar.jama@"
-				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/Graph3d/@jar.jama@"
+                  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/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/@jar.jcommon@"
-				targetdir="$INSTALL_PATH/lib" />
-			<file src="lib/logger/@jar.jfreechart@"
-				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" />
+            <file src="lib/logger/@jar.jcommon@"
+                  targetdir="$INSTALL_PATH/lib"/>
+            <file src="lib/logger/@jar.jfreechart@"
+                  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"/>
 
-		</pack>
-		<!-- END Base Pack -->
+            <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 name="ECU Definitions" required="no">
-			<description>
-				The latest official ECU definitions
-			</description>
-			<file src="ecu_defs/ecu_defs.xml" targetdir="$INSTALL_PATH" />
-		</pack>
+        </pack>
+        <!-- END Base Pack -->
 
-		<pack name="Source Files" required="no">
-			<description>@name.package@ Source Files</description>
-			<file src="src" targetdir="$INSTALL_PATH" />
-		</pack>
-	</packs>
+        <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>@name.package@ Source Files</description>
+            <file src="src" targetdir="$INSTALL_PATH"/>
+        </pack>
+    </packs>
 </installation>
diff --git a/templates/install-win.xml.template b/templates/install-win.xml.template
index 463e398a..5f734a7e 100644
--- a/templates/install-win.xml.template
+++ b/templates/install-win.xml.template
@@ -4,134 +4,137 @@
 
 <installation version="1.0">
 
-	<info>
-		<appname>@name.package@</appname>
-		<appversion>@version.major@.@version.minor@.@version.patch@ @version.extra@</appversion>
-		<authors>
-			<author name="@name.maintainer@" email="@email.maintainer@" />
-		</authors>
-		<url>@supporturl@</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="build/dist/shortcutSpec-win.xml" />
-	</resources>
+    <info>
+        <appname>@name.package@</appname>
+        <appversion>@version.major@.@version.minor@.@version.patch@ @version.extra@</appversion>
+        <authors>
+            <author name="@name.maintainer@" email="@email.maintainer@"/>
+        </authors>
+        <url>@supporturl@</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="build/dist/shortcutSpec-win.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>
+    <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="build/lib/@name.package@.jar" targetdir="$INSTALL_PATH" />
-			<file src="build/dist/@name.package@.exe" targetdir="$INSTALL_PATH" />
-<!--
-			<file src="@name.package@.bat" targetdir="$INSTALL_PATH" />
--->
-			<file src="license.txt" targetdir="$INSTALL_PATH" />
-			<file src="release_notes.txt" targetdir="$INSTALL_PATH" />
-			<file src="log4j.properties" targetdir="$INSTALL_PATH" />
-			<fileset dir="graphics" targetdir="$INSTALL_PATH/graphics"
-				excludes="*.bmp" />
+    <packs>
+        <pack name="Base" required="yes">
+            <description>Enginuity binary files</description>
+            <file src="build/lib/@name.package@.jar" targetdir="$INSTALL_PATH"/>
+            <file src="build/dist/@name.package@.exe" targetdir="$INSTALL_PATH"/>
+            <!--
+                        <file src="@name.package@.bat" targetdir="$INSTALL_PATH" />
+            -->
+            <file src="license.txt" targetdir="$INSTALL_PATH"/>
+            <file src="release_notes.txt" targetdir="$INSTALL_PATH"/>
+            <file src="log4j.properties" 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" />
+            <!-- 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="plugins/aem.plugin" targetdir="$INSTALL_PATH/plugins"/>
+            <file src="plugins/lc1.plugin" targetdir="$INSTALL_PATH/plugins"/>
+            <file src="plugins/lm1.plugin" targetdir="$INSTALL_PATH/plugins"/>
+            <file src="plugins/utec.plugin" targetdir="$INSTALL_PATH/plugins"/>
 
-			<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/@jar.swing-layout@"
-				targetdir="$INSTALL_PATH/lib" />
-			<file src="lib/@jar.log4j@"
-				targetdir="$INSTALL_PATH/lib" />
-			<file src="lib/Jama.jar"
-				targetdir="$INSTALL_PATH/lib" />
-			<file src="lib/jamlab.jar"
-				targetdir="$INSTALL_PATH/lib" />
+            <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/@jar.swing-layout@"
+                  targetdir="$INSTALL_PATH/lib"/>
+            <file src="lib/@jar.log4j@"
+                  targetdir="$INSTALL_PATH/lib"/>
+            <file src="lib/Jama.jar"
+                  targetdir="$INSTALL_PATH/lib"/>
+            <file src="lib/jamlab.jar"
+                  targetdir="$INSTALL_PATH/lib"/>
 
-			<file src="lib/Graph3d/@jar.jama@"
-				targetdir="$INSTALL_PATH/lib" />
-			<file src="lib/Graph3d/windows/Graph3d.jar"
-				targetdir="$INSTALL_PATH/lib" os="windows" />
-			<file src="lib/Graph3d/windows/lib/j3dcore.jar"
-				targetdir="$INSTALL_PATH/lib" os="windows" />
-			<file src="lib/Graph3d/windows/lib/j3dcore-ogl.dll"
-				targetdir="$INSTALL_PATH/lib" os="windows" />
-			<file src="lib/Graph3d/windows/lib/j3dcore-ogl-cg.dll"
-				targetdir="$INSTALL_PATH/lib" os="windows" />
-			<file src="lib/Graph3d/windows/lib/j3dutils.jar"
-				targetdir="$INSTALL_PATH/lib" os="windows" />
-			<file src="lib/Graph3d/windows/lib/vecmath.jar"
-				targetdir="$INSTALL_PATH/lib" os="windows" />
+            <file src="lib/Graph3d/@jar.jama@"
+                  targetdir="$INSTALL_PATH/lib"/>
+            <file src="lib/Graph3d/windows/Graph3d.jar"
+                  targetdir="$INSTALL_PATH/lib" os="windows"/>
+            <file src="lib/Graph3d/windows/lib/j3dcore.jar"
+                  targetdir="$INSTALL_PATH/lib" os="windows"/>
+            <file src="lib/Graph3d/windows/lib/j3dcore-ogl.dll"
+                  targetdir="$INSTALL_PATH/lib" os="windows"/>
+            <file src="lib/Graph3d/windows/lib/j3dcore-ogl-cg.dll"
+                  targetdir="$INSTALL_PATH/lib" os="windows"/>
+            <file src="lib/Graph3d/windows/lib/j3dutils.jar"
+                  targetdir="$INSTALL_PATH/lib" os="windows"/>
+            <file src="lib/Graph3d/windows/lib/vecmath.jar"
+                  targetdir="$INSTALL_PATH/lib" os="windows"/>
 
-			<file src="lib/jdic/jdic.jar" targetdir="$INSTALL_PATH/lib" />
-			<file src="lib/jdic/windows/jdic_stub.jar"
-				targetdir="$INSTALL_PATH/lib" os="windows" />
-			<file src="lib/jdic/windows/x86/IeEmbed.exe"
-				targetdir="$INSTALL_PATH/lib" os="windows" />
-			<file src="lib/jdic/windows/x86/jdic.dll"
-				targetdir="$INSTALL_PATH/lib" os="windows" />
-			<file src="lib/jdic/windows/x86/MozEmbed.exe"
-				targetdir="$INSTALL_PATH/lib" os="windows" />
-			<file src="lib/jdic/windows/x86/tray.dll"
-				targetdir="$INSTALL_PATH/lib" os="windows" />
+            <file src="lib/jdic/jdic.jar" targetdir="$INSTALL_PATH/lib"/>
+            <file src="lib/jdic/windows/jdic_stub.jar"
+                  targetdir="$INSTALL_PATH/lib" os="windows"/>
+            <file src="lib/jdic/windows/x86/IeEmbed.exe"
+                  targetdir="$INSTALL_PATH/lib" os="windows"/>
+            <file src="lib/jdic/windows/x86/jdic.dll"
+                  targetdir="$INSTALL_PATH/lib" os="windows"/>
+            <file src="lib/jdic/windows/x86/MozEmbed.exe"
+                  targetdir="$INSTALL_PATH/lib" os="windows"/>
+            <file src="lib/jdic/windows/x86/tray.dll"
+                  targetdir="$INSTALL_PATH/lib" os="windows"/>
 
-			<file src="lib/logger/@jar.jcommon@"
-				targetdir="$INSTALL_PATH/lib" />
-			<file src="lib/logger/@jar.jfreechart@"
-				targetdir="$INSTALL_PATH/lib" />
-			<file src="lib/logger/rxtx/RXTXcomm.jar"
-				targetdir="$INSTALL_PATH/lib" />
-			<file src="lib/logger/rxtx/win32/rxtxSerial.dll"
-				targetdir="$INSTALL_PATH/lib" />
+            <file src="lib/logger/@jar.jcommon@"
+                  targetdir="$INSTALL_PATH/lib"/>
+            <file src="lib/logger/@jar.jfreechart@"
+                  targetdir="$INSTALL_PATH/lib"/>
+            <file src="lib/logger/rxtx/RXTXcomm.jar"
+                  targetdir="$INSTALL_PATH/lib"/>
+            <file src="lib/logger/rxtx/win32/rxtxSerial.dll"
+                  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 -->
+            <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="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>@name.package@ Source Files</description>
-			<file src="src" targetdir="$INSTALL_PATH"/>
-		</pack>
-	</packs>
+        <pack name="Source Files" required="no">
+            <description>@name.package@ Source Files</description>
+            <file src="src" targetdir="$INSTALL_PATH"/>
+        </pack>
+    </packs>
 </installation>
diff --git a/version.properties b/version.properties
index 38d24c01..53c2412b 100644
--- a/version.properties
+++ b/version.properties
@@ -14,7 +14,7 @@ supporturl: http://www.romraider.org
 
 version.major: 0
 version.minor: 4
-version.patch: 1
+version.patch: 2
 version.buildnumber: ${svn.revision}
 version.extra: Beta