diff --git a/.gitignore b/.gitignore
index 6b36a7407..25af7ea31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,4 +56,4 @@ hs_err_pid*.log
 /jpexs_website.properties
 /version.properties
 /tools.properties
-/nbproject/private/
\ No newline at end of file
+/nbproject/private/
diff --git a/build_common.xml b/build_common.xml
index 331379400..14bafc374 100644
--- a/build_common.xml
+++ b/build_common.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="common build script" default="all" basedir=".">
+<project name="common build script" default="all" basedir="." xmlns:jacoco="antlib:org.jacoco.ant">
     <description>Builds project</description>      
     
       
@@ -24,11 +24,9 @@
         <include name="**/?*.swf"/>
     </patternset>
     
-    <path id="emma.lib">
-        <pathelement location="${TESTLIBDIR}/emma.jar"/>
-        <pathelement location="${TESTLIBDIR}/emma_ant.jar"/>
-    </path>
-    <taskdef resource="emma_ant.properties" classpathref="emma.lib"/>
+    <taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml">
+        <classpath path="${TESTLIBDIR}/jacocoant.jar"/>
+    </taskdef>    
     
     <path id="ant-deb.classpath">
         <pathelement location="${basedir}/ant-deb-0.0.1.jar"/>
@@ -59,27 +57,13 @@
         <property name="VERSIONNUMBER" value="${version.major}.${version.minor}.${version.release}.${version.build}" />  
         <script language="javascript">
             if(project.getProperty("version.debug")=="true"){
-                project.setProperty("NIGHTLY",true);
+            project.setProperty("NIGHTLY",true);
             }
         </script>
         <echo level="info" message="Loaded Version:${version.major}.${version.minor}.${version.release}.${version.build}"/>
     </target>
     
-    <target name="coverage.instrumentation">
-        <mkdir dir="${INSTRDIR}"/>
-        <mkdir dir="${COVERAGEDIR}"/>
-        <!--<emma>
-            <instr instrpath="${COMPILEDIR}" destdir="${INSTRDIR}" metadatafile="${COVERAGEDIR}/metadata.emma"
-                   mode="copy">
-            </instr>
-        </emma>-->
-        <copy todir="${INSTRDIR}">
-            <fileset dir="${SOURCEDIR}">
-                <patternset refid="compiler.resources" />
-                <type type="file" />
-            </fileset>
-        </copy>
-    </target>
+ 
 
     <target name="compile" depends="build_lib">
         <!--<delete dir="${COMPILEDIR}"/>-->        
@@ -127,38 +111,46 @@
         <mkdir dir="${TESTRESULTSDIR}"/>
         <mkdir dir="${TESTRESULTSDIR}/raw/"/>
         
-        <antcall target="coverage.instrumentation"/>
-        
+         
         <taskdef classname="org.testng.TestNGAntTask" classpath="${TESTLIBDIR}/testng-6.8.jar" name="testng" />
     
+        <mkdir dir="${COVERAGEDIR}" />
+        <jacoco:coverage destfile="${COVERAGEDIR}/jacoco.exec">
+            <testng 
+                outputDir="${TESTRESULTSDIR}"
+                haltOnFailure="${TESTHALTFAILURE}" verbose="2" workingDir="${basedir}">
         
-        <testng 
-            outputDir="${TESTRESULTSDIR}"
-            haltOnFailure="${TESTHALTFAILURE}" verbose="2" workingDir="${basedir}">
-        
-            <classpath>
-                <pathelement path="${COMPILETESTSDIR}"/>
-                <pathelement path="${INSTRDIR}"/>
-                <pathelement path="${COMPILEDIR}"/>
-                <fileset dir="${LIBRARIESDIR}" includes="**/*.jar"/>
-                <fileset dir="${TESTLIBDIR}" includes="**/*.jar"/>
-            </classpath>
-            <jvmarg value="-noverify" />
-            <jvmarg value="-Demma.coverage.out.file=${COVERAGEDIR}/coverage.emma"/>
-            <jvmarg value="-Demma.coverage.out.merge=true"/>
-            <classfileset dir="${COMPILETESTSDIR}" includes="**/*.class" />                        
+                <classpath>
+                    <pathelement path="${COMPILETESTSDIR}"/>
+                    <pathelement path="${INSTRDIR}"/>
+                    <pathelement path="${COMPILEDIR}"/>
+                    <fileset dir="${LIBRARIESDIR}" includes="**/*.jar"/>
+                    <fileset dir="${TESTLIBDIR}" includes="**/*.jar"/>
+                </classpath>
+                <jvmarg value="-noverify" />
+                <jvmarg value="-Demma.coverage.out.file=${COVERAGEDIR}/coverage.emma"/>
+                <jvmarg value="-Demma.coverage.out.merge=true"/>
+                <classfileset dir="${COMPILETESTSDIR}" includes="**/*.class" />                        
             
-        </testng>                
+            </testng>  
+        </jacoco:coverage>
+                  
         <!-- Coverage report -->
         <mkdir dir="${COVERAGERESULTSDIR}"/>
-        <!--<emma>
-            <report sourcepath="${SOURCEDIR}" depth="method">
-                <fileset dir="${COVERAGEDIR}">
-                    <include name="*.emma"/>
-                </fileset>
-                <html outfile="${COVERAGERESULTSDIR}/index.html" />
-            </report>
-        </emma>-->
+        <jacoco:report>
+            <executiondata>
+                <file file="${COVERAGEDIR}/jacoco.exec" />
+            </executiondata>
+            <structure name="${PROJECTNAME}">
+                <classfiles>
+                    <fileset dir="${COMPILEDIR}" />
+                </classfiles>
+                <sourcefiles encoding="UTF-8">
+                    <fileset dir="${SOURCEDIR}" />
+                </sourcefiles>
+            </structure>
+            <html destdir="${COVERAGERESULTSDIR}" />
+        </jacoco:report> 
     </target>
     
     <condition property="is_windows">
@@ -217,14 +209,14 @@
             debFilenameProperty="deb.file.orig"
             section="editors"
             depends="${app.package.depends}">
-        <version upstream="${VERSION}" />
-        <maintainer name="${VENDOR}" email="${app.vendor.mail}"/>
-        <description synopsis="${app.description.short}">${app.description}</description>
-        <tarfileset dir="${DISTRIBUTIONDIR}" prefix="usr/share/java/${app.package}">
-            <include name="**"/>
-        </tarfileset>
-        <tarfileset file="${DISTRIBUTIONDIR}/${app.script}" fullpath="usr/bin/${app.package}" filemode="755" />
-        <tarfileset file="${app.deb.desktop.temp}" fullpath="usr/share/applications/${app.deb.desktop.file}.desktop"/>
+            <version upstream="${VERSION}" />
+            <maintainer name="${VENDOR}" email="${app.vendor.mail}"/>
+            <description synopsis="${app.description.short}">${app.description}</description>
+            <tarfileset dir="${DISTRIBUTIONDIR}" prefix="usr/share/java/${app.package}">
+                <include name="**"/>
+            </tarfileset>
+            <tarfileset file="${DISTRIBUTIONDIR}/${app.script}" fullpath="usr/bin/${app.package}" filemode="755" />
+            <tarfileset file="${app.deb.desktop.temp}" fullpath="usr/share/applications/${app.deb.desktop.file}.desktop"/>
         </deb>
         <property name="deb.file" value="${RELEASESDIR}/${PREFIXFILENAME}_${VERSION}${VERSIONSUFFIX}.deb" />        
         <move file="${deb.file.orig}" tofile="${deb.file}" />
@@ -278,7 +270,7 @@
         <property name="EXETYPE" value="gui" />
     </target>
     <target name="-set-console-type">
-      <property name="EXETYPE" value="console" />
+        <property name="EXETYPE" value="console" />
     </target>
     <target name="-exe-config" depends="-loadversion"> 
         <echoxml file="${EXECONFIG}">
@@ -530,7 +522,7 @@
         <echo file="${LOCALESTARGETDIR}/readme.txt">${PROJECTNAME} ${VERSION}${VERSIONSUFFIX} localization pack
             -------------------------------------------------------------------            
             Please follow instructions on http://www.free-decompiler.com/flash/translations.html
-</echo>
+        </echo>
         <property name="lang.file" value="${RELEASESDIR}/${PREFIXFILENAME}_${VERSION}${VERSIONSUFFIX}_lang.zip" />
         <zip destfile="${lang.file}" basedir="${LOCALESTARGETDIR}"/>
     </target>
@@ -591,11 +583,11 @@
         
         <loadfile srcfile="${REVFILE}" property="GITSHORTTAG">
             <filterchain>
-               <headfilter lines="1" skip="0"/>
-               <tokenfilter>
-                  <replaceregex pattern="[0-9a-f]{33}$" replace="" flags="gi"/>
-               </tokenfilter>
-               <striplinebreaks/>
+                <headfilter lines="1" skip="0"/>
+                <tokenfilter>
+                    <replaceregex pattern="[0-9a-f]{33}$" replace="" flags="gi"/>
+                </tokenfilter>
+                <striplinebreaks/>
             </filterchain>
         </loadfile>
         <echo level="info" message="Git tag:${GITTAG}"/>
@@ -721,10 +713,10 @@
     </target>
     
     <target name="-git-commit-versioninfo">        
-         <exec executable="git" failonerror="true">
+        <exec executable="git" failonerror="true">
             <arg value="add"/>            
             <arg value="version.properties"/>
-         </exec>
+        </exec>
         <exec executable="git" failonerror="true">
             <arg value="commit"/>            
             <arg value="-m"/>
@@ -741,11 +733,11 @@
     </target>
     
     <target name="-inc-minor">
-       <property name="newversion.type" value="minor"/>
+        <property name="newversion.type" value="minor"/>
     </target>
     
     <target name="-inc-release">
-       <property name="newversion.type" value="release"/> 
+        <property name="newversion.type" value="release"/> 
     </target>
     
     <target name="-inc-nightlybuild">
diff --git a/libsrc/ffdec_lib/build_common.xml b/libsrc/ffdec_lib/build_common.xml
index 53019764c..4b830f4eb 100644
--- a/libsrc/ffdec_lib/build_common.xml
+++ b/libsrc/ffdec_lib/build_common.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="common build script for library" default="build" basedir=".">
+<project name="common build script for library" default="build" basedir="." xmlns:jacoco="antlib:org.jacoco.ant">
     <description>Builds project</description>      
     <property name="DISTLIBRARIESFULLDIR" value="${DISTRIBUTIONDIR}/${DISTLIBRARIESDIRNAME}"/>    
     <patternset id="compiler.resources">
@@ -19,28 +19,10 @@
         <include name="**/?*.js"/>
     </patternset>
 
-    <path id="emma.lib">
-        <pathelement location="${TESTLIBDIR}/emma.jar"/>
-        <pathelement location="${TESTLIBDIR}/emma_ant.jar"/>
-    </path>
-    <taskdef resource="emma_ant.properties" classpathref="emma.lib"/>
-
-    <target name="coverage.instrumentation">
-        <mkdir dir="${INSTRDIR}"/>
-        <mkdir dir="${COVERAGEDIR}"/>
-        <emma>
-            <instr instrpath="${COMPILEDIR}" destdir="${INSTRDIR}" metadatafile="${COVERAGEDIR}/metadata.emma"
-                   mode="copy">
-            </instr>
-        </emma>
-        <copy todir="${INSTRDIR}">
-            <fileset dir="${SOURCEDIR}">
-                <patternset refid="compiler.resources" />
-                <type type="file" />
-            </fileset>
-        </copy>
-    </target>
-
+    <taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml">
+        <classpath path="${TESTLIBDIR}/jacocoant.jar"/>
+    </taskdef>
+   
     <target name="compile" depends="lexers">
         <mkdir dir="${COMPILEDIR}"/>
         <mkdir dir="${LIBRARIESDIR}"/>        
@@ -85,11 +67,11 @@
         <mkdir dir="${TESTRESULTSDIR}"/>
         <mkdir dir="${TESTRESULTSDIR}/raw/"/>
         
-        <antcall target="coverage.instrumentation"/>
         
         <taskdef classname="org.testng.TestNGAntTask" classpath="${TESTLIBDIR}/testng-6.8.jar" name="testng" />
     
-        
+        <mkdir dir="${COVERAGEDIR}" />
+        <jacoco:coverage destfile="${COVERAGEDIR}/jacoco.exec">
         <testng 
             outputDir="${TESTRESULTSDIR}"
             haltOnFailure="${TESTHALT}" verbose="2" workingDir="${basedir}" >
@@ -102,21 +84,27 @@
                 <fileset dir="${TESTLIBDIR}" includes="**/*.jar"/>
             </classpath>
             <jvmarg value="-noverify" />
-            <jvmarg value="-Demma.coverage.out.file=${COVERAGEDIR}/coverage.emma"/>
-            <jvmarg value="-Demma.coverage.out.merge=true"/>
             <classfileset dir="${COMPILETESTSDIR}" includes="**/*.class" />                        
             
-        </testng>                
+        </testng>      
+        </jacoco:coverage>          
         <!-- Coverage report -->
         <mkdir dir="${COVERAGERESULTSDIR}"/>
-        <emma>
-            <report sourcepath="${SOURCEDIR}" depth="method">
-                <fileset dir="${COVERAGEDIR}">
-                    <include name="*.emma"/>
-                </fileset>
-                <html outfile="${COVERAGERESULTSDIR}/index.html" />
-            </report>
-        </emma>
+        
+        <jacoco:report>
+            <executiondata>
+                <file file="${COVERAGEDIR}/jacoco.exec" />
+            </executiondata>
+            <structure name="${PROJECTNAME}">
+                <classfiles>
+                    <fileset dir="${COMPILEDIR}" />
+                </classfiles>
+                <sourcefiles encoding="UTF-8">
+                    <fileset dir="${SOURCEDIR}" />
+                </sourcefiles>
+            </structure>
+            <html destdir="${COVERAGERESULTSDIR}" />
+        </jacoco:report>        
     </target>
     
    
diff --git a/libsrc/ffdec_lib/testlib/emma.jar b/libsrc/ffdec_lib/testlib/emma.jar
deleted file mode 100644
index 27629deef..000000000
Binary files a/libsrc/ffdec_lib/testlib/emma.jar and /dev/null differ
diff --git a/libsrc/ffdec_lib/testlib/emma_ant.jar b/libsrc/ffdec_lib/testlib/emma_ant.jar
deleted file mode 100644
index 3f28c2c66..000000000
Binary files a/libsrc/ffdec_lib/testlib/emma_ant.jar and /dev/null differ
diff --git a/libsrc/ffdec_lib/testlib/jacocoant.jar b/libsrc/ffdec_lib/testlib/jacocoant.jar
new file mode 100644
index 000000000..43340ba1c
Binary files /dev/null and b/libsrc/ffdec_lib/testlib/jacocoant.jar differ
diff --git a/testlib/emma.jar b/testlib/emma.jar
deleted file mode 100644
index 27629deef..000000000
Binary files a/testlib/emma.jar and /dev/null differ
diff --git a/testlib/emma_ant.jar b/testlib/emma_ant.jar
deleted file mode 100644
index 3f28c2c66..000000000
Binary files a/testlib/emma_ant.jar and /dev/null differ
diff --git a/testlib/jacocoant.jar b/testlib/jacocoant.jar
new file mode 100644
index 000000000..43340ba1c
Binary files /dev/null and b/testlib/jacocoant.jar differ